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