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
..
configData.h	beta heart system	2022-01-09 00:35:09 +01:00
game.h	beta heart system	2022-01-09 00:35:09 +01:00
god.h	god angry	2022-01-06 17:27:07 +01:00
invaderDef.h	scores + config	2022-01-02 18:33:46 +01:00
invadersGrid.h	God is no longer drunk (rightly chose invs)	2022-01-06 15:07:42 +01:00
menu.h	drawmenu	2022-01-06 15:20:37 +01:00
pixelManager.h	main title almost screen done	2022-01-09 00:10:37 +01:00
player.h	Merge remote-tracking branch 'origin/master'	2022-01-09 00:37:52 +01:00
playerDef.h	refactoring	2022-01-02 00:13:35 +01:00
playMode.h	beta heart system	2022-01-09 00:35:09 +01:00
projectiles.h	beta heart system	2022-01-09 00:35:09 +01:00
scoresManager.h	beta heart system	2022-01-09 00:35:09 +01:00
utils.h	beta heart system	2022-01-09 00:35:09 +01:00