Commit Graph

501 Commits

Author SHA1 Message Date
MarcEricMartel
40e90fe12d !!!!!!!!!!! 2023-12-18 15:24:06 -05:00
MarcEricMartel
6d07285f43 Test pickup 2023-12-18 14:50:18 -05:00
MarcEricMartel
25b5c1e492 oooooooooo 2023-12-18 14:24:43 -05:00
MarcEricMartel
f1bb7447f9 almoos dere 2023-12-18 13:29:38 -05:00
MarcEricMartel
68d03c1eac Merge branch 'SQC19_Booster' into online_boosts 2023-12-18 11:19:52 -05:00
MarcEricMartel
cf831e339f Ça s'ra pas long. Non non non non non. 2023-12-18 11:18:42 -05:00
Claudel-D-Roy
5e1e8366ce j'push des choses 2023-12-16 15:52:27 -05:00
MarcEricMartel
7f9462881c Oops, all changes! 2023-12-16 15:27:20 -05:00
Claudel-D-Roy
da94565c3e EL NIINIOOO 2023-12-16 14:41:00 -05:00
Frederic Leger
f2c5f8b636 booster fonctionnel
manque la distribution booster sur la map
2023-12-16 14:38:01 -05:00
MarcEricMartel
1c2a691638 Bullet Time is slow. 2023-12-16 14:01:08 -05:00
MarcEricMartel
7803f46a6b WE ARE THE WORLD. 2023-12-16 13:14:37 -05:00
MarcEricMartel
547d0fb3f8 Ça devrait crier moins 2023-12-16 12:57:04 -05:00
MarcEricMartel
dec9da6395 no more whoosh 2023-12-16 12:48:08 -05:00
MarcEricMartel
f564e37544 YYYAAAAAAARRRGGHH? 2023-12-16 12:32:54 -05:00
MarcEricMartel
ca1ab7301d Merge branch 'master' into SQC-15_online 2023-12-16 12:09:23 -05:00
Claudel-D-Roy
7a7ba94cbd Merge branch 'RepairWhoosh' 2023-12-16 12:09:04 -05:00
MarcEricMartel
ac50a044c7 Merge branch 'master' into SQC-15_online 2023-12-16 12:06:41 -05:00
MarcEricMartel
8062d8e31d lol 2023-12-16 12:05:57 -05:00
MarcEricMartel
4d278dfdea Pow pow t'es mow. 2023-12-16 12:05:14 -05:00
MarcEricMartel
da9fd2477d Update documents 2023-12-16 09:32:42 -05:00
Frederic Leger
2364fb9c1f booster quasi fonctionnel
affichage seulement visible a travers un autre booster.
ne se ramasse pas encore.
2023-12-15 23:02:20 -05:00
Frederic Leger
570bef266c merge conflict 2023-12-15 15:40:13 -05:00
MarcEricMartel
de8fe3c1c5 Merge branch 'master' into SQC-15_online 2023-12-15 07:13:16 -05:00
MarcEricMartel
5ee3fd143b Update engine.cpp 2023-12-15 07:11:35 -05:00
MarcEricMartel
e4316e7d8d Mis le son qui joue après que le volume soit changé pour les contrôles de volume 2023-12-15 06:39:18 -05:00
mduval76
935a977bdf Push options resolution fonctionnels. 2023-12-14 21:20:21 -05:00
mduval76
82bae1c21a Push background transparent pour menu options Graphics 2023-12-14 20:34:59 -05:00
mduval76
58c06f9f84 Push menu Lobby pour single player (entree du username seulement) 2023-12-14 19:33:25 -05:00
MarcEricMartel
8e77565bb4 Merge branch 'master' into SQC-15_online 2023-12-14 19:17:37 -05:00
mduval76
e5b0c742dd Push back button dans le lobbymenu 2023-12-14 18:25:15 -05:00
MarcEricMartel
1af88ba3e3 correction sfx 2023-12-14 14:02:29 -05:00
mduval76
383a19cbd2 Push mainvolume et musicvolume sliders fonctionnels. Bug sfx 2023-12-14 00:08:07 -05:00
mduval76
67270a0b21 Push options volume musique modifiable fonctionnel 2023-12-13 19:59:01 -05:00
mduval76
b101add0e7 Push sans les logs. 2023-12-13 19:13:02 -05:00
mduval76
0a0c70883b Push avec sensibilité souris - version fusionnée au master courant. 2023-12-13 19:12:22 -05:00
mduval76
879f93e2cd Validation des changements indexes... 2023-12-13 19:08:07 -05:00
mduval76
f7934be7f9 push ajustement de mp3 a wav pour sons 2023-12-13 19:02:17 -05:00
mduval76
0b4546eee9 Push sensibilite souris fonctionnelle. 2023-12-13 17:50:15 -05:00
mduval76
6ba316aa2d Push mouse sensitivity 2023-12-13 17:15:58 -05:00
Claudel-D-Roy
26d03ca5cc horriblé 2023-12-13 16:32:43 -05:00
MarcEricMartel
7b350fa403 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-13 16:10:34 -05:00
MarcEricMartel
71691c55c8 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-13 16:10:25 -05:00
MarcEricMartel
49374a7dea Let's all die! 2023-12-13 16:10:23 -05:00
Claudel-D-Roy
5a3ce00cb2 kjhg 2023-12-13 16:10:21 -05:00
Claudel-D-Roy
6d4f592278 k. 2023-12-13 15:45:17 -05:00
Rynort
a08a6c7db3 Update doc_dev.docx 2023-12-13 15:25:48 -05:00
MarcEricMartel
2f3260b16a Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-13 15:23:20 -05:00
MarcEricMartel
08204934c8 No more 1. 2023-12-13 15:23:14 -05:00
Claudel-D-Roy
28dc760cba potatoes 2023-12-13 15:21:23 -05:00