Commit Graph

179 Commits

Author SHA1 Message Date
MarcEricMartel
242250f251 Oh oh oh oh oh!!! 2023-12-06 14:31:05 -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
f29abe8046 Merge branch 'master' into SQC-15_online 2023-12-06 12:18:01 -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
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
2446b90bff bulletadd 2023-12-05 06:25:48 -05:00
Louis-CharlesG
2c73a2ed00 Correction des arbres. 2023-12-04 17:17: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
78b3ed85cb
Merge branch 'MenusMenusMenus' into SQC-15_paquets 2023-12-04 13:13:54 -05:00
MarcEricMartel
0af76b3f2e
Merge pull request #33 from CegepSTH/SQC32_sauveParams
Sqc32 sauve params
2023-12-02 15:09:14 -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
mduval76
3e3a7650e8 Push options Volume et Resolution de base 2023-12-01 13:48:48 -05:00
34ad4724f2 Tibug + Linux 2023-11-28 19:19:24 -05:00
MarcEricMartel
e89b5914fb Sync ees almöss de voork! 2023-11-27 17:44:52 -05:00
Louis-CharlesG
e3b59e37eb Les arbres avec le seed. 2023-11-27 16:47:10 -05:00
mduval76
4a9ad70d48 Push changement pour Parametres -> Settings 2023-11-27 16:03:06 -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
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
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
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
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
Frederic Leger
3a38753d8e Merge branch 'master' into SQC19_Booster 2023-11-20 15:43:01 -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
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
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
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
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
Jonathan Trottier
80a5bf90b4 rétrécissement du monde 2023-11-08 10:32:16 -05:00
MarcEricMartel
253e49b1cc DOMO ARIGATO, MISUTA ROBOTO :trollface: 2023-11-06 16:43:52 -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
2753e41d34 😠 2023-11-01 16:40:33 -04:00
MarcEricMartel
ab84e42c72 un tipeu de cleanup 2023-11-01 12:18:27 -04:00
MarcEricMartel
6e47bdc8a4 Comments 2023-11-01 10:13:10 -04:00
MarcEricMartel
88acc268b8 🐶 2023-11-01 09:19:26 -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
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
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
Frederic Leger
9fa4f2829b add boostinfo 2023-10-30 14:03:10 -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
b50a2f44e2 We are the wooooorld, we are the childreeen 2023-10-29 15:07:01 -04:00
MarcEricMartel
b54f8c31e5 windoes 2023-10-29 14:54:36 -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
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
49c9576757 Ser/deser Sync 2023-10-27 15:07:38 -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
MarcEricMartel
57d60e02a7 getId() 2023-10-27 13:55:15 -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
6a8a505167 Yeehaw. 2023-10-27 12:02:29 -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
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