games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity
21,490 Commits 25 Branches 70 Tags
e2851e9d00a7bcad69d104db42fbaf76c1f52da7
Commit Graph

101 Commits

Author SHA1 Message Date
Ivan Savenko
a3639e77b1 Fixed handling of connection failure on client 2024-01-19 23:49:59 +02:00
Ivan Savenko
5694777a96 Simplified connection logic 2024-01-19 23:49:59 +02:00
Ivan Savenko
8ea69e457a Simplified applying of lobby packs 2024-01-19 23:49:59 +02:00
Ivan Savenko
22f0ca67c6 Fix connection to game lobby & map load 2024-01-19 23:49:59 +02:00
Ivan Savenko
0a1153e1c6 Switch client-server communication to new API 2024-01-19 23:49:59 +02:00
Ivan Savenko
ea1f05d15a Stabilization 2024-01-19 13:55:22 +02:00
Laserlicht
cb9c4bbaf0 unlimited replay option 2023-12-28 20:48:19 +01:00
Laserlicht
fc4827c89c option for allowing cheats 2023-12-27 14:39:35 +01:00
Nordsoft91
1ffc246c8b Merge pull request #3051 from Laserlicht/name_change 
possibility to change name in lobby
 2023-10-16 22:28:31 +02:00
Laserlicht
0a1578b797 Apply suggestions from code review 
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
 2023-10-16 21:24:59 +02:00
nordsoft
c8452355ce Revert "Merge pull request #2959 from Alexander-Wilms/faster-server-connection" 
This reverts commit 43636af2e4, reversing
changes made to aed2e360ba.

# Conflicts:
#	client/CServerHandler.cpp
 2023-10-14 22:52:24 +02:00
Laserlicht
0c6b1ca3c8 possibility to change name 2023-10-13 23:04:35 +02:00
Alexander Wilms
7c627d8163 Show info dialog when connection to multiplayer server fails 2023-10-10 18:11:11 +02:00
Alexander Wilms
c8f1512a3f Use correct address to decide whether we're connecting to a remote server or a local one 2023-10-06 23:33:51 +02:00
Ivan Savenko
71a1ed816a Merge pull request #2892 from Laserlicht/highscore_menu 
Highscore Menu & end video
 2023-09-27 15:48:47 +03:00
Ivan Savenko
5b21a5ffbc Simturn duration is now part of StartInfo 2023-09-26 13:42:20 +03:00
Laserlicht
6f8b62d77d codereview 2023-09-23 20:41:30 +02:00
Laserlicht
e18a4a09a9 forward declaration 2023-09-23 02:14:45 +02:00
Laserlicht
1a0f5cf159 calc preperation 2023-09-23 00:21:36 +02:00
Ivan Savenko
f8541d0ae4 Merge branch 'vcmi/master' into 'vcmi/develop' 2023-09-15 13:59:02 +03:00
Ivan Savenko
d070953c28 Fix open backpack strings 2023-09-12 21:28:36 +03:00
Ivan Savenko
538665fe42 Fix "Start game" blocking status: 
- Start game is now initially blocked
- Receiving valid startInfo from server will unlock button
 2023-09-12 21:15:15 +03:00
nordsoft
d758727c23 Basic timer ui is almost complete 2023-08-28 17:10:52 +04:00
Nordsoft91
ef4fddd0c4 Merge pull request #2570 from Laserlicht/town_selection_window 
Town selection window
 2023-08-20 17:37:45 +04:00
Nordsoft91
4a6deedd5e Merge pull request #2530 from Nordsoft91/tutorial 
Support tutorial
 2023-08-19 18:06:15 +04:00
Michael
077ec65bf6 simplify 2023-08-17 18:15:42 +02:00
Michael
e61dc2ec23 constants 2023-08-17 17:54:53 +02:00
Michael
1d76f456ad change servercode to make it more robust 2023-08-14 00:08:48 +02:00
Ivan Savenko
f13a53c1d9 Merge remote-tracking branch 'vcmi/beta' into develop 2023-08-12 17:28:47 +03:00
nordsoft
70d04ad957 Replace thread approach with callback based 2023-08-11 20:04:14 +04:00
Ivan Savenko
c524caee5c Fixed possible uncaught exception on starting map 2023-08-06 17:46:49 +03:00
Ivan Savenko
7f72f7a82c Cleanup server connection code a bit 2023-07-30 20:15:32 +03:00
Ivan Savenko
d1e5a347ff Refactoring of campaign handler: rename types and use strong typing 2023-06-26 17:15:59 +03:00
Ivan Savenko
57df1c3e0d Implemented gesture for town/hero lists and town/hero selection 2023-06-05 19:12:24 +03:00
Andrii Danylchenko
9f55666931 rework netpacks to avoid double typeinfo 2023-02-13 20:26:39 +02:00
Hennadii Chernyshchyk
eec7d91f2c Remove unused forward declaration 2022-12-15 15:33:30 +04:00
Hennadii Chernyshchyk
8de6c4a704 Fix SharedMemory declaration 
Should be under VCMI_LIB_NAMESPACE_BEGIN
 2022-12-15 15:33:30 +04:00
nordsoft
97e5fc8a07 Lobby works 2022-11-08 04:44:34 +04:00
nordsoft
0ea5a8fbe7 Merge remote-tracking branch 'upstream/develop' into mp-disconnection 
# Conflicts:
#	server/CVCMIServer.cpp
 2022-10-04 17:41:43 +04:00
Andrii Danylchenko
04490b709a Merge pull request #1000 from vcmi/multiplayer 
Multiplayer
 2022-10-03 20:16:39 +03:00
nordsoft
512cf014aa Freeze current state 2022-10-03 20:47:00 +04:00
Andrey Filipenkov
8f51a8756b restore last used address in Multiplayer join dialog 
in all other cases (when machine is host) hardcoded localhost address is displayed
 2022-10-01 17:41:12 +03:00
nordsoft
fea05a4320 Finally game restart works 
# Conflicts:
#	lib/CGameState.cpp
#	server/CVCMIServer.cpp
 2022-09-29 21:08:05 +04:00
nordsoft
7ee4fca120 Pass whole gamestate over network 2022-09-28 23:15:05 +04:00
Nordsoft91
d4f97aadf0 Merge branch 'develop' into incomatibility-response 2022-09-25 13:26:07 +04:00
Andrey Filipenkov
605d5b6481 add dedicated macro when building as single process 
fix kambala-decapitator/vcmi#40
 2022-09-24 15:55:25 +03:00
Andrey Filipenkov
ff635edc0b wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 
preparation for having client and server in a single process
 2022-09-24 15:55:21 +03:00
nordsoft
e74890c4b1 Add system message about mods incompatibility 2022-09-23 15:02:45 +04:00
Dydzio
1cc2ef537b Add proper thread synchronization for campaigns 2019-03-30 00:28:33 +01:00
Dydzio
e4a9ce3efe Do not create main menu UI for game restart (#462) 2018-07-19 00:58:38 +03:00