Commit Graph

450 Commits

Author SHA1 Message Date
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
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
MarcEricMartel
5c346c48e6 🏥 2023-11-28 11:38:38 -05:00
MarcEricMartel
e89b5914fb Sync ees almöss de voork! 2023-11-27 17:44:52 -05:00
mduval76
15882dc506 Merge branch 'master' into SQC32_sauveParams 2023-11-27 17:14:53 -05:00
mduval76
6db90a3a16 Push reajustements apres merge 31 2023-11-27 17:07:51 -05:00
mduval76
a26929fe66
Merge branch 'master' into SQC-31 2023-11-27 16:54:58 -05:00
MarcEricMartel
10b8d77734 ehm 2023-11-27 16:43:18 -05:00
MarcEricMartel
e8ca08ecab Superman + Alfred 2023-11-27 16:12:12 -05:00
mduval76
4a9ad70d48 Push changement pour Parametres -> Settings 2023-11-27 16:03:06 -05:00
MarcEricMartel
0b5c30b693 123457 💯 2023-11-27 15:03:53 -05:00
MarcEricMartel
f9c3571ab2 1080p 2023-11-27 14:56:43 -05:00
MarcEricMartel
2a7fe7e806 LA CLAN PANNETON POUR DÉMÉNAGER FAUT SIGNALER LE (/&)&)&! 2023-11-27 14:53:23 -05:00
MarcEricMartel
8ea5af6ef9 16 tons. 2023-11-27 14:48:18 -05:00
MarcEricMartel
841b0176f6 HAHAHAHA HEY! MOSKAU MOSKAU BADDABADBADBABDBAD 2023-11-27 14:42:56 -05:00
MarcEricMartel
702a65c5b0 EEEEEEEH BO DEREK, EH 2023-11-27 14:24:11 -05:00
MarcEricMartel
6e556b4f84 IDBENOGOOD 2023-11-27 13:29:59 -05:00
MarcEricMartel
e6b3f2fb1c UDP to the rescue 2023-11-27 13:21:50 -05:00
MarcEricMartel
5e57a13820 Fuck around and find out 2023-11-27 13:15:39 -05:00
MarcEricMartel
9a7d25c1d9 EH LALA. 2023-11-27 13:11:24 -05:00
MarcEricMartel
c24123362a ah. 2023-11-27 12:42:46 -05:00
Rynort
9bb8b1c9e5 Ajout de la page Option
Pas de bouton encore
2023-11-27 02:57:22 -05:00
MarcEricMartel
35a5ddd9bd static_cast? 2023-11-26 12:40:08 -05:00
MarcEricMartel
85ab712032 Summary (required) 2023-11-26 12:31:17 -05:00
MarcEricMartel
0f1a864282 🎶 If you want to destroy my renderrrrrrrrrr... 2023-11-26 12:23:17 -05:00
MarcEricMartel
0200f77be8 Johnny B. NoGood! 🎶 2023-11-26 12:19:05 -05:00
MarcEricMartel
935216e9c3 Ça plane pour pasmoi. 2023-11-26 12:12:09 -05:00
mduval76
1ab83a85a7 Transfert classe Paramteres de common à SQCSim 2021 2023-11-25 14:05:47 -05:00
mduval76
2ab201e93c Validation changements indexes. Fusion main vers sauveparams 2023-11-25 13:59:51 -05:00
MarcEricMartel
0c1714dd14 INXS 2023-11-24 15:25:40 -05:00
MarcEricMartel
981d66c730 M*SYNCs 2023-11-24 15:24:46 -05:00
MarcEricMartel
bd3f677118 PATATE PLAY 2023-11-24 15:11:16 -05:00
MarcEricMartel
35c55f2e26 -__- 2023-11-24 15:01:32 -05:00
MarcEricMartel
9bf5188e0f 5 2023-11-24 14:54:38 -05:00
MarcEricMartel
e8d456cc09 -danse de la pluie- 2023-11-24 14:36:55 -05:00
MarcEricMartel
7ccecdfd4a if notaire break. 2023-11-24 14:27:11 -05:00
MarcEricMartel
6f13e8fb70 🔡 2023-11-24 14:22:05 -05:00
MarcEricMartel
d1c3d17055 ayoye bobo 2023-11-24 14:18:37 -05:00
MarcEricMartel
d7bd36d134 DE 🐛 2023-11-24 13:05:17 -05:00
MarcEricMartel
ce2d03c354 Render other players 2023-11-24 12:58:06 -05:00
MarcEricMartel
2e30995f1b Merge branch 'SQC-15_animation' into SQC-15_paquets 2023-11-24 12:46:04 -05:00
Claudel-D-Roy
9572a7d6fd push des textures Atlas des animations 2023-11-24 12:45:17 -05:00
MarcEricMartel
bc7127ef7d Eh baswell 2023-11-24 12:41:20 -05:00
MarcEricMartel
06a5bb67d3 :clock: côté client 2023-11-24 12:36:01 -05:00
Rynort
83e438583f Avancement Page Option 2023-11-20 17:34:39 -05:00
Claudel-D-Roy
3600e597e6 Modif 2023-11-20 16:53:35 -05:00
Claudel-D-Roy
38a6c26407 Modif de booster 2023-11-20 16:51:36 -05:00
Frederic Leger
e2ff55603d Merge branch 'master' of https://github.com/CegepSTH/SQCSim2023 2023-11-20 16:28:14 -05:00
Frederic Leger
49b90509b9 ajustement booster 2023-11-20 16:27:59 -05:00
MarcEricMartel
14be450f09 🎶 You spin me right round, baby, right round, like a record, baby, right round, round, round 🎶 2023-11-20 16:27:19 -05:00
Claudel-D-Roy
279ea6072f 🚑 2023-11-20 16:19:12 -05:00
Jonathan Trottier
f7bfa8a81e Merge branch 'master' into SQC-35_nouvelles_structures 2023-11-20 16:05:29 -05:00
Jonathan Trottier
3118f71b9c ajout de billot de bois 2023-11-20 16:02:45 -05:00
Rynort
75a32270b5 mini-push 2023-11-20 15:45:08 -05:00
Frederic Leger
3a38753d8e Merge branch 'master' into SQC19_Booster 2023-11-20 15:43:01 -05:00
Frederic Leger
8769aa9e38 booster affiche
affiche simplement un carre rouge pour l'instant et ne se ramasse pas encore
2023-11-20 15:40:43 -05:00
MarcEricMartel
a91e5dcf5e OUaip 2023-11-20 15:20:20 -05:00
Claudel-D-Roy
02fafea45c Push de couleur qui marche pas 💢 2023-11-20 15:02:02 -05:00
Claudel-D-Roy
85b8f4b94b Ajout des TextureAtlas et affichage de RemotePlayer 2023-11-20 14:28:54 -05:00
Frederic Leger
225c815da4 Merge branch 'SQC-15_animation' into SQC19_Booster 2023-11-20 12:15:28 -05:00
Claudel-D-Roy
4751b2350a Biggest ReSeizing Ever On Earth 2023-11-19 19:37:28 -05:00
MarcEricMartel
8860593740 :godmode: ENFIN SANT-CALISSE DE CRISS 2023-11-19 16:46:13 -05:00
Claudel-D-Roy
82cfc2d1b1 pleurer en rotation 2023-11-18 14:16:24 -05:00
mduval76
8e041a314d Push premiere esquisse des parametres de sauvegarde 2023-11-16 23:39:44 -05:00
mduval76
6bb3ee9667 push changement de location 2023-11-16 20:47:20 -05:00
mduval76
f654c5effa Push initial pour sauvegarde des paramètres 2023-11-16 18:01:00 -05:00
Claudel-D-Roy
dc0d2d8148 Merge branch 'SQC-15_paquets' into SQC-15_animation 2023-11-15 11:35:03 -05:00
MarcEricMartel
86536fbb99 Maintenant je comprend les singes au début de 2001 A Space Odyssey 2023-11-15 08:27:51 -05:00
Claudel-D-Roy
9426af39e7 push triste du quad qui marche pas 2023-11-14 22:17:00 -05:00
Rynort
3ca941f0ce Update engine.cpp 2023-11-13 17:20:33 -05:00
MarcEricMartel
e011e2f1fc Merge remote-tracking branch 'origin/SQC-15_animation' into SQC-15_paquets 2023-11-13 17:02:39 -05:00
MarcEricMartel
71852738c1 Merge branch 'master' into SQC-15_paquets 2023-11-13 16:51:27 -05:00
MarcEricMartel
cfb9b56ee8
Merge pull request #25 from CegepSTH/SQC-33_Retrecissage_du_monde
rétrécissement du monde
2023-11-13 16:46:49 -05:00
Claudel-D-Roy
dfd2ddc8af push de test pour les animations 2023-11-13 16:02:13 -05:00
Rynort
4c695fbe47 mini changement 2023-11-13 15:42:04 -05:00
Jonathan Trottier
80a5bf90b4 rétrécissement du monde 2023-11-08 10:32:16 -05:00
MarcEricMartel
e5e3c19137 🕐 Implémentation de la synchro basique. 2023-11-07 07:56:59 -05:00
MarcEricMartel
8bd46ba831 Receiving 📦 2023-11-07 07:46:11 -05:00
MarcEricMartel
bc1f4f750b heum well 2023-11-06 17:59:57 -05:00
MarcEricMartel
253e49b1cc DOMO ARIGATO, MISUTA ROBOTO :trollface: 2023-11-06 16:43:52 -05:00
Rynort
cd921b3ab3 Réparation du Merge du Pause 2023-11-06 16:04:34 -05:00
MarcEricMartel
ef7851bebf
Merge branch 'master' into SQC-22 2023-11-06 15:39:54 -05:00
MarcEricMartel
9b9e2b3f1f Poll McSocket 2023-11-06 13:56:12 -05:00
MarcEricMartel
ac9174f793 Envoi des millis avec les Inputs 2023-11-02 15:47:15 -04:00
f51305bd11 O_o' 2023-11-02 11:52:49 -04:00
MarcEricMartel
2753e41d34 😠 2023-11-01 16:40:33 -04:00
MarcEricMartel
408679433b wtf?! 2023-11-01 15:02:41 -04:00
MarcEricMartel
5cf5eb132a 📼 2023-11-01 12:40:38 -04:00
MarcEricMartel
0ef437600d Merge branch 'master' into SQC-15_paquets 2023-11-01 10:14:05 -04:00
Jonathan Trottier
79013fe5d1
Merge pull request #21 from CegepSTH/SQC_21_MenuSoloMulti
Push menu solo ou multi.
2023-11-01 10:04:30 -04:00
MarcEricMartel
e5d9eb2fa6 Erratum 2023-11-01 08:59:09 -04:00
MarcEricMartel
ccad131370 Merge branch 'master' into SQC-15_paquets 2023-11-01 06:27:02 -04:00
MarcEricMartel
6570ce1302 *laugh maniacally* 2023-11-01 06:17:58 -04:00
MarcEricMartel
88a8553608 *guttural scream* 2023-11-01 06:12:38 -04:00
MarcEricMartel
3db59a876c ser/deser dood, wat nou? 2023-10-31 15:28:10 -04:00
MarcEricMartel
78f7974f1c OH YEAH. 2023-10-31 15:06:03 -04:00
MarcEricMartel
54307b7c17 Le seed est pas bon, mais ON A LES DROITS! 2023-10-31 14:38:30 -04:00
mduval76
9dd2e1b821 Fix pour resize dynamique de la fenetre de jeu (positionnement et scalaires).
Fix pour le maudit F10-fullscreen
2023-10-31 11:11:14 -04:00
MarcEricMartel
f44b6cd7dc y tho 2023-10-30 16:57:12 -04:00
Frederic Leger
3e89035de5 Merge branch 'master' into SQC-54_MenuBackGround 2023-10-30 16:21:16 -04:00
Louis-Charles Gaumond
0c8772edbf Changer l'image background du menu 2023-10-30 15:52:15 -04:00
Rynort
e5189f437c Finission du code pour le Pause 2023-10-30 15:49:17 -04:00
MarcEricMartel
35c2a5be31 pouet pouet 2023-10-30 15:36:43 -04:00
Jonathan Trottier
602bb84428 fonctionnel 2023-10-30 14:56:04 -04:00
Jonathan Trottier
4df7cfbd5d Merge branch 'master' into SQC-18_Mecanique_de_combat 2023-10-30 14:37:58 -04:00
Jonathan Trottier
6e75bec25c degats dans bullet 2023-10-30 14:36:44 -04:00
Frederic Leger
2d52abab07 Merge branch 'master' into SQC19_Booster 2023-10-30 14:33:41 -04:00
Frederic Leger
559a8efc19 ajout texture 2023-10-30 14:32:20 -04:00
Claudel-D-Roy
a82f994d49 Merge branch 'SQC19_Booster' of https://github.com/CegepSTH/SQCSim2023 into SQC19_Booster 2023-10-30 14:19:57 -04:00
Claudel-D-Roy
5f3b5b3777 BoosterVert 2023-10-30 14:19:55 -04:00
Frederic Leger
b67d7c647f Merge branch 'master' into SQC19_Booster 2023-10-30 14:09:39 -04:00
Frederic Leger
9fa4f2829b add boostinfo 2023-10-30 14:03:10 -04:00
MarcEricMartel
3249d68e60 Correction pour l'entrée de données 2023-10-30 13:24:46 -04:00
Jonathan Trottier
ada9330588 Merge branch 'master' into SQC-18_Mecanique_de_combat 2023-10-30 12:38:42 -04:00
MarcEricMartel
3da8be6d52 Gestion pour que ça marche partout 2023-10-30 11:11:13 -04:00
MarcEricMartel
a95dd02896 Cleanup ioctl 2023-10-30 11:07:26 -04:00
MarcEricMartel
6ce7e62e05 pour être sûr 2023-10-29 16:45:57 -04:00
MarcEricMartel
e2dbf52b17 a tester sur Linux (rien change sur windows) 2023-10-29 16:43:09 -04:00
mduval76
eed8f5f04a Push menu solo ou multi. 2023-10-29 15:39:29 -04:00
MarcEricMartel
53ed811936 Va falloir checker si Linux va être content ou pas. 2023-10-29 15:24:03 -04:00
MarcEricMartel
15b4dfefc0 That'll be good 'nough for now. 2023-10-29 15:20:19 -04:00
MarcEricMartel
b54f8c31e5 windoes 2023-10-29 14:54:36 -04:00
MarcEricMartel
0b07d46dba Merge branch 'master' into SQC-15_paquets 2023-10-28 14:44:43 -04:00
aab3301234 Client Linux qui re-marche 2023-10-28 14:11:01 -04:00
MarcEricMartel
10fcfed05a but I just had to laugh 2023-10-28 12:13:45 -04:00
MarcEricMartel
a69e716105 And though the news was rather sad 2023-10-28 12:06:01 -04:00
MarcEricMartel
3f8d860b93 About a lucky man who made the grade 2023-10-28 12:03:22 -04:00
MarcEricMartel
42d612ad33 I read the news today, oh boy. 2023-10-28 11:18:01 -04:00
MarcEricMartel
c23d1b2120 Surprise. 2023-10-27 16:20:05 -04:00
MarcEricMartel
76a7d0218d Who knows?! 2023-10-27 15:47:34 -04:00
MarcEricMartel
e2e66f3b6c à tester 2023-10-27 15:44:33 -04:00
Claudel-D-Roy
e2fa4fea7c Merge branch 'SQC_17_HUD' 2023-10-27 14:53:45 -04:00
MarcEricMartel
61629b3c8e RemotePlayer 2023-10-27 14:37:53 -04:00
MarcEricMartel
8970bc33a1 Répârâge 2023-10-27 14:08:06 -04:00