nordsoft
|
5743310aec
|
Revert settings.json
|
2022-10-09 00:13:39 +04:00 |
|
nordsoft
|
2eb49315f5
|
Fix terrains/roads/rivers after code synch
|
2022-10-09 00:11:29 +04:00 |
|
nordsoft
|
6d92a66fea
|
Fix compilation with latest develop
|
2022-10-08 23:54:45 +04:00 |
|
nordsoft
|
4cb31ea912
|
Merge remote-tracking branch 'upstream/develop' into cpp-map-editor
|
2022-10-08 23:24:57 +04:00 |
|
Nordsoft91
|
23f80c58dc
|
Apply suggestions from code review
Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>
|
2022-10-08 22:55:15 +04:00 |
|
nordsoft
|
2645843d4f
|
Fix dead server
|
2022-10-08 22:23:02 +04:00 |
|
nordsoft
|
63b29cbaea
|
Code review tweaks
|
2022-10-08 19:52:53 +04:00 |
|
Nordsoft91
|
64a801004c
|
Apply suggestions from code review
Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>
|
2022-10-08 19:41:38 +04:00 |
|
Tomasz Zieliński
|
8c481dff46
|
Fix incorrect templates for mines in HoTA
|
2022-10-08 12:42:10 +03:00 |
|
Andrii Danylchenko
|
238dabe060
|
Merge pull request #1055 from kambala-decapitator/version-from-cmakelists
define app version only in CMakeLists
|
2022-10-08 09:55:59 +03:00 |
|
nordsoft
|
e718f7fe39
|
Fix reconnection
|
2022-10-06 19:23:34 +04:00 |
|
Andrii Danylchenko
|
8b1a2a3ff3
|
Merge pull request #1039 from Nordsoft91/modinfo-from-json
Modinfo from json
|
2022-10-06 17:11:08 +03:00 |
|
nordsoft
|
ea49b8cf40
|
Cleanup code
|
2022-10-06 17:56:54 +04:00 |
|
nordsoft
|
16e185343a
|
Add host commands to control game
|
2022-10-06 15:54:46 +04:00 |
|
nordsoft
|
895ec2d302
|
Make console available during other players' turn
|
2022-10-05 19:04:51 +04:00 |
|
Andrii Danylchenko
|
14b21df939
|
Merge pull request #1056 from vcmi/fix-1054
#1054 - fix crash and UI
|
2022-10-05 09:02:14 +03:00 |
|
nordsoft
|
3ff38b84a2
|
Support hotseat over multiplier
|
2022-10-05 01:54:31 +04:00 |
|
nordsoft
|
77ff6a64e6
|
Show message about client connecting and disconnecting
|
2022-10-05 00:51:34 +04:00 |
|
Andrii Danylchenko
|
b83a40db87
|
#1054 - fix crash and UI
|
2022-10-04 21:54:14 +03: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
|
a9ad583158
|
Restore AI controlled player for client disconnection
|
2022-10-04 18:11:12 +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
|
33e5e51102
|
Merge pull request #1040 from vcmi/nkai-namespace
NKAI: namespace
|
2022-10-04 15:56:48 +03:00 |
|
Andrii Danylchenko
|
300d98aac0
|
Merge pull request #1050 from josch/core.zip
vcmibuilder: remove references to deprecated (and disabled) core.zip download
|
2022-10-04 12:53:14 +03:00 |
|
Andrey Filipenkov
|
92dd6d8c17
|
define app version only in CMakeLists
now it's propagated to code via macros
|
2022-10-04 12:29:38 +03:00 |
|
Andrey Filipenkov
|
af1f35779d
|
raise app version in CMakeLists
|
2022-10-04 11:47:29 +03:00 |
|
Andrii Danylchenko
|
eeea01d778
|
NKAI: namespace
|
2022-10-04 08:40:14 +03: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 |
|
nordsoft
|
b91bb41a80
|
One step forward
|
2022-10-04 02:25:22 +04:00 |
|
Andrii Danylchenko
|
5c44c8f4da
|
Merge pull request #1011 from kambala-decapitator/fix-multiple-heals
allow healing ability only before first turn of each round
|
2022-10-03 21:43:08 +03:00 |
|
Andrii Danylchenko
|
382b3ae94a
|
Merge pull request #1041 from vcmi/nkai-fixes
NKAI: android fixes
|
2022-10-03 20:30:05 +03: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 |
|
nordsoft
|
f4b7cf8196
|
Transfer player ownership to AI
|
2022-10-03 20:47:00 +04:00 |
|
nordsoft
|
135be21f07
|
Fix another crash with disconnecting hero
|
2022-10-03 20:47:00 +04:00 |
|
nordsoft
|
28ab1e9777
|
Fix crash for disconnecting client
|
2022-10-03 20:47:00 +04:00 |
|
Andrey Filipenkov
|
52371a4d3e
|
allow healing ability before first turn attempt of each round
|
2022-10-03 15:48:39 +03:00 |
|
Johannes Schauer Marin Rodrigues
|
d280eca241
|
vcmibuilder: remove references to deprecated (and disabled) core.zip download
Closes: #1038
|
2022-10-03 14:48:09 +02:00 |
|
Andrii Danylchenko
|
8f599ed043
|
NKAI: android fixes
|
2022-10-03 09:01:15 +03:00 |
|
nordsoft
|
628abd1428
|
Fix campaign serialization
|
2022-10-03 01:48:03 +04:00 |
|
Andrii Danylchenko
|
3600d09ece
|
Merge pull request #1034 from kambala-decapitator/save-last-mp-address
restore last used address in Multiplayer join dialog
|
2022-10-02 10:04:46 +03:00 |
|
Andrii Danylchenko
|
d07586ccf6
|
Merge pull request #1022 from kambala-decapitator/apple-set-app-version
[Apple] set proper app and build versions
|
2022-10-01 20:48:37 +03:00 |
|
Andrii Danylchenko
|
347b2f0c1c
|
Merge pull request #1003 from kambala-decapitator/fix-gitversion-option
compile Version.cpp only when ENABLE_GITVERSION is ON
|
2022-10-01 19:51:42 +03:00 |
|
Andrii Danylchenko
|
5f5a259974
|
Merge pull request #1013 from kambala-decapitator/ios-chat-text-enter
use SDL's standard input handling for in-game console
|
2022-10-01 19:50:15 +03:00 |
|
Andrii Danylchenko
|
34ef0efa74
|
Merge pull request #1029 from kambala-decapitator/options-highlight-current-resolution
highlight current resolution in the resolution selector in game options
|
2022-10-01 18:32:17 +03:00 |
|
Andrii Danylchenko
|
b2ea2eaba6
|
Merge pull request #1032 from kambala-decapitator/ios-flat-libs-dir
switch to flat libs directory structure
|
2022-10-01 17:57:33 +03:00 |
|
Andrii Danylchenko
|
21c035e5d7
|
Merge pull request #1033 from kambala-decapitator/necro-witch-hut-rmg
don't add Necromancy to Witch Hut on random maps
|
2022-10-01 17:55:38 +03:00 |
|
Andrii Danylchenko
|
a7e2e8a362
|
Merge pull request #899 from vcmi/fix-nk-ai-speed
NK: fix AI speed
|
2022-10-01 17:50:09 +03:00 |
|