| 
							
							
								 Thomas | 2642ff2e69 | AHHHHHH | 2022-01-10 09:27:35 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | a2379f9af7 | Merge remote-tracking branch 'origin/master' | 2022-01-10 09:23:14 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 7a816b5f71 | I'm depressed help | 2022-01-10 09:23:08 +01:00 |  | 
			
				
					| 
							
							
								 imuny | db9e0877c0 | config | 2022-01-10 09:19:16 +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 | aad76d162b | a | 2022-01-09 18:47:35 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | e9b2a64e43 | a | 2022-01-09 18:45:41 +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 |  | 
			
				
					|  | 09bce989d2 | isopen | 2022-01-09 15:58:45 +01:00 |  | 
			
				
					|  | 4978e8ab18 | name menu | 2022-01-09 15:53:47 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 338df7af3d | Merge remote-tracking branch 'origin/master' | 2022-01-09 14:48:59 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | c00c7361e9 | lol | 2022-01-09 14:48:51 +01:00 |  | 
			
				
					|  | 4c8bbef006 | end of game menu done | 2022-01-09 14:28:48 +01:00 |  | 
			
				
					|  | ea6b489126 | forgot some files | 2022-01-09 04:27:18 +01:00 |  | 
			
				
					|  | f1709acbe2 | little changes | 2022-01-09 04:24:25 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 19dd72a9f6 | why the fuck was this here | 2022-01-09 00:43:15 +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 |  | 
			
				
					| 
							
							
								 imuny | d54543b5f6 | fonction drawHeart | 2022-01-06 17:47:00 +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 |  | 
			
				
					| 
							
							
								 Thomas | 174f7240a4 | yeet | 2022-01-06 16:07:00 +01:00 |  | 
			
				
					| 
							
							
								 imuny | e1e1af4e7e | changement de nom des fichier entityDraw et menuDraw | 2022-01-06 15:24:55 +01:00 |  | 
			
				
					| 
							
							
								 imuny | 0692b91ffc | changement de nom des fichier entityDraw et menuDraw | 2022-01-06 15:23:51 +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 | beb35f92c5 | updated .gitignore | 2022-01-06 15:08:20 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | d66b66451a | Merge remote-tracking branch 'origin/master' # Conflicts:
#	scores.kus | 2022-01-06 15:08:07 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 6b24924b95 | God is no longer drunk (rightly chose invs) + some refactoring | 2022-01-06 15:07:42 +01:00 |  | 
			
				
					| 
							
							
								 imuny | a22ae07829 | g fail | 2022-01-06 14:19:39 +01:00 |  | 
			
				
					| 
							
							
								 imuny | 5c3de700fe | starf on dise | 2022-01-06 14:17:30 +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 |  | 
			
				
					| 
							
							
								 Thomas | 1a3d87ff39 | tut | 2022-01-04 15:25:26 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 41399e6c19 | We now have FPS | 2022-01-04 12:04:04 +01:00 |  |