Commit Graph

602 Commits

Author SHA1 Message Date
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
136f589975 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-13 15:45:25 -05:00
Claudel-D-Roy
6d4f592278 k. 2023-12-13 15:45:17 -05:00
MarcEricMartel
37a86d42a3 lol infinite loop 2023-12-13 15:29:12 -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
74875709af Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-13 15:21:36 -05:00
Claudel-D-Roy
28dc760cba potatoes 2023-12-13 15:21:23 -05:00
MarcEricMartel
c7c38ed44d Suicide is NOT the answer. 2023-12-13 15:21:19 -05:00
Claudel-D-Roy
53e0af3f94 PUSHING STUFF INTO THE VOID 2023-12-13 15:18:17 -05:00
Claudel-D-Roy
a11c52cf77 AH BEN TABARNOUCHE 2023-12-13 15:14:38 -05:00
MarcEricMartel
b1fc9d7d92 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-13 15:04:10 -05:00
MarcEricMartel
a85c5cc626 🔫 2023-12-13 15:04:08 -05:00
Claudel-D-Roy
4c3803c02e pleurer en animation 2023-12-13 14:46:53 -05:00
MarcEricMartel
5e09305398 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-13 14:27:18 -05:00
MarcEricMartel
fd1fe66d13 SYNC_ACC CMOD_ACC GLOBALS 2023-12-13 14:27:11 -05:00
Claudel-D-Roy
edebad86a6 Blahblahblah 2023-12-13 14:26:46 -05:00
MarcEricMartel
2dbaf84844 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-13 14:06:29 -05:00
MarcEricMartel
e31e670720 Yaya 2023-12-13 14:06:22 -05:00
Claudel-D-Roy
d8cbc27ca9 ALLO 2023-12-13 14:06:11 -05:00
Claudel-D-Roy
c801877a0c polipocket 2023-12-13 13:53:10 -05:00
Claudel-D-Roy
f4347d35df secret 2023-12-13 13:51:37 -05:00
MarcEricMartel
f509b01827 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-13 13:47:41 -05:00
MarcEricMartel
18d6d58203 There's a bullet without my name on it. 2023-12-13 13:47:34 -05:00
Claudel-D-Roy
83fc600ce2 l;kjhgfd 2023-12-13 13:46:57 -05:00
Claudel-D-Roy
0e45b2b81e essaie no. 89657657457 2023-12-13 13:33:44 -05:00
Claudel-D-Roy
d3c6353f17 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-13 13:18:28 -05:00
Claudel-D-Roy
8fbb92ec5b ghfudk 2023-12-13 13:17:29 -05:00
MarcEricMartel
64655856e9 gniah. 2023-12-13 13:13:34 -05:00
MarcEricMartel
a6b6ac870a Update sync plus vite. 2023-12-13 13:01:52 -05:00
MarcEricMartel
5ef6ab5006 Merge branch 'master' into SQC-15_online 2023-12-13 12:57:41 -05:00
MarcEricMartel
7ffccc8bf8 woups^2 2023-12-13 12:39:24 -05:00
MarcEricMartel
c9ebfd348c woups 2023-12-13 12:38:19 -05:00
Claudel-D-Roy
ae247a58a8 Merge branch 'SQC_MenuMusic' 2023-12-13 12:15:39 -05:00
MarcEricMartel
2f53f74ca9 Erratum 2 2023-12-13 11:21:42 -05:00
MarcEricMartel
3d0b35123a Erratum 2023-12-13 11:11:14 -05:00
MarcEricMartel
aacfb880f0 + son de clic quand on clique. 2023-12-13 10:55:58 -05:00
Jonathan Trottier
6c68114fbb
Merge pull request #39 from CegepSTH/PauseMenuFieldsAndOnline
Beaucoup de belles choses
2023-12-12 19:28:28 -05:00
MarcEricMartel
b840e3ad19 Erratum 2023-12-12 09:31:56 -05:00
MarcEricMartel
7a30e43001 Merge branch 'SQC-15_online' into PauseMenuFieldsAndOnline 2023-12-12 09:31:01 -05:00
mduval76
c099a3b8eb Push menu pause fonctionnel 2023-12-11 21:41:40 -05:00
MarcEricMartel
7498076d7a Corrections timer 2023-12-11 07:31:20 -05:00
MarcEricMartel
7c1f70646a Correction bug de switch de fullscreen 2023-12-11 05:35:29 -05:00
MarcEricMartel
5b0be2d985 Gossage de musique 2023-12-09 16:51:43 -05:00
MarcEricMartel
c176fddea1 Update engine.cpp 2023-12-09 16:25:24 -05:00
MarcEricMartel
46298f8256 Oh yeah. 2023-12-09 15:54:06 -05:00
MarcEricMartel
461a8aa11b Merge remote-tracking branch 'origin/InputFields' into SQC_mergeFieldsAndOnline 2023-12-09 15:23:44 -05:00