Andrii Danylchenko
|
04490b709a
|
Merge pull request #1000 from vcmi/multiplayer
Multiplayer
|
2022-10-03 20:16:39 +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
|
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 |
|
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 |
|
Andrey Filipenkov
|
ebeff94130
|
inherit CHeroWindow from CStatusbarWindow for proper status bar support
|
2022-10-01 11:21:16 +03:00 |
|
Andrey Filipenkov
|
c9ae43abe8
|
highlight current resolution in the resolution selector in game options
|
2022-10-01 10:33:48 +03:00 |
|
Andrii Danylchenko
|
5b72284aba
|
Merge pull request #1023 from kambala-decapitator/unlock-advmap-after-battle-result
unlock adventure map UI after closing battle result dialog
|
2022-10-01 09:17:03 +03:00 |
|
Andrii Danylchenko
|
a2dbb6c8ac
|
Merge pull request #978 from kambala-decapitator/hide-unsupported-resolutions
Hide unsupported resolutions
|
2022-09-30 17:34:07 +03:00 |
|
nordsoft
|
3621b05682
|
Rename variable
|
2022-09-30 18:28:17 +04:00 |
|
Andrey Filipenkov
|
c4c2e03b6e
|
fix typo
|
2022-09-30 15:06:56 +03:00 |
|
Andrey Filipenkov
|
4de0300c76
|
unlock adventure map UI after closing battle result dialog
|
2022-09-30 15:06:50 +03:00 |
|
Andrey Filipenkov
|
7801a2ad85
|
[iOS] show app and bundle version in system settings
|
2022-09-30 12:52:45 +03:00 |
|
Andrey Filipenkov
|
8e066a00bc
|
[iOS] set bundle version to date-commit
|
2022-09-30 12:51:47 +03:00 |
|
Andrey Filipenkov
|
3f61e6f964
|
[iOS] allow setting custom app name
|
2022-09-30 12:33:37 +03:00 |
|
Andrii Danylchenko
|
4835387004
|
Merge pull request #1015 from kambala-decapitator/prohibit-dig-while-waiting
prohibit digging while waiting for your turn to start
|
2022-09-30 08:39:48 +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 |
|
Andrii Danylchenko
|
dae726b82d
|
Merge pull request #1005 from kambala-decapitator/ios-min-12
raise iOS deployment target to 12.0
|
2022-09-29 19:57:04 +03:00 |
|
DjWarmonger
|
58a3abb643
|
Merge pull request #963 from vcmi/terrain-rewrite
Terrain rewrite
|
2022-09-29 18:24:05 +02:00 |
|
Andrii Danylchenko
|
878aabd4d6
|
Merge pull request #981 from kambala-decapitator/fix-analyzer-warnings
Fix Clang Analyzer warnings
|
2022-09-29 19:23:24 +03:00 |
|
Andrey Filipenkov
|
836d7dc2d6
|
prohibit digging while waiting for your turn to start
|
2022-09-29 15:52:28 +03:00 |
|
Andrey Filipenkov
|
8c8394b6ed
|
fix passing coordinates of the status bar when triggering in-game console input
|
2022-09-29 13:24:23 +03:00 |
|
Andrey Filipenkov
|
593df25df5
|
[iOS] use SDL's standard input handling for in-game chat
|
2022-09-29 13:23:15 +03:00 |
|
Andrey Filipenkov
|
e8a1709fc4
|
fix typo in file name
|
2022-09-29 12:47:31 +03:00 |
|
Tomasz Zieliński
|
20c102e648
|
Remove T prefix from new typedefs
|
2022-09-29 11:44:46 +02:00 |
|
nordsoft
|
0eb589fb58
|
Load map by itself
|
2022-09-29 00:09:18 +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 |
|
Tomasz Zieliński
|
475f835769
|
More style tweaks
|
2022-09-28 11:38:08 +02:00 |
|
Andrey Filipenkov
|
76b36b8951
|
iOS can use any resolution
|
2022-09-27 11:56:12 +03:00 |
|
Andrey Filipenkov
|
6e6bf1e77b
|
don't list resolutions larger than the current screen's in the game options
|
2022-09-27 11:56:12 +03:00 |
|
Andrey Filipenkov
|
f0b909f772
|
code improvement
|
2022-09-27 11:56:12 +03:00 |
|
Tomasz Zieliński
|
f386f42166
|
Merge remote-tracking branch 'origin/develop' into terrain-rewrite
# Conflicts:
# lib/Terrain.cpp
# lib/Terrain.h
# lib/battle/CBattleInfoEssentials.cpp
# lib/rmg/ObstaclePlacer.cpp
# lib/rmg/RiverPlacer.cpp
|
2022-09-27 07:50:17 +02:00 |
|
Andrey Filipenkov
|
1dc7ccb7d0
|
remove declaration of non-existent function
|
2022-09-27 07:06:17 +03:00 |
|
Andrey Filipenkov
|
53ac61b52b
|
iOS: don't create unused CConsoleHandler
|
2022-09-27 07:05:10 +03:00 |
|
Andrey Filipenkov
|
70c51e4370
|
iOS: don't compile unused function
|
2022-09-27 07:01:16 +03:00 |
|
Andrey Filipenkov
|
802147c5b7
|
add some asserts that shouldn't fire
|
2022-09-26 14:06:55 +03:00 |
|
Tomasz Zieliński
|
25f66097cc
|
Handle RoadType by value / reference
|
2022-09-26 10:20:39 +02:00 |
|
Tomasz Zieliński
|
f804f8a326
|
Store RiverType by value, handle by reference
|
2022-09-26 09:51:36 +02:00 |
|
Tomasz Zieliński
|
11dd71515a
|
comment
|
2022-09-26 09:18:01 +02:00 |
|
Tomasz Zieliński
|
2bd30556a3
|
Store TerrainType by havlue and handle by reference
|
2022-09-26 09:17:55 +02:00 |
|
Tomasz Zieliński
|
cd3a1a02c2
|
More style tweaks
|
2022-09-25 21:47:44 +02:00 |
|
Andrii Danylchenko
|
27dbee6069
|
Merge pull request #975 from Nordsoft91/incomatibility-response
Incompatibility response
|
2022-09-25 18:26:02 +03:00 |
|
Andrii Danylchenko
|
d6c2d05376
|
Merge pull request #992 from kambala-decapitator/msvc-ai-dlls
[MSVC] place AI dependencies into the right location at build time
|
2022-09-25 17:53:16 +03:00 |
|
Andrii Danylchenko
|
127a7e6653
|
Merge pull request #959 from kambala-decapitator/fix-cursor-attack
fix cursor image on hover when there're multiple creatures nearby
|
2022-09-25 17:44:10 +03:00 |
|
Andrey Filipenkov
|
3286eb613d
|
[msvc] move AI dll dependencies to the main bin dir after build
|
2022-09-25 14:09:09 +03:00 |
|