Commit Graph

175 Commits

Author SHA1 Message Date
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
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