Commit Graph

11 Commits

Author SHA1 Message Date
Thomas
b7632df576
removed some TODOs 2022-01-10 09:39:07 +01:00
Thomas
15dc67c348
save commit 2022-01-09 17:25:33 +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
Thomas
b8c29cad9d
tmp commit 2022-01-08 14:38:46 +01:00
Thomas
a753e7a7b9
stability I guess 2022-01-01 18:18:03 +01:00
Thomas R
e4b719bd73
did things 2022-01-01 12:57:19 +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
e70def8e83
did a shitload of things that 50% work 2021-12-31 17:18:23 +01:00