Commit Graph

147 Commits

Author SHA1 Message Date
29bccdc920 Merge branch 'master' of github.com:Thomas776/SAE102-SpaceInvaders 2022-01-11 15:00:35 +01:00
d422608290 b 2022-01-11 15:00:25 +01:00
Thomas
31474894bc
removed files 2022-01-11 14:56:01 +01:00
cc30d3b3cd a 2022-01-11 14:48:23 +01:00
Thomas
f2b7571c7f
Merge remote-tracking branch 'origin/master' 2022-01-11 14:42:47 +01:00
Thomas
7acfc27bb5
method ovveride 2022-01-11 14:42:41 +01:00
8aea8ba0f9 Doc stuff again 2022-01-11 14:31:07 +01:00
Thomas
9cd2593f47
oops 2022-01-11 14:16:07 +01:00
Thomas
443a21d7ac
doc goodPixelManager.h 2022-01-11 14:09:43 +01:00
Thomas
369dc4ecbc
doxygen regen 2022-01-11 11:04:12 +01:00
Thomas
0c84486628
Yet again doc modification 2022-01-11 11:03:40 +01:00
Thomas
66c39a7fa9
still more documentation 2022-01-11 10:49:54 +01:00
Thomas
26e1146811
Merge remote-tracking branch 'origin/master' 2022-01-11 10:18:13 +01:00
Thomas
a01ea867cb
modified documentation 2022-01-11 10:17:54 +01:00
1b4d9ac4d7 Doc stuff again 2022-01-10 18:25:13 +01:00
c2085e1716 gonna push the doc while i'm at it 2022-01-10 17:51:15 +01:00
2589f0e12a we got a sexy doxyfile now 2022-01-10 17:50:27 +01:00
Thomas
7919f8f722
Merge remote-tracking branch 'origin/master' 2022-01-10 17:49:02 +01:00
Thomas
8b25c55cbc
Fixed god. Last commit, I'm not going to do more 2022-01-10 17:48:56 +01:00
75acafc848 u saw nothing 2022-01-10 17:22:14 +01:00
fbaab4a9d8 minor stuff all should be good .w. 2022-01-10 17:21:24 +01:00
3553f59640 Merge branch 'master' of github.com:Thomas776/SAE102-SpaceInvaders 2022-01-10 17:03:17 +01:00
e606a641af now we have a little message in the death menu to tell who won 2022-01-10 17:03:06 +01:00
Thomas
82bb693915
Merge remote-tracking branch 'origin/master' 2022-01-10 16:32:23 +01:00
Thomas
c6f86da6db
removed frame debugging 2022-01-10 16:32:17 +01:00
1ae410638e Merge branch 'master' of github.com:Thomas776/SAE102-SpaceInvaders 2022-01-10 16:30:25 +01:00
afea5f21b2 true collisions 2022-01-10 16:30:17 +01:00
Thomas
d3686f2855
AHHHHHHHHHHHHH 2022-01-10 16:10:04 +01:00
Thomas
f671227a8b
Merge remote-tracking branch 'origin/master' 2022-01-10 16:01:38 +01:00
Thomas
7ecb677d97
ok ca se lance 2022-01-10 16:01:32 +01:00
f40fb1727f score during gameplay + multiplayer 2022-01-10 15:55:16 +01:00
209e1289ab score during gameplay 2022-01-10 15:54:03 +01:00
fdaa535b29 merge 2022-01-10 15:32:47 +01:00
1e6892f6b1 end menu score display 2022-01-10 15:31:07 +01:00
Thomas
aea1502487
debug msgs 2022-01-10 15:03:39 +01:00
Thomas
04e7b7da94
a 2022-01-10 14:52:09 +01:00
Thomas
7e3de18419
config defaults updated 2022-01-10 14:48:06 +01:00
Thomas
53f0785fee
Config debugged 2022-01-10 14:36:38 +01:00
Thomas
5b7a673b6f
Merge remote-tracking branch 'origin/master' 2022-01-10 14:32:57 +01:00
Thomas
cd27832eed
improved yaml error reporting 2022-01-10 14:32:52 +01:00
17a4019759 merge 2022-01-10 14:32:42 +01:00
98358bba05 config def + true config file warning : cant lunch game 2022-01-10 14:29:09 +01:00
Thomas
7b52545501
new sprite files 2022-01-10 14:27:35 +01:00
Thomas
36d6b21613
Async sprites loading 2022-01-10 14:27:16 +01:00
Thomas
3dcdcadff3
new config + patch 2022-01-10 09:49:18 +01:00
Thomas
9dc5a03427
removed last TODO 2022-01-10 09:40:47 +01:00
Thomas
b7632df576
removed some TODOs 2022-01-10 09:39:07 +01:00
Thomas
2675dc9e71
yeet size_t 2022-01-10 09:38:35 +01:00
Thomas
8e6a206770
fixed some warnings 2022-01-10 09:36:38 +01:00
Thomas
2642ff2e69
AHHHHHH 2022-01-10 09:27:35 +01:00