Commit Graph

575 Commits

Author SHA1 Message Date
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
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
20eb410b08 Hahaha il manquait les ChunkMods dans netprot :finnadie: 2023-12-02 10:04:18 -05:00
MarcEricMartel
c44d1453ae Oh wow 2023-12-02 09:23:26 -05:00
MarcEricMartel
37ea09aaf3 Merge branch 'SQC-15_paquets' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_paquets 2023-12-02 09:06:54 -05:00
MarcEricMartel
62b7719eb4 Erratas! 2023-12-02 09:06:41 -05:00
mduval76
3842ca3485 Push bouton pour retourner au menu principal. Makeover des anciens boutons. 2023-12-01 20:26:52 -05:00
mduval76
98390c878f Push pourcentage dynamique pour sliders menu options 2023-12-01 19:20:55 -05:00
mduval76
def1ab284e Push sliders fonctionnels (x4) 2023-12-01 17:55:25 -05:00
mduval76
90e736a14c push ajouts des barres pour "sliders" 2023-12-01 15:46:08 -05:00
mduval76
ac3628ec0b Push zones cliquables sliders et checks 2023-12-01 14:37:12 -05:00
mduval76
3e3a7650e8 Push options Volume et Resolution de base 2023-12-01 13:48:48 -05:00
mduval76
28082a018d Push menu options de base 2023-12-01 09:49:00 -05:00
681ac61a74 ajouts dans les cmakelists pour leenuqs 2023-11-29 19:02:16 -05:00
38cfa95297 ajouts dans les cmakelists pour leenuqs 2023-11-29 18:59:58 -05:00