Commit graph

  • d217b13c53 Add loading skin directly from png file develop manzerbredes 2015-05-07 06:57:25 +02:00
  • 1220e2d70f Add loadable skin and correct some things manzerbredes 2015-05-05 16:30:46 +02:00
  • f7610d669b Clean some other things manzerbredes 2015-05-04 17:12:57 +02:00
  • e72ce20365 Clean some things manzerbredes 2015-05-04 17:07:03 +02:00
  • 6b305938b3 Repair corrupt console controller manzerbredes 2015-05-04 17:02:53 +02:00
  • 1570bc6210 Merge branch 'develop' apply SFML develop change master manzerbredes 2015-05-04 16:55:32 +02:00
  • a1c9b58c29 Resize window, center number manzerbredes 2015-05-04 14:05:06 +02:00
  • 164d94eec1 Add stats class, make a functionnal SFML game manzerbredes 2015-05-04 14:00:54 +02:00
  • 1bebaf0f92 Prefer extends Game to grid than encapsulation manzerbredes 2015-05-04 13:08:45 +02:00
  • 3384204edc Clear some things manzerbredes 2015-05-04 12:55:15 +02:00
  • 6b37ae07ff Add font and fast programming to test the game manzerbredes 2015-05-03 20:23:43 +02:00
  • 1bf3038477 Add windowsSize attribute manzerbredes 2015-05-03 17:34:47 +02:00
  • fb7fb90b85 Add original 2048 skin ! manzerbredes 2015-05-03 17:18:10 +02:00
  • 7f0edabb5d Quickly draw basic grid (no reliable code) manzerbredes 2015-05-03 15:12:46 +02:00
  • ce3f721e16 Add first version of SFMLController and View class manzerbredes 2015-05-03 14:19:30 +02:00
  • ddaf5ba3ba Add readme manzerbredes 2015-05-03 12:24:03 +02:00
  • bf5ec3cfe5 Add fixed white space manzerbredes 2015-05-03 10:07:39 +02:00
  • 8488827025 Merge branch 'develop' -Correct bugs -Manage score -Add some helpers -Optimize some code manzerbredes 2015-05-03 09:58:01 +02:00
  • 4cc6c6596b Organize all the code manzerbredes 2015-05-03 09:57:31 +02:00
  • af7f2fc870 Organize Grid cpp code manzerbredes 2015-05-03 09:44:41 +02:00
  • afd4ba110f Optimise leftDefragmentation method manzerbredes 2015-05-03 09:25:28 +02:00
  • 98a8e2d520 Try to remove arrow characters printed in console manzerbredes 2015-05-03 09:14:30 +02:00
  • d8b1466ad9 Add final stats cout manzerbredes 2015-05-03 02:14:03 +02:00
  • 9977050e6e Add score and nb move(s) support manzerbredes 2015-05-03 02:02:22 +02:00
  • 30f603ecd3 Add 4 random pop support with a probability of 10% manzerbredes 2015-05-03 01:29:19 +02:00
  • 870d354afd Remove fixed grid initialisation manzerbredes 2015-05-03 01:23:28 +02:00
  • 60cb4a1e32 Move pop number to game class manzerbredes 2015-05-03 01:14:14 +02:00
  • cfc5d425f6 Correct bug on merging and pop number manzerbredes 2015-05-03 01:09:19 +02:00
  • 4716e4d231 Fixwhitespace manzerbredes 2015-05-02 23:11:36 +02:00
  • 9759972f35 Edit gitignore manzerbredes 2015-05-02 23:06:59 +02:00
  • 710cc4001f First stable fusionning manzerbredes 2015-05-02 23:05:44 +02:00
  • fec126f0d2 Edit .gitignore manzerbredes 2015-05-02 23:00:30 +02:00
  • 1d09a0fd3a End console clean game manzerbredes 2015-05-02 22:57:08 +02:00
  • 36d033caee Make clean code manzerbredes 2015-05-02 19:26:01 +02:00
  • 27d646af15 Restart project manzerbredes 2015-05-02 18:15:14 +02:00
  • 6b8a144bd1 Correct bugs manzerbredes 2015-05-02 11:06:54 +02:00
  • 01b25accba Add operator overload squeleton manzerbredes 2015-05-01 18:19:32 +02:00
  • 40d48a2d4f Remove useless controller manzerbredes 2015-05-01 15:52:43 +02:00
  • 683d794679 Add template support to Cell class manzerbredes 2015-05-01 15:50:10 +02:00
  • 048f1e17b7 Add some newers things : -Change helper ModelConstants to Keyboard -Now helpers is in folder Helpers -Change direction name to use CamelCase manzerbredes 2015-05-01 13:18:26 +02:00
  • 672358a947 Isolate keypress waiting in a method manzerbredes 2015-05-01 12:56:38 +02:00
  • 03b57472fc Add arrow support for ConsoleController (using SFML Keyboard.hpp) manzerbredes 2015-05-01 11:59:40 +02:00
  • 6392288967 Modify show() method presentation manzerbredes 2015-05-01 10:39:26 +02:00
  • a7e0de4bb6 Modify show() method presentation manzerbredes 2015-05-01 10:36:20 +02:00
  • 9f07e3c6bd Correct space manzerbredes 2015-05-01 10:24:45 +02:00
  • 40e0b381c1 Correct tab manzerbredes 2015-05-01 10:20:19 +02:00
  • 80c37e438e Fix space manzerbredes 2015-04-30 10:09:58 +02:00
  • e13d24b6c8 Correct LOT OF BUGS manzerbredes 2015-04-30 09:42:40 +02:00
  • a2ed149069 Fix whitespace manzerbredes 2015-04-30 09:13:23 +02:00
  • 4b5f429c0d Change controller name manzerbredes 2015-04-30 09:11:20 +02:00
  • fa88c91351 Fix some things manzerbredes 2015-04-30 09:07:40 +02:00
  • 4afa51e9e6 add file to gitignore manzerbredes 2015-04-30 08:50:37 +02:00
  • 8e94318a96 Merge branch 'MakeClass' of github.com:manzerbredes/2P11 into MakeClass manzerbredes 2015-04-30 08:43:05 +02:00
  • 71ebf1235e first version of the controller krilius 2015-04-30 08:48:29 +04:00
  • ad216d86f6 Add missing dependency in CMakeList.txt manzerbredes 2015-04-29 21:18:06 +02:00
  • a3b805ee7b first step of the model krilius 2015-04-29 22:28:29 +04:00
  • e241abc9df bug sous osx krilius 2015-04-29 20:52:18 +04:00
  • 9fbd4e0fed Enable cmake for model manzerbredes 2015-04-29 19:34:01 +02:00
  • 674563203b Restore licence manzerbredes 2015-04-29 19:20:27 +02:00
  • 3840053da7 First main created krilius 2015-04-29 15:42:41 +04:00
  • 08113f5b6d Created basic classes krilius 2015-04-29 15:40:08 +04:00
  • f6094f0372 Add Case class manzerbredes 2015-04-29 14:59:17 +02:00
  • 590f736a7a Add class manzerbredes 2015-04-29 14:34:26 +02:00
  • 41d8d938e5 Remove test manzerbredes 2015-04-29 14:04:42 +02:00
  • 64e91f011c test krilius 2015-04-29 13:53:58 +04:00
  • 8a0a4e86e0 Delete executable manzerbredes 2015-04-28 19:19:04 +02:00
  • 4119ff9e3a Create first hello world in SFML (Thank you LaurentGomila for your FindSFML.cmake) manzerbredes 2015-04-28 19:15:36 +02:00
  • 9729ff528d Add cmake SFML finder manzerbredes 2015-04-28 15:09:36 +02:00
  • 2eee5c392d Add main file manzerbredes 2015-04-28 14:53:59 +02:00
  • 0a1f27a6d2 Create project manzerbredes 2015-04-28 14:33:41 +02:00