1
0
mirror of https://github.com/vcmi/vcmi.git synced 2026-05-22 09:55:17 +02:00
Commit Graph

71 Commits

Author SHA1 Message Date
Ivan Savenko 383387ef29 Integrated defaultMods into mod system 2023-03-16 17:55:09 +02:00
Konstantin 5366f9190e vcmi: reduce boost::lexical_cast usage 2023-03-09 16:36:46 +03:00
Andrey Filipenkov fd56f86a84 introduce VCMI_MOBILE macro 2023-03-02 12:09:49 +03:00
Andrey Filipenkov c4e7e91850 fix single process build for Android 2023-03-02 12:09:48 +03:00
Andrii Danylchenko 9f55666931 rework netpacks to avoid double typeinfo 2023-02-13 20:26:39 +02:00
Ivan Savenko b1821d4442 Removed some SDL access from non-SDL code 2023-02-03 11:39:40 +02:00
Ivan Savenko e1bd0d2a04 API for custom events no longer requires SDL access 2023-02-03 11:39:40 +02:00
Ivan Savenko 9c3030603d Removed most SDL includes from headers, removed SDL int's 2023-01-30 19:55:32 +02:00
Ivan Savenko bdb8e0ee5c Introduced string identifiers for H3 texts, still WIP 2023-01-01 14:56:44 +02:00
Ivan Savenko eb20a4b208 Merge remote-tracking branch 'vcmi/develop' into warnings_fix 2022-12-23 14:40:45 +02:00
Ivan Savenko facf77b3ae vstd::unique -> std::unique 2022-12-07 23:36:20 +02:00
Ivan Savenko 6463e906d5 vcmi can be compiled as single app on Linux
TODO: check compilation on Win/Mac using Github Actions
2022-12-05 21:36:02 +02:00
nordsoft 915d215076 Fix connections amount problem 2022-11-15 22:09:47 +04:00
nordsoft e7a8466e2b Merge remote-tracking branch 'upstream/develop' into lobby 2022-11-15 22:09:46 +04:00
lainon 79bc82af63 Fix [3144] 2022-11-13 05:35:16 +03:00
nordsoft 56757bb5c2 Pass port from client to server for ios 2022-11-11 18:35:40 +04:00
nordsoft 9ffc50457a Bypass command line args to vcmiserver 2022-11-08 18:05:47 +04:00
nordsoft 97e5fc8a07 Lobby works 2022-11-08 04:44:34 +04:00
nordsoft e21c2a02ce Merge remote-tracking branch 'upstream/develop' into lobby 2022-11-02 18:33:33 +04:00
nordsoft 27bff89e66 Write port override 2022-10-30 19:59:43 +04:00
nordsoft dd45d1a9cf Develop game part 2022-10-25 05:27:53 +04:00
nordsoft ea49b8cf40 Cleanup code 2022-10-06 17:56:54 +04:00
nordsoft 930f03e812 uuid check 2022-10-04 20:54:40 +04:00
nordsoft 83f4a5b561 Use host and port from config 2022-10-04 18:45:54 +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
nordsoft 722acb2a1d Reconnection works 2022-10-04 05:42:14 +04:00
nordsoft 16a5414247 Reconnection partially works 2022-10-04 05:09:03 +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 8a8716ce8a Pass loaded game over network too 2022-09-29 21:33:44 +04:00
nordsoft b888e640f3 Fix compilation 2022-09-29 21:18:30 +04:00
nordsoft fea05a4320 Finally game restart works
# Conflicts:
#	lib/CGameState.cpp
#	server/CVCMIServer.cpp
2022-09-29 21:08:05 +04:00
nordsoft 2eb497b477 Looks like everything works 2022-09-28 23:38:41 +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 3ab21d8491 show loading indicator when starting local server
single player or hosting a multiplayer game
2022-09-24 15:55:25 +03:00
Andrey Filipenkov 031ba967d3 fix indentation 2022-09-24 15:55:24 +03:00
Andrey Filipenkov cd4b68c034 fix repeated launches of single player
now server actually terminates
2022-09-24 15:55:22 +03:00
Andrey Filipenkov b7bc8495d8 remove copy-paste 2022-09-24 15:55:22 +03:00
Andrey Filipenkov 342a859a3f fix typo 2022-09-24 15:55:21 +03:00
Andrey Filipenkov 24a5dd797c fix starting local server 2022-09-24 15:55:21 +03:00
Andrey Filipenkov de05479532 Revert "attempt to run server in a separate app"
This reverts commit 99fe55b295ad95033626c15011cfe49779269156.
2022-09-24 15:55:21 +03:00
Andrey Filipenkov dde9a5d5d2 todo updates 2022-09-24 15:55:17 +03:00
Andrey Filipenkov e72e5cea6f attempt to run server in a separate app
partially reverts 3258f8bb40487e3731bf452dbda1add6294ff4b2
2022-09-24 15:55:17 +03:00
Andrey Filipenkov 2e18299897 make server a static lib, run it in a separate thread
issues to solve:
- dynamic_cast error 2: One or more of the following type_info's has hidden visibility or is defined in more than one translation unit. They should all have public visibility. 13CPackForLobby, 20LobbyClientConnected, 20LobbyClientConnected.
- error setting socket option: set_option: No buffer space available
2022-09-24 15:55:16 +03:00
Andrey Filipenkov c4233ad706 exclude some code similar to android 2022-09-24 15:55:16 +03:00
Andrey Filipenkov b824a90295 initial iOS support to fix building
tested with Xcode and Unix Makefiles
2022-09-24 15:55:15 +03:00
nordsoft e74890c4b1 Add system message about mods incompatibility 2022-09-23 15:02:45 +04:00