Andrii Danylchenko
86972d7164
Merge pull request #1112 from SoundSSGood/bulk-move-swap-artifacts-rev2
...
Bulk move and swap artifacts rev2
2022-11-14 08:31:48 +02:00
SoundSSGood
98bf6931a1
cosmetic correction
2022-11-13 19:01:28 +02:00
SoundSSGood
57ab13c820
cosmetic correction
2022-11-13 17:09:48 +02:00
SoundSSGood
f9738f0d0b
nullptr checks
2022-11-13 16:28:26 +02:00
SoundSSGood
aef87dd482
Apply suggested cosmetic changes
2022-11-13 15:28:09 +02:00
SoundSSGood
84841a5f0a
BulkMoveArtifacts::applyGs reworked
2022-11-12 19:44:34 +02:00
SoundSSGood
6e5932c016
Apply suggested changes next part
2022-11-10 21:02:06 +02:00
SoundSSGood
ad47a7573c
Code style. Typo. Code clean up.
2022-11-10 18:29:39 +02:00
SoundSSGood
b9087e2d63
Apply suggestions from code review
...
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2022-11-10 17:45:54 +02:00
Andrii Danylchenko
1ca2283a90
Merge pull request #1105 from krs0/feature/#1071__In_latest_night_builds_there_are_problems_with_schema_obstacle.json_and_file_obstacles.json
...
Problems with schema obstacle.json and file obstacles.json #1071
2022-11-10 11:53:08 +02:00
Andrii Danylchenko
5f92a0760f
Merge pull request #1113 from vcmi/nk-fix-hung
...
NKAI: a few crash/hang fixes
2022-11-10 11:48:17 +02:00
SoundSSGood
3a3b559a0b
attempt to fix the build
2022-11-07 14:20:28 +02:00
SoundSSGood
203c54e956
BulkMoveArtifacts structure optimization
2022-11-07 14:13:36 +02:00
Andrii Danylchenko
233b850daf
NKAI: a few crash/hang fixes
2022-11-07 13:58:20 +02:00
SoundSSGood
0032947735
regression fixed. Artifact assemble dialog shows multiple times.
2022-11-07 00:36:13 +02:00
SoundSSGood
f72a3e3884
function ArtifactUtils::checkSpellbookIsNeeded for the artifacts like a Titan's thunder
2022-11-07 00:18:05 +02:00
SoundSSGood
95ab343116
Net Packs BulkMoveArtifacts structure and BulkMoveArtifacts::applyCl
2022-11-06 23:54:50 +02:00
SoundSSGood
d0895e30ef
callback functions and cleaning up unused code
2022-11-06 23:41:29 +02:00
SoundSSGood
363e461c3e
ArtifactUtils and CArtifactFittingSet class
2022-11-06 23:29:22 +02:00
nordsoft
0f35082024
Fix crash with objects belonging players without state
2022-11-06 03:26:13 +04:00
krs
aab394ff93
#1071 - In latest night builds there are problems with schema obstacle.json and file obstacles.json
2022-11-04 00:06:15 +02:00
Andrii Danylchenko
7618bc7425
Mantis-2934: fix conditions to upgrade town in h3m format parser
2022-10-23 16:40:07 +03:00
Andrii Danylchenko
601ced3749
BattleAI: rework movement when no targtes
2022-10-23 11:41:03 +03:00
Andrii Danylchenko
b43e0ff9e4
Merge pull request #972 from vcmi/cpp-map-editor
...
Cpp map editor
2022-10-22 12:42:27 +03:00
nordsoft
750f160276
Fix advmap spell mechanics
2022-10-20 22:34:27 +04:00
Andrii Danylchenko
c32d44190e
Merge pull request #1075 from Nordsoft91/town-entrance-fix
...
[1069] Fix bug related to town entrance
2022-10-19 13:42:33 +03:00
Andrii Danylchenko
288f36c0c3
Merge pull request #1052 from Nordsoft91/mp-disconnection
...
MP handle disconnection
2022-10-19 09:56:18 +03:00
nordsoft
7bcb318593
Fix bug related to town entrance
2022-10-19 02:54:06 +04:00
nordsoft
0adae7bb0d
Revert "Fix crash for disconnecting client"
...
This reverts commit 28ab1e9777
2022-10-19 00:14:16 +04:00
nordsoft
d5403d3eb9
Merge remote-tracking branch 'upstream/develop' into cpp-map-editor
2022-10-17 01:39:11 +04:00
Andrii Danylchenko
82a9f82e1c
BattleAI: retreat
2022-10-14 12:00:56 +03:00
Andrii Danylchenko
6cbaa40e29
#1065 - fix random hero initial position
2022-10-13 11:58:32 +03:00
nordsoft
4cb31ea912
Merge remote-tracking branch 'upstream/develop' into cpp-map-editor
2022-10-08 23:24:57 +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
nordsoft
3ff38b84a2
Support hotseat over multiplier
2022-10-05 01:54:31 +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
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
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
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
28ab1e9777
Fix crash for disconnecting client
2022-10-03 20:47:00 +04: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
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
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
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
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
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
Andrey Filipenkov
a11135152c
remove trivial manual implementation of assignment operator
...
fixes clang warning: Definition of implicit copy constructor for 'RiverType' is deprecated because it has a user-provided copy assignment operator
2022-09-30 11:26:36 +03:00
Tomasz Zieliński
127d7ec40b
Fixed asserts (only for debug build)
2022-09-29 21:10:44 +02: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
Andrii Danylchenko
557512b308
Merge pull request #1006 from AgostonSzepessy/dev/agos/small-fixes
...
Small misc fixes
2022-09-29 19:53:27 +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
Tomasz Zieliński
20c102e648
Remove T prefix from new typedefs
2022-09-29 11:44:46 +02:00
nordsoft
9fb5d0e726
Fix stackinstance deserialization
2022-09-29 00:35:51 +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
Tomasz Zieliński
d38b6297f8
missing line
2022-09-27 07:53:21 +02: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
53ac61b52b
iOS: don't create unused CConsoleHandler
2022-09-27 07:05:10 +03:00
Andrey Filipenkov
802147c5b7
add some asserts that shouldn't fire
2022-09-26 14:06:55 +03:00
Andrey Filipenkov
bbf08afb3d
fix possible memory leak
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
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
Tomasz Zieliński
64fd896978
Free memory at TerrainTypeHandler destruction
2022-09-25 20:52:51 +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
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
Andrii Danylchenko
742030bbc0
fix checking if a tile is guarded
2022-09-25 13:13:37 +03:00
Nordsoft91
d4f97aadf0
Merge branch 'develop' into incomatibility-response
2022-09-25 13:26:07 +04:00
Tomasz Zieliński
4ea57ea7fc
A variety of suggested style tweaks
2022-09-25 09:33:56 +02:00
Andrey Filipenkov
72feb538ce
add explicit null pointer checks
2022-09-25 10:05:16 +03:00
Agoston Szepessy
0718acdb6d
Use tuple instead of vector for comparing values
...
There are only 3 values, and they're only used for doing a comparison,
so it's wasteful to create a whole vector for that. std::tuple is better
suited for this use case.
2022-09-24 23:50:31 -07:00
Tomasz Zieliński
97a94ce61e
Handle Tile by reference instead of pointer
2022-09-25 08:04:15 +02:00
nordsoft
d32898b39b
Merge remote-tracking branch 'upstream/develop' into cpp-map-editor
...
# Conflicts:
# CMakeLists.txt
2022-09-25 00:58:43 +04:00
Andrey Filipenkov
659be89a01
remove setting values that are never read
2022-09-24 16:52:38 +03:00
Andrey Filipenkov
9f46bf5bff
Apply suggestions from code review
...
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2022-09-24 15:55:26 +03:00
Andrey Filipenkov
011f303397
code style improvement
2022-09-24 15:55:25 +03:00
Andrey Filipenkov
a5f9efb3df
workaround GCC < 7.0 bug
...
template specialization from namespace must be enclosed in the namespace
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480
2022-09-24 15:55:25 +03:00
Andrey Filipenkov
031ba967d3
fix indentation
2022-09-24 15:55:24 +03:00
Andrey Filipenkov
e1c9903a45
extract iOS helpers into a shared lib
2022-09-24 15:55:24 +03:00
Andrey Filipenkov
0503993b8d
avoid reloading server's filesystem stuff
2022-09-24 15:55:24 +03:00
Andrey Filipenkov
35e1b86683
remove no longer needed adjustments
2022-09-24 15:55:24 +03:00
Andrey Filipenkov
bb00ec8ce2
remove entitlements and shared container usage
...
they're no longer required since we have a single app now
2022-09-24 15:55:22 +03:00
Andrey Filipenkov
2d3002bc1d
add standard lib target back
...
- the moved CMakeLists.txt is turned into a macro (adds whitespace difference)
- now uses absolute paths to the lib and include dirs
- refactors iOS install section to use "early continue" in the foreach loop
2022-09-24 15:55:21 +03:00
Andrey Filipenkov
267e8df7db
move lib/CMakeLists.txt to cmake_modules/VCMI_lib.cmake
...
preparation to be able to duplicate the lib target
2022-09-24 15:55:21 +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
Andrey Filipenkov
27551a9eae
fix using local minizip after rebase
2022-09-24 15:55:20 +03:00
Andrey Filipenkov
3388583089
use component-based install to copy only what's needed for every app
2022-09-24 15:55:20 +03:00
Andrey Filipenkov
13d0de17cd
use shared path as user data when available
2022-09-24 15:55:19 +03:00
