| 
							
							
								 Thomas | 443a21d7ac | doc goodPixelManager.h | 2022-01-11 14:09:43 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 0c84486628 | Yet again doc modification | 2022-01-11 11:03:40 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 66c39a7fa9 | still more documentation | 2022-01-11 10:49:54 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | a01ea867cb | modified documentation | 2022-01-11 10:17:54 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 7919f8f722 | Merge remote-tracking branch 'origin/master' | 2022-01-10 17:49:02 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 8b25c55cbc | Fixed god. Last commit, I'm not going to do more | 2022-01-10 17:48:56 +01:00 |  | 
			
				
					|  | fbaab4a9d8 | minor stuff all should be good .w. | 2022-01-10 17:21:24 +01:00 |  | 
			
				
					|  | e606a641af | now we have a little message in the death menu to tell who won | 2022-01-10 17:03:06 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | f671227a8b | Merge remote-tracking branch 'origin/master' | 2022-01-10 16:01:38 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 7ecb677d97 | ok ca se lance | 2022-01-10 16:01:32 +01:00 |  | 
			
				
					|  | 209e1289ab | score during gameplay | 2022-01-10 15:54:03 +01:00 |  | 
			
				
					|  | 1e6892f6b1 | end menu score display | 2022-01-10 15:31:07 +01:00 |  | 
			
				
					|  | 17a4019759 | merge | 2022-01-10 14:32:42 +01:00 |  | 
			
				
					|  | 98358bba05 | config def + true config file warning : cant lunch game | 2022-01-10 14:29:09 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 36d6b21613 | Async sprites loading | 2022-01-10 14:27:16 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 9dc5a03427 | removed last TODO | 2022-01-10 09:40:47 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | b7632df576 | removed some TODOs | 2022-01-10 09:39:07 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 2675dc9e71 | yeet size_t | 2022-01-10 09:38:35 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 8e6a206770 | fixed some warnings | 2022-01-10 09:36:38 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 2642ff2e69 | AHHHHHH | 2022-01-10 09:27:35 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 7a816b5f71 | I'm depressed help | 2022-01-10 09:23:08 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | a10a1e67c5 | fatigué | 2022-01-10 09:13:54 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 8f24a307f8 | flm | 2022-01-10 08:50:48 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 31033a7d53 | OSKOUR | 2022-01-09 21:49:40 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 947665d306 | b | 2022-01-09 21:13:38 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | f2984fffb8 | preconditions | 2022-01-09 20:40:55 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 04a7a63a25 | push | 2022-01-09 18:41:27 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | a81ec496a6 | push | 2022-01-09 18:30:15 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 15dc67c348 | save commit | 2022-01-09 17:25:33 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 7b2eda8549 | things | 2022-01-09 16:44:53 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | f2822815dd | Did things | 2022-01-09 16:32:54 +01:00 |  | 
			
				
					|  | 4978e8ab18 | name menu | 2022-01-09 15:53:47 +01:00 |  | 
			
				
					|  | 4c8bbef006 | end of game menu done | 2022-01-09 14:28:48 +01:00 |  | 
			
				
					|  | f1709acbe2 | little changes | 2022-01-09 04:24:25 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 1b46599598 | Merge remote-tracking branch 'origin/master' # Conflicts:
#	src/game/display.cpp
#	src/game/gameManagers.cpp | 2022-01-09 00:37:52 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | c5f08c8bcc | beta heart system | 2022-01-09 00:35:09 +01:00 |  | 
			
				
					|  | 4737d9dcb3 | life interaction? i guess | 2022-01-09 00:22:03 +01:00 |  | 
			
				
					|  | 6faffb7baf | main title almost screen done | 2022-01-09 00:10:37 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | b8c29cad9d | tmp commit | 2022-01-08 14:38:46 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | a2c9d40d4d | now compiles | 2022-01-07 09:05:21 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | c85d677afa | god angry | 2022-01-06 17:27:07 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | bdbcd4eec2 | .w. | 2022-01-06 17:12:02 +01:00 |  | 
			
				
					| 
							
							
								 imuny | f9a9bf78e6 | Merge branch 'master' of github.com:Thomas776/SAE102-SpaceInvaders | 2022-01-06 15:21:14 +01:00 |  | 
			
				
					| 
							
							
								 imuny | 52d9972c93 | drawmenu | 2022-01-06 15:20:37 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 0b2f09692c | a | 2022-01-06 15:12:23 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 6b24924b95 | God is no longer drunk (rightly chose invs) + some refactoring | 2022-01-06 15:07:42 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | af8476c4ba | New FPS system, editable in config | 2022-01-06 13:41:51 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 3dda6a690a | God is here, and he will not be forgiveful about your sins | 2022-01-06 11:07:56 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 1af32bafd8 | God beta (quite cool) | 2022-01-06 09:58:06 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | bc03a21b2e | trash commit | 2022-01-05 00:01:53 +01:00 |  |