Ivan Savenko
526a6e4fe7
Fix incorrect assertions
2022-12-18 14:33:59 +02:00
Andrii Danylchenko
cf97bf2cfd
Remove unused code
2022-12-18 13:11:02 +02:00
Andrii Danylchenko
1555c51313
fix assertion
2022-12-18 12:29:03 +02:00
Andrii Danylchenko
c55178e876
Merge pull request #1241 from trofi/catch-by-reference
...
AI/Nullkiller/Goals/ExecuteHeroChain.cpp: catch polymorphic exception…
2022-12-18 09:07:18 +02:00
Sergei Trofimovich
c2c352c6dd
AI/Nullkiller/Goals/ExecuteHeroChain.cpp: catch polymorphic exceptions by reference
...
The suspicious code was detected by `gcc-13` as:
AI/Nullkiller/Goals/ExecuteHeroChain.cpp: In member function 'virtual void NKAI::Goals::ExecuteHeroChain::accept(NKAI::AIGateway*)':
AI/Nullkiller/Goals/ExecuteHeroChain.cpp:130:47: warning: catching polymorphic type 'class NKAI::cannotFulfillGoalException' by value [-Wcatch-value=]
130 | catch(cannotFulfillGoalException)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
AI/Nullkiller/Goals/ExecuteHeroChain.cpp:176:23: warning: catching polymorphic type 'class NKAI::goalFulfilledException' by value [-Wcatch-value=]
176 | catch(goalFulfilledException)
| ^~~~~~~~~~~~~~~~~~~~~~
Similar to object passing by value and reference passing polymorphic
exceptions by reference likely destroys them when copy-constructed to
a base class. Let's catch them by reference.
2022-12-17 21:50:57 +00:00
nordsoft
dd95d92735
Fix compatibility check
2022-12-17 22:56:33 +04:00
nordsoft
d7b0770b71
Remove excessive code
2022-12-17 20:50:33 +04:00
nordsoft
9b76a8000f
Making team alignments widget customizable
2022-12-17 20:38:16 +04:00
Andrii Danylchenko
91dc34465e
Merge pull request #1232 from vcmi/fix-ai-turn-end-on-defeat
...
#1228 - prevent second AI activation on AI defeat due to wrong EndTur…
2022-12-17 10:50:37 +02:00
nordsoft
b590e4a0e4
Fixes for multiplyer
2022-12-17 08:38:33 +04:00
nordsoft
b1f2c7aed4
Team alignments implemented
2022-12-17 08:19:16 +04:00
nordsoft
4f5fab702e
Support roads selection in random map tab
2022-12-17 04:54:37 +04:00
nordsoft
d93e844609
Use roads names instead of their filenames
2022-12-17 04:54:01 +04:00
nordsoft
42281f51e8
Revert "Remove uncompleted code"
...
This reverts commit 0c41787ca5
.
2022-12-17 03:53:26 +04:00
nordsoft
f27a40dd34
Support roads and teams customization in engine
2022-12-17 03:52:40 +04:00
nordsoft
bcf95c32e9
Merge branch 'fix-cmake' into interface-builder
2022-12-17 03:09:41 +04:00
nordsoft
4508487afa
Fix cmake for macOS build
2022-12-17 02:28:42 +04:00
Andrii Danylchenko
19105d1cc9
Merge pull request #1234 from Nordsoft91/bump-1.2
...
Bump version
2022-12-16 20:16:44 +02:00
nordsoft
7b2b3bd065
Bump version
2022-12-16 17:12:36 +04:00
Hennadii Chernyshchyk
3f02146f87
Use different add_definitions for ENABLE_MONOLITHIC_INSTALL
2022-12-16 11:39:32 +02:00
nordsoft
268b87052b
Fix for hint
2022-12-16 02:49:52 +04:00
nordsoft
1d59dfecef
Support translations
2022-12-16 02:48:07 +04:00
nordsoft
8f089b3302
Rename folder
2022-12-16 02:19:23 +04:00
nordsoft
0c41787ca5
Remove uncompleted code
2022-12-16 02:17:10 +04:00
nordsoft
d3c3feb037
Configurable template selection
2022-12-16 02:15:53 +04:00
nordsoft
1d4209d97e
Continue refactoring
2022-12-16 00:57:10 +04:00
nordsoft
2371e3e9a2
Interface builder refactored
2022-12-16 00:46:36 +04:00
Hennadii Chernyshchyk
eec7d91f2c
Remove unused forward declaration
2022-12-15 15:33:30 +04:00
Hennadii Chernyshchyk
8de6c4a704
Fix SharedMemory declaration
...
Should be under VCMI_LIB_NAMESPACE_BEGIN
2022-12-15 15:33:30 +04:00
Andrii Danylchenko
ee55a21fae
Merge pull request #1190 from Nordsoft91/editor-speedup
...
Smart invalidation for move/erase/new object [1.2]
2022-12-15 12:23:28 +02:00
Andrii Danylchenko
8c07ddbae0
Merge pull request #1204 from IvanSavenko/single_process_app_upgrade
...
[1.2] Single process app support for platforms other than ios
2022-12-15 12:22:24 +02:00
Hennadii Chernyshchyk
d7fbd4aa66
Call install_vcpkg_imported_tgt after initializing BIN_DIR
...
Call it inside AI/CMakeLists.txt as it was before.
2022-12-15 12:16:28 +02:00
nordsoft
2fe951f819
Merge remote-tracking branch 'upstream/develop' into interface-builder
...
# Conflicts:
# client/lobby/RandomMapTab.cpp
2022-12-15 04:47:11 +04:00
Hennadii Chernyshchyk
3322ad9501
Move find_package for TBB on top for consistency with other
2022-12-15 02:21:44 +02:00
Hennadii Chernyshchyk
37068a75b3
Make ENABLE_NULLKILLER_AI top level option
2022-12-15 02:18:17 +02:00
Andrii Danylchenko
56bf8ec2c4
#1228 - prevent second AI activation on AI defeat due to wrong EndTurn packet
2022-12-14 22:13:26 +02:00
Hennadii Chernyshchyk
79a9a0b85a
Fix paths for ENABLE_MONOLITHIC_INSTALL
2022-12-14 19:38:34 +02:00
Hennadii Chernyshchyk
3c948b1488
Fix typo
2022-12-14 10:12:16 +02:00
nordsoft
4c3288dd61
Fix teams
2022-12-14 05:45:50 +04:00
nordsoft
fc7f1dbc5a
Fix template selection
2022-12-14 05:23:21 +04:00
nordsoft
53b2f68560
Serialize template
2022-12-14 04:37:11 +04:00
Hennadii Chernyshchyk
1ccbc209a4
Add an option to disable Nullkiller AI
2022-12-13 22:16:48 +02:00
Ivan Savenko
155f776ae8
Merge pull request #1172 from IvanSavenko/battleint_refactor
...
[1.2] Refactoring of BattleInterface class
2022-12-13 21:31:18 +02:00
Ivan Savenko
d94076c618
Fix msvc build
2022-12-13 16:54:49 +02:00
Ivan Savenko
55d0f0ad9f
Fixed infinite loop
2022-12-13 15:17:42 +02:00
Ivan Savenko
99e5569ab5
Changes according to review
2022-12-13 15:10:31 +02:00
Ivan Savenko
264f5c91e8
Applied suggestions from review
2022-12-13 13:58:16 +02:00
Hennadii Chernyshchyk
de33eb44f9
Port to OpenDingux handhelds
2022-12-13 03:55:54 +02:00
nordsoft
1e2abae62b
Template selections works
2022-12-13 04:38:18 +04:00
nordsoft
f90cb1be90
Template list prototype looks fine
2022-12-13 03:47:29 +04:00