nordsoft
|
d7de9accee
|
Fix code review problems
|
2022-10-13 01:40:52 +04:00 |
|
nordsoft
|
d3d1306ef0
|
Address part of feedback
|
2022-10-09 00:32:02 +04:00 |
|
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 |
|
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 |
|
Andrii Danylchenko
|
8b1a2a3ff3
|
Merge pull request #1039 from Nordsoft91/modinfo-from-json
Modinfo from json
|
2022-10-06 17:11:08 +03: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 |
|
Andrii Danylchenko
|
b83a40db87
|
#1054 - fix crash and UI
|
2022-10-04 21:54:14 +03: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 |
|
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 |
|
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 |
|
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
|
b26db479d7
|
don't add Necromancy to Witch Hut on random maps
|
2022-10-01 16:01:47 +03:00 |
|
Andrey Filipenkov
|
acfdbe87fe
|
remove duplicate entry
|
2022-10-01 16:01:02 +03:00 |
|
Andrii Danylchenko
|
2434fe3f6f
|
NK: fix AI speed
|
2022-10-01 13:49:27 +03:00 |
|
Andrii Danylchenko
|
1aefbd14a7
|
Merge pull request #1027 from kambala-decapitator/fix-quest-multiple-artifacts
Fix quest check that requires identical artifacts
|
2022-10-01 13:03:46 +03:00 |
|
Andrii Danylchenko
|
2e351aa815
|
Merge pull request #1030 from kambala-decapitator/hero-statusbar-after-spellbook
fix status bar behavior in CHeroWindow
|
2022-10-01 12:49:36 +03:00 |
|
Andrey Filipenkov
|
796845d173
|
[iOS] clear focus in launcher only when something has focus
|
2022-10-01 12:37:23 +03:00 |
|
Andrey Filipenkov
|
b766edb6af
|
[iOS] don't nest AI and scripting libs under subdirectories
3rd party signing tools may ignore such directory layout
|
2022-10-01 12:36:48 +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 |
|
Andrey Filipenkov
|
aa217236b3
|
check amount of artifacts on hero when checking requirements of a quest that requires artifact(s)
fixes case when 2 or more identical artifacts are required
|
2022-10-01 09:28:32 +03:00 |
|
Andrey Filipenkov
|
86708841f8
|
code improvement
|
2022-10-01 09:24:58 +03:00 |
|
Andrii Danylchenko
|
99502c97d0
|
Merge pull request #1012 from kambala-decapitator/ios-launcher-prevent-autofocus
prevent keyboard appearing automatically after switching tab
|
2022-10-01 09:18:10 +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
|
4e1b441399
|
[macOS] set app and bundle version in app bundle's Info.plist generated by CPack
|
2022-09-30 13:25:14 +03:00 |
|