Commit Graph

289 Commits

Author SHA1 Message Date
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
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
11e8684ee0
Merge pull request #23 from CegepSTH/SQC-54_MenuBackGround
Sqc 54 menu back ground
2023-11-01 06:20:44 -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
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
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
bbfc98ff12
Merge pull request #19 from CegepSTH/SQC-15_paquets
Sqc 15 paquets
2023-10-30 14:08:48 -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
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
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