Commit Graph

406 Commits

Author SHA1 Message Date
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
MarcEricMartel
c1faaca417 Merge branch 'sqc-14_classe_remoteplayer' into SQC-15_paquets 2023-10-27 13:59:26 -04:00
Claudel-D-Roy
889884490b push avant merge 2023-10-27 13:56:48 -04:00
Claudel-D-Roy
ae201846b1 push de correction 2023-10-27 13:54:37 -04:00
mduval76
fc4a22e844 Push sans le menu solo/multi. 2023-10-27 13:27:15 -04:00
MarcEricMartel
f7b7a7f14d Changements C++20 et retour audio 2023-10-27 13:27:00 -04:00
MarcEricMartel
102153a093
Merge pull request #18 from CegepSTH/L-CSplash
Créé branche_L_C
2023-10-27 12:38:40 -04:00
da594fa3a2 correction client 2023-10-27 12:23:45 -04:00
60cc69a407 Erratum VI: The Final Chapter 2023-10-26 17:57:42 -04:00
MarcEricMartel
9b4defba2a à tester 2023-10-25 12:16:14 -04:00
mduval76
c7271f6217 Push skybox ciel éclairé 2023-10-25 02:06:29 -04:00
mduval76
8ebe7b95fc Push menu solo/multi avec titre et quads contenant choix. Manque persistence du menu en 2D et nom des choix dans les quads. 2023-10-25 01:01:25 -04:00
MarcEricMartel
cf6e58cd95 erratas dans la sérialisation 2023-10-24 09:17:21 -04:00
Rynort
85f4f82660 avancement menu pause 2023-10-23 17:51:29 -04:00
MarcEricMartel
2c3abff96f et c'est un début! 2023-10-23 17:49:40 -04:00
Claudel-D-Roy
5e29c9be54 push menu image 2023-10-23 17:11:13 -04:00
Louis-Charles Gaumond
f8680a318a Changement dans le splachscreen 2023-10-23 16:57:19 -04:00
MarcEricMartel
ecfe5b893b connection? 2023-10-23 16:44:34 -04:00
mduval76
df5b7960b2 Push placement text notification queue 2023-10-23 16:11:35 -04:00
Louis-Charles Gaumond
f4d4f1eca0 Créé branche 2023-10-23 16:10:21 -04:00
Jonathan Trottier
b943a268ae barre de vie 2023-10-23 15:43:55 -04:00
MarcEricMartel
590220bc92 ajout d'adresse de serveur 2023-10-23 15:41:07 -04:00
Claudel-D-Roy
67a49a4cad push de remote player 2023-10-23 15:35:31 -04:00
MarcEricMartel
0e7b8973e7 setup louche en console 2023-10-18 09:59:34 -04:00
MarcEricMartel
2cb7d4c776 Début 2023-10-18 09:33:56 -04:00
MarcEricMartel
18a5d98c57
Merge branch 'master' into sqc-20_audiobullet 2023-10-16 17:43:32 -04:00
MarcEricMartel
81240c6f70
Merge pull request #11 from CegepSTH/linux
Serveur Linux
2023-10-16 17:38:59 -04:00
MarcEricMartel
a054a7bff1 On l'a eu! 2023-10-16 17:36:04 -04:00
MarcEricMartel
b712c950c6 Merge branch 'master' into SQC-09 2023-10-16 16:35:26 -04:00
MarcEricMartel
9cbf20ba21 whoooosh! 2023-10-16 12:02:37 -04:00
Rynort
3f774d7c2e Réparation de la vitesse de la souris 2023-10-16 03:06:00 -04:00
mduval76
db0a39f64a Remaniement du HUD. TOUT est scalable aux dimensions du game window. % de vie ajouté. Font size multipliable. 2023-10-15 23:36:26 -04:00
Claudel-D-Roy
d7e55c8446 Début de la classe remoteplayer.cpp, à vérifier 2023-10-15 16:23:43 -04:00
MarcEricMartel
f2095f6e5b Merge branch 'linux' of https://github.com/CegepSTH/SQCSim2023 into linux 2023-10-07 11:43:55 -04:00
93062e49e2 client linux fonctionnel 2023-10-04 15:01:48 -04:00
MarcEricMartel
183c5f186a Architecture générale 2023-10-03 12:43:54 -04:00
MarcEricMartel
c85f7df15e Merge branch 'master' into linux 2023-10-03 11:34:02 -04:00
Rynort
6668127f15 SQC-06 et une partie du SQC-09 2023-10-02 17:09:03 -04:00
MarcEricMartel
54c25e6f78
Merge pull request #13 from CegepSTH/thehell_affichageMESS
SQC-8_Messagerie
2023-10-02 16:37:02 -04:00
Jonathan Trottier
bf164af23b changement de la grosseur du texte
les touches K et L pour faire afficher du texte
2023-10-02 16:27:41 -04:00
Claudel-D-Roy
0d948e3a28 Merge branch 'master' of https://github.com/CegepSTH/SQCSim2023 2023-10-02 16:27:26 -04:00
Claudel-D-Roy
b97890fff3 BrasDuJoueur 2023-10-02 16:27:21 -04:00
MarcEricMartel
432b8545a7 Merge branch 'master' into affichage_des_messages 2023-10-02 16:14:22 -04:00
Jonathan Trottier
54e2f32aba comments 2023-10-02 15:58:08 -04:00
Jonathan Trottier
90fdc8ed1b deux méthodes pour afficher message systeme et notification de kill 2023-10-02 15:55:45 -04:00