| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Thomas | c257c24488 | assets + some semantic things | 2022-01-04 10:59:37 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 994a073ee5 | COOOOOOONST | 2022-01-04 10:39:14 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 8ace7d1d01 | updated my bullying questions | 2022-01-04 09:52:01 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 8160ca1b0b | Added god | 2022-01-04 09:48:00 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 632031cedb | Merge remote-tracking branch 'origin/master' | 2022-01-03 17:49:54 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 00aebd652e | implemented save | 2022-01-03 17:49:31 +01:00 |  | 
			
				
					| 
							
							
								 imuny | b0c029b2be | Merge branch 'master' of github.com:Thomas776/SAE102-SpaceInvaders | 2022-01-03 17:34:04 +01:00 |  | 
			
				
					| 
							
							
								 imuny | 7bd03350d2 | vecteur de draw player passé en simple demande de x | 2022-01-03 17:32:50 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 3beb1a4d77 | signed save | 2022-01-03 17:21:18 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | ccdb001b9d | oops | 2022-01-03 16:48:40 +01:00 |  | 
			
				
					| 
							
							
								 imuny | c7f0edd513 | cmake en 1.16 | 2022-01-03 16:35:02 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | d4df66ead7 | score manager beta (c'est signé) | 2022-01-03 16:26:55 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | f32488458c | thx a lot Djalim | 2022-01-02 20:10:19 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 5b04846e7d | missiles are actually not dumb now | 2022-01-02 19:24:49 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | c6d3b022bc | scores + config | 2022-01-02 18:33:46 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | ff258e6aeb | I'm going to do shit | 2022-01-02 15:56:30 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 51866120f2 | we now have custom grid in config | 2022-01-02 13:26:00 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | b6574df3e3 | oops forgot that print | 2022-01-02 00:25:32 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | a3576c401e | refactoring | 2022-01-02 00:13:35 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 306d557030 | invaders now pew pew too (and did some refactoring) | 2022-01-02 00:10:57 +01:00 |  | 
			
				
					|  | bffc3bf04c | background + score support but the true one | 2022-01-01 23:22:04 +01:00 |  | 
			
				
					|  | 8dc711bd2b | background + score support | 2022-01-01 23:19:47 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 35d1d59b9a | removed one TODO | 2022-01-01 21:03:03 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | b123c9a3f3 | We can finally pew pew | 2022-01-01 20:31:57 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | a753e7a7b9 | stability I guess | 2022-01-01 18:18:03 +01:00 |  | 
			
				
					| 
							
							
								 Thomas R | eb25f940bd | fuck me | 2022-01-01 15:42:32 +01:00 |  | 
			
				
					| 
							
							
								 Thomas R | e4b719bd73 | did things | 2022-01-01 12:57:19 +01:00 |  | 
			
				
					| 
							
							
								 Thomas R | 978f0e4df7 | Merge remote-tracking branch 'origin/master' | 2021-12-31 18:55:08 +01:00 |  | 
			
				
					| 
							
							
								 Thomas R | 99f08864f0 | some small fixes | 2021-12-31 18:55:02 +01:00 |  | 
			
				
					|  | 07da695d88 | debut de systeme de score, reste plus qu'a 1. lire le score depuis la config, et 2 ajouter le score au joueur associer lorsque sa torpille collide avec un invader | 2021-12-31 18:50:08 +01:00 |  | 
			
				
					| 
							
							
								 Thomas R | 3d9c50bf6e | oriented object config | 2021-12-31 18:28:33 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 11318bc09c | shit commit bc Djalim needs to work | 2021-12-31 17:59:08 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | 5a3f51fa27 | merge | 2021-12-31 17:20:05 +01:00 |  | 
			
				
					| 
							
							
								 Thomas | e70def8e83 | did a shitload of things that 50% work | 2021-12-31 17:18:23 +01:00 |  | 
			
				
					|  | 3c351c6d42 | correction nom de variable semantiques, hein | 2021-12-31 16:40:45 +01:00 |  | 
			
				
					|  | d3047e8bce | ajout du sprite loader dans le pixel manager | 2021-12-31 16:39:32 +01:00 |  |