SQC-15_online #1

Merged
memartel_loc merged 349 commits from SQC-15_online into master 2023-12-10 17:41:26 -05:00

349 Commits

Author SHA1 Message Date
MarcEricMartel
5b0be2d985 Gossage de musique 2023-12-09 16:51:43 -05:00
MarcEricMartel
c176fddea1 Update engine.cpp 2023-12-09 16:25:24 -05:00
MarcEricMartel
46298f8256 Oh yeah. 2023-12-09 15:54:06 -05:00
MarcEricMartel
461a8aa11b Merge remote-tracking branch 'origin/InputFields' into SQC_mergeFieldsAndOnline 2023-12-09 15:23:44 -05:00
MarcEricMartel
9aaad6426c 🚫 👂 🐆 2023-12-09 12:02:04 -05:00
mduval76
09979f1e72 Push connexion multiplayer. 2023-12-09 00:00:52 -05:00
mduval76
c88143c2bc Push inputs username et server address fonctionnels. 2023-12-08 23:42:01 -05:00
mduval76
ff10207257 Push backspace fonctionnel 2023-12-08 23:06:33 -05:00
mduval76
06cd890506 Push input rejette touches non valides. 2023-12-08 22:34:17 -05:00
mduval76
850f5a59d8 Push string accumule comme il faut 2023-12-08 22:15:10 -05:00
mduval76
9562dc00b8 Push SimulateKeyboard différencie MAJ et MIN 2023-12-08 21:45:19 -05:00
mduval76
d6b1870b5b Push fake keyboard - Simulatekeyboard 2023-12-08 19:55:59 -05:00
MarcEricMartel
63d70be488 Make player spawn point random working? 2023-12-08 05:07:05 -05:00
MarcEricMartel
3da68297e4 Cleanup + client. 2023-12-08 04:58:27 -05:00
MarcEricMartel
34976ef7ec /* delete[] mess */ Well there's your mem leak. 2023-12-08 04:55:00 -05:00
MarcEricMartel
7d46536acc Can now clean bullets off the forest. 2023-12-08 04:31:10 -05:00
mduval76
721fef57e2 Push lobby labels. 2023-12-07 16:31:43 -05:00
MarcEricMartel
7e98eeb852 whyyyyyyyyy 2023-12-07 15:47:31 -05:00
MarcEricMartel
db95c6ef10 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-07 15:14:24 -05:00
MarcEricMartel
486c823da1 OH 2023-12-07 15:14:16 -05:00
Claudel-D-Roy
fcd1c869b9 Enlever les commentaires 2023-12-07 15:13:45 -05:00
MarcEricMartel
8bfee4a9ff :Q 2023-12-07 14:24:09 -05:00
Claudel-D-Roy
58c97587bf Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-07 14:04:38 -05:00
Claudel-D-Roy
d1f02c34e9 FaCkInG HeLL 2023-12-07 14:04:31 -05:00
MarcEricMartel
ab87da7d88 Ehm. 2023-12-07 14:03:58 -05:00
mduval76
c66e49ab0c Push de quoi 2023-12-07 13:55:44 -05:00
MarcEricMartel
33bcdea06f IT'S LEAKING! 2023-12-07 13:34:58 -05:00
MarcEricMartel
4d44d57a5a Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-07 13:06:00 -05:00
MarcEricMartel
f6c5379a8c °Oo. 2023-12-07 13:05:52 -05:00
Claudel-D-Roy
bc865dd9b5 Bacon ‼️ 2023-12-07 13:05:21 -05:00
MarcEricMartel
5696e20452 Gériboire! 2023-12-07 12:51:17 -05:00
MarcEricMartel
4e0a9cea35 Crosby, Still, Jump and Shoot 2023-12-07 12:48:48 -05:00
MarcEricMartel
f0afdf828e Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-07 12:43:49 -05:00
MarcEricMartel
11458214d0 Update connection.cpp 2023-12-07 12:43:40 -05:00
Claudel-D-Roy
1905c31923 Push && Pull 2023-12-07 12:43:16 -05:00
MarcEricMartel
99a5054c8f Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-07 12:32:45 -05:00
MarcEricMartel
74b808f46b Jump and Shoot! 🎶 2023-12-07 12:32:36 -05:00
Claudel-D-Roy
0a08a22c60 Jump && shoot 2023-12-07 12:31:04 -05:00
Claudel-D-Roy
4e287702c3 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-07 12:22:58 -05:00
Claudel-D-Roy
3e8497f43b 💫 2023-12-07 12:22:49 -05:00
MarcEricMartel
e9e2a56be6 OOPS I DID IT AGAIN. I PLAYED WITH THE CODE, GOT LOST IN THE MORT. 2023-12-07 12:21:21 -05:00
MarcEricMartel
b7b6a8cc7b I hurt myself today ... because of the serveur. 2023-12-07 12:15:57 -05:00
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
Claudel-D-Roy
57bfacf942 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-06 16:49:34 -05:00
Claudel-D-Roy
51bd6440f0 JUMPSHOOT 2023-12-06 16:49:26 -05:00
MarcEricMartel
c8c82770b7 Mr. Clean? 2023-12-06 16:48:53 -05:00
MarcEricMartel
84249ef84c YÉ TÔRD 2023-12-06 16:42:09 -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
MarcEricMartel
481b5a284c skibidi 🚽 2023-12-06 16:23:09 -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
MarcEricMartel
d1805f2309 Pleurer en chat. 2023-12-06 16:20:59 -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
MarcEricMartel
9924c12ccd Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-06 15:52:08 -05:00
MarcEricMartel
0fb5c85660 Everything is false. 2023-12-06 15:52:00 -05:00
Claudel-D-Roy
bf0306f018 👊 2023-12-06 15:51:55 -05:00
MarcEricMartel
db854c77b2 👌 2023-12-06 15:47:14 -05:00
MarcEricMartel
7077b617be Rollover Beethoven 2023-12-06 15:37:08 -05:00
MarcEricMartel
6178604d95 Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online 2023-12-06 14:49:45 -05:00
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
mduval76
63d8a62429 Push tin toé 2023-12-06 13:14:51 -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
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
34ad4724f2 Tibug + Linux 2023-11-28 19:19:24 -05:00
MarcEricMartel
12ef911e79 Delete the world... delete the children... 2023-11-28 11:53:21 -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
b23b2c6838
Merge pull request #31 from CegepSTH/SQC-31
Sqc 31 smerge
2023-11-27 16:55:31 -05:00
mduval76
a26929fe66
Merge branch 'master' into SQC-31 2023-11-27 16:54:58 -05:00
Louis-CharlesG
e3b59e37eb Les arbres avec le seed. 2023-11-27 16:47:10 -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
Jonathan Trottier
e330f5dd67 Merge branch 'master' into SQC-35_nouvelles_structures 2023-11-27 15:58:34 -05:00
Jonathan Trottier
2f5579875e little modif 2023-11-27 15:57:31 -05:00
Jonathan Trottier
114c1631a8 randomness no more random 2023-11-27 15:56:47 -05:00
MarcEricMartel
cfc7f7e01d Ça s'ra pas long. 2023-11-27 15:15:21 -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
b6d5975648 I know what boys like. 2023-11-27 13:52:49 -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
MarcEricMartel
6c0d65ea22 Info. 2023-11-27 12:39:36 -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
ea3d2ffc34 2023-11-24 15:56:58 -05:00
MarcEricMartel
775c8cf26f 440hz 2023-11-24 15:32:53 -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
3043b1ff6b débébitter 2023-11-24 14:33:48 -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
573316682b Jim Babwe 2023-11-24 14:15:40 -05:00
MarcEricMartel
bd14cd3962 Cleanup II 2023-11-24 13:47:47 -05:00
MarcEricMartel
480521ebaf Cleanup 2023-11-24 13:47:24 -05:00
MarcEricMartel
312542857a united states of remoteplayer 2023-11-24 13:46:16 -05:00
MarcEricMartel
c1aa321f2b 💩 2023-11-24 13:42:53 -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
f22c405915 Erratum. 2023-11-24 12:43:09 -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
Claudel-D-Roy
488fe55410
Merge pull request #30 from CegepSTH/SQC-35_nouvelles_structures
Sqc 35 nouvelles structures
2023-11-20 16:12:33 -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
MarcEricMartel
6855e50144
Merge pull request #29 from CegepSTH/SQC19_Booster
Sqc19 booster
2023-11-20 15:56:23 -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
Louis-CharlesG
732f74de91 Changement dans le chunk a ajout des arbes avec le seed. 2023-11-20 15:39:11 -05:00
Claudel-D-Roy
547772b2f9
Merge pull request #28 from CegepSTH/SQC-15_paquets
Sqc 15 paquets
2023-11-20 15:31:30 -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
bb810ba1c1
Merge pull request #27 from CegepSTH/master
Reverse pr
2023-11-13 16:55:21 -05:00
MarcEricMartel
71852738c1 Merge branch 'master' into SQC-15_paquets 2023-11-13 16:51:27 -05:00
MarcEricMartel
fedd150461
Merge pull request #26 from CegepSTH/SQC-33_Retrecissage_du_monde
correction
2023-11-13 16:48:02 -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
MarcEricMartel
c98625a610 correction 2023-11-13 16:46:03 -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
MarcEricMartel
a4a99ed425
Merge pull request #24 from CegepSTH/SQC-22
Sqc 22
2023-11-10 18:36:31 -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
d49d5cdebc ehm 2023-11-06 14:07:38 -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
13ba82d09e on enlève le ouach. 2023-11-01 16:45:38 -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
ab84e42c72 un tipeu de cleanup 2023-11-01 12:18:27 -04:00
MarcEricMartel
0ef437600d Merge branch 'master' into SQC-15_paquets 2023-11-01 10:14:05 -04:00
MarcEricMartel
6e47bdc8a4 Comments 2023-11-01 10:13:10 -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
88acc268b8 🐶 2023-11-01 09:19:26 -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
11e8684ee0
Merge pull request #23 from CegepSTH/SQC-54_MenuBackGround
Sqc 54 menu back ground
2023-11-01 06:20:44 -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
48078182a1 ser/deser toch dood, wat nou? 2023-10-31 15:30:07 -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
553ef01765 ptit cleanup 2023-10-31 14:40:38 -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
eb7116bac8 BUFFER_LENGTH 2023-10-30 17:22:21 -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
851d5f0c0b
Merge pull request #20 from CegepSTH/SQC-18_Mecanique_de_combat
Sqc 18 mecanique de combat
2023-10-30 15:44:41 -04:00
MarcEricMartel
2a4a5e13cc Correction pour pr20 2023-10-30 15:42:02 -04:00
MarcEricMartel
35c2a5be31 pouet pouet 2023-10-30 15:36:43 -04:00
Jonathan Trottier
9b0c4dc594 modif des degats 2023-10-30 14:58:17 -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
bbfc98ff12
Merge pull request #19 from CegepSTH/SQC-15_paquets
Sqc 15 paquets
2023-10-30 14:08:48 -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
b50a2f44e2 We are the wooooorld, we are the childreeen 2023-10-29 15:07:01 -04:00
MarcEricMartel
4f64be7e0a Feeeeeed the woooooooooorld 2023-10-29 14:59:29 -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
MarcEricMartel
c33e6f865c I believe in a thing called SOCK_NONBLOCK 2023-10-28 14:41:23 -04:00
03be36ecda J'ai pu de messages de warning quand je build le client 2023-10-28 14:16:39 -04:00
aab3301234 Client Linux qui re-marche 2023-10-28 14:11:01 -04:00
MarcEricMartel
d0c39e49b0 Update netprotocol.cpp 2023-10-28 12:59:19 -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
MarcEricMartel
f0bf7d94ce pas trop loin 2023-10-27 15:19:44 -04:00
MarcEricMartel
49c9576757 Ser/deser Sync 2023-10-27 15:07:38 -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
MarcEricMartel
bd817f9f7d Merge branch 'sqc-14_classe_remoteplayer' of https://github.com/CegepSTH/SQCSim2023 into sqc-14_classe_remoteplayer 2023-10-27 13:55:25 -04:00
MarcEricMartel
57d60e02a7 getId() 2023-10-27 13:55:15 -04:00
Claudel-D-Roy
ae201846b1 push de correction 2023-10-27 13:54:37 -04:00
MarcEricMartel
1c7523558b Changé de port 2023-10-27 13:39:18 -04:00
MarcEricMartel
f7b7a7f14d Changements C++20 et retour audio 2023-10-27 13:27:00 -04:00
da594fa3a2 correction client 2023-10-27 12:23:45 -04:00
6a8a505167 Yeehaw. 2023-10-27 12:02:29 -04:00
0dded0bc9b try câtch 2023-10-27 10:40:53 -04:00
9ef44a3993 Ev'ryday I'm bufferin'. 2023-10-27 09:51:40 -04:00
0bc7f29492 Gros refactoring sale. 2023-10-27 09:28:34 -04:00
60cc69a407 Erratum VI: The Final Chapter 2023-10-26 17:57:42 -04:00
05f9658f55 erratum V? 2023-10-26 17:18:30 -04:00
2f2b49054f erratum IV 2023-10-26 11:17:13 -04:00
397cf7f00d erratum III 2023-10-26 10:55:36 -04:00
8e95899192 erratum II 2023-10-26 10:47:17 -04:00
8870550512 erratum 2023-10-26 10:42:24 -04:00
f5a1906877 Cleanup de srv 2023-10-26 10:39:08 -04:00
MarcEricMartel
9b4defba2a à tester 2023-10-25 12:16:14 -04:00
MarcEricMartel
dd2396e5e4 ajout LoginInfo dans le parseur de paquet. 2023-10-25 10:00:54 -04:00
MarcEricMartel
4964bc5394 ajouts dans netprot 2023-10-24 10:43:30 -04:00
MarcEricMartel
cf6e58cd95 erratas dans la sérialisation 2023-10-24 09:17:21 -04:00
MarcEricMartel
ffeb95d953 direction fonctionnelle! 2023-10-24 07:32:16 -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
MarcEricMartel
fc4aa20005 Update server.cpp 2023-10-23 16:54:09 -04:00
MarcEricMartel
ecfe5b893b connection? 2023-10-23 16:44:34 -04:00
MarcEricMartel
eea6a30aa5 aaaaaaa 2023-10-23 16:23:57 -04:00
MarcEricMartel
9f615db929 erratum 2023-10-23 16:23:27 -04:00
MarcEricMartel
498fb7baf7 lol 2023-10-23 16:21:15 -04:00
MarcEricMartel
49240635b6 sendpack qui fonctionne avec le client 2023-10-23 16:20:52 -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
Frederic Leger
dd851a17e1
Merge pull request #17 from CegepSTH/master
update branche
2023-10-23 12:50:03 -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
Claudel-D-Roy
d7e55c8446 Début de la classe remoteplayer.cpp, à vérifier 2023-10-15 16:23:43 -04:00
MarcEricMartel
183c5f186a Architecture générale 2023-10-03 12:43:54 -04:00