MarcEricMartel
|
a60156bf2c
|
badaboum
|
2023-12-06 14:49:36 -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 |
|
MarcEricMartel
|
42ea83d73e
|
Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online
|
2023-12-06 13:50:00 -05:00 |
|
MarcEricMartel
|
59d3060444
|
eh?
|
2023-12-06 13:49:59 -05:00 |
|
Claudel-D-Roy
|
dc61488809
|
cout out
|
2023-12-06 13:49:11 -05:00 |
|
MarcEricMartel
|
58a1f5437a
|
Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online
|
2023-12-06 13:46:50 -05:00 |
|
MarcEricMartel
|
f835853605
|
Chamone
|
2023-12-06 13:46:43 -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
|
3b0f9650d4
|
What a big mess.
|
2023-12-06 12:32:26 -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
|
9c1cd885cf
|
Tehe.
|
2023-12-05 15:02:31 -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 |
|
Louis-CharlesG
|
2c73a2ed00
|
Correction des arbres.
|
2023-12-04 17:17:15 -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
|
d444b4de30
|
Re-Changement des textures.
|
2023-12-04 16:17:59 -05:00 |
|
Louis-CharlesG
|
bb100fd5cb
|
ajustement texture.
|
2023-12-04 16:12:02 -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
|
bc5c28a373
|
Merge pull request #34 from CegepSTH/MenusMenusMenus
Menus menus menus
|
2023-12-04 13:25:55 -05:00 |
|
MarcEricMartel
|
754130ec39
|
Merge pull request #36 from CegepSTH/revert-35-SQC-15_paquets
Revert "IGNORE THIS"
|
2023-12-04 13:16:03 -05:00 |
|
MarcEricMartel
|
8569e17c93
|
Revert "IGNORE THIS"
|
2023-12-04 13:14:54 -05:00 |
|
MarcEricMartel
|
c5700ae9fd
|
Merge pull request #35 from CegepSTH/SQC-15_paquets
IGNORE THIS
|
2023-12-04 13:14:33 -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 |
|
MarcEricMartel
|
9ed8ef3273
|
Moar random?
|
2023-12-03 11:14:08 -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
|
0af76b3f2e
|
Merge pull request #33 from CegepSTH/SQC32_sauveParams
Sqc32 sauve params
|
2023-12-02 15:09:14 -05:00 |
|
MarcEricMartel
|
b2c73c930e
|
Merge pull request #32 from CegepSTH/SQC-35_nouvelles_structures
Sqc 35 nouvelles structures
|
2023-12-02 14:59:21 -05:00 |
|
MarcEricMartel
|
4aa0aedd61
|
Update connector.cpp
|
2023-12-02 14:52:25 -05:00 |
|