Commit Graph

665 Commits

Author SHA1 Message Date
MarcEricMartel
f799e689d2 woups 2023-12-18 14:54:14 -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
MarcEricMartel
9a669acd9c !!!! 2023-12-18 11:10:10 -05:00
MarcEricMartel
2c346139d5 Merge branch 'master' of git.frereschasseurs.studio:memartel_loc/SQCSimulator2023 2023-12-18 07:47:08 -05:00
MarcEricMartel
82747990d9
Merge pull request #43 from CegepSTH/SQC-15_online
Sqc 15 online
2023-12-16 16:56:31 -05:00
MarcEricMartel
0782f37e0a Might as well jump, JUMP! 2023-12-16 16:43:25 -05:00
MarcEricMartel
75f745efb8 Update player.cpp 2023-12-16 16:23:47 -05:00
MarcEricMartel
6efda6122d LETS TRY WITHOUT DAS JOOMP 2023-12-16 16:21:25 -05:00
MarcEricMartel
678776d6e6 Remove the dead code. 2023-12-16 16:13:20 -05:00
MarcEricMartel
4df53a5f9b Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-16 15:52:47 -05:00
MarcEricMartel
90892ce7d3 pop. 2023-12-16 15:52:39 -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
MarcEricMartel
2eacc0477b ?! 2023-12-16 15:15:25 -05:00
MarcEricMartel
745f40bc37 REVERT. 2023-12-16 15:11:48 -05:00
MarcEricMartel
ba6b383251 erratum 2023-12-16 15:05:26 -05:00
MarcEricMartel
1065357e70 Eh? 2023-12-16 15:05:06 -05:00
MarcEricMartel
4a4f353250 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-16 14:41:07 -05:00
MarcEricMartel
63d1f997ca blob 2023-12-16 14:41:01 -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
38bab49806 Log de se faire tirer 2023-12-16 13:05:04 -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
77a982b1fa
Merge pull request #41 from CegepSTH/ConnexionVariablesMenuOptions
Connexion variables menu options
2023-12-15 07:02:09 -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