Commit Graph

391 Commits

Author SHA1 Message Date
MarcEricMartel
948597361f Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-07 12:10:56 -05:00
MarcEricMartel
76256115d1 Oh là là. 2023-12-07 12:10:47 -05:00
Claudel-D-Roy
1d48242147 Update remoteplayer.cpp 2023-12-07 12:10:17 -05:00
Claudel-D-Roy
18f08feb68 2023-12-06 17:02:36 -05:00
MarcEricMartel
cb0dad3e31 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-06 16:36:29 -05:00
MarcEricMartel
e8a475419f 2112 by PUSH. 2023-12-06 16:36:21 -05:00
Claudel-D-Roy
9eac62c44a 🚷 2023-12-06 16:35:39 -05:00
Claudel-D-Roy
d80281231b 🚽 2023-12-06 16:22:05 -05:00
Claudel-D-Roy
8eb2de4cd9 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-06 16:21:06 -05:00
Claudel-D-Roy
89fafb100e Pleurer en animation 2023-12-06 16:20:52 -05:00
MarcEricMartel
449e12ca5a GOT THE TIME TICK TICK TICKIN' IN MY HEAD 2023-12-06 16:01:29 -05:00
Claudel-D-Roy
bf0306f018 👊 2023-12-06 15:51:55 -05:00
MarcEricMartel
7077b617be Rollover Beethoven 2023-12-06 15:37:08 -05:00
Claudel-D-Roy
2596a35af4 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-06 14:31:13 -05:00
MarcEricMartel
242250f251 Oh oh oh oh oh!!! 2023-12-06 14:31:05 -05:00
Claudel-D-Roy
a79bf0d1eb 🚍 2023-12-06 14:31:04 -05:00
Claudel-D-Roy
dc61488809 cout out 2023-12-06 13:49:11 -05:00
Claudel-D-Roy
3760e140ae HiiIIIiiiIiI 2023-12-06 13:46:24 -05:00
MarcEricMartel
64b40023aa Ah ben lol. 2023-12-06 13:43:33 -05:00
MarcEricMartel
c47b36726b :> 2023-12-06 13:42:15 -05:00
MarcEricMartel
1762043757 Bonne idée. 2023-12-06 13:23:33 -05:00
MarcEricMartel
adf36c8905 Whooooooooo are you? 2023-12-06 12:25:34 -05:00
MarcEricMartel
f29abe8046 Merge branch 'master' into SQC-15_online 2023-12-06 12:18:01 -05:00
MarcEricMartel
988b2c330c Before the merge.... 2023-12-06 12:17:47 -05:00
MarcEricMartel
4841e8d5ba Make Debug Great Again 2023-12-06 12:08:44 -05:00
MarcEricMartel
6c7369a8be Merge branch 'RUNNINGREALLYFAST' into SQC-15_online 2023-12-06 11:19:02 -05:00
MarcEricMartel
c975265901 Timer iznogoud. 2023-12-06 11:16:39 -05:00
Claudel-D-Roy
7a7dc1fad6 DomoAriGato 2023-12-06 11:16:30 -05:00
Claudel-D-Roy
0856f913d2 yay 2023-12-06 10:48:04 -05:00
MarcEricMartel
b11a484a5a 😎 2023-12-05 14:25:21 -05:00
MarcEricMartel
464ba131c4 Corrections merge de master
hell.
2023-12-05 13:44:54 -05:00
MarcEricMartel
4775de01d8 Merge branch 'master' into SQC-15_online 2023-12-05 06:34:51 -05:00
MarcEricMartel
e8a0f7e4fb
Merge pull request #38 from CegepSTH/Améloration_Gen_Monde
Améloration gen monde
2023-12-05 06:29:41 -05:00
MarcEricMartel
2446b90bff bulletadd 2023-12-05 06:25:48 -05:00
Claudel-D-Roy
16e9f6aefe GG le push 2023-12-04 19:05:36 -05:00
Rynort
d9152a721c Création de la dock 2023-12-04 17:41:05 -05:00
Claudel-D-Roy
e98bd03192 GG EN ROTATION 2023-12-04 17:02:15 -05:00
Claudel-D-Roy
e6e93ef6d0 YAY 2023-12-04 16:45:46 -05:00
Louis-CharlesG
a137666546 Merge branch 'master' into Améloration_Gen_Monde 2023-12-04 15:44:22 -05:00
Louis-CharlesG
841947bc7a Changment pour lac/arbre 2023-12-04 15:05:27 -05:00
MarcEricMartel
8569e17c93
Revert "IGNORE THIS" 2023-12-04 13:14:54 -05:00
MarcEricMartel
78b3ed85cb
Merge branch 'MenusMenusMenus' into SQC-15_paquets 2023-12-04 13:13:54 -05:00
mduval76
4b6c641c97 Push replacer Render 2023-12-04 13:02:28 -05:00
mduval76
8b448f5072 Push pre-gamestate Pause 2023-12-03 00:47:04 -05:00
mduval76
a67499049b Push gros paquets de menus. Nouvelle hierarchie Clean up de larborescence des textures pour elements des menus. 2023-12-03 00:15:18 -05:00
Claudel-D-Roy
df0a142b12 ishhh 2023-12-02 15:19:46 -05:00
MarcEricMartel
4aa0aedd61 Update connector.cpp 2023-12-02 14:52:25 -05:00
MarcEricMartel
e52dbd3705 Merge branch 'master' into SQC-15_paquets 2023-12-02 14:05:41 -05:00
MarcEricMartel
5a491c5446 omg 💣 2023-12-02 11:05:00 -05:00
MarcEricMartel
c44d1453ae Oh wow 2023-12-02 09:23:26 -05:00