1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-27 00:41:08 +02:00
Commit Graph

7110 Commits

Author SHA1 Message Date
7fdad4e0f6 Code refactor following C++ standard and condition fixes 2022-11-15 03:20:55 +03:00
729357824b Added common method for secondary skill availability checks 2022-11-14 19:08:49 +02:00
e06db2365d Fixes #1096 - do not propose banned skills on levelup
Remove possibility to get banned skill on levelup as "obligatory skill"
if all other such skills have been learned before.

May happen under some conditions, e.g. if hero quickly learns other
magic schools - in witch hut/university, leading to case where banned
skill is the only obligatory skill that can be offered on levelup
2022-11-14 17:16:49 +02:00
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
98bf6931a1 cosmetic correction 2022-11-13 19:01:28 +02:00
57ab13c820 cosmetic correction 2022-11-13 17:09:48 +02:00
f9738f0d0b nullptr checks 2022-11-13 16:28:26 +02:00
aef87dd482 Apply suggested cosmetic changes 2022-11-13 15:28:09 +02:00
84841a5f0a BulkMoveArtifacts::applyGs reworked 2022-11-12 19:44:34 +02:00
072e2d72bb Merge branch 'develop' into battle-dialog 2022-11-12 17:14:15 +04:00
6e5932c016 Apply suggested changes next part 2022-11-10 21:02:06 +02:00
ad47a7573c Code style. Typo. Code clean up. 2022-11-10 18:29:39 +02:00
b9087e2d63 Apply suggestions from code review
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2022-11-10 17:45:54 +02:00
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
5f92a0760f Merge pull request #1113 from vcmi/nk-fix-hung
NKAI: a few crash/hang fixes
2022-11-10 11:48:17 +02:00
3a3b559a0b attempt to fix the build 2022-11-07 14:20:28 +02:00
203c54e956 BulkMoveArtifacts structure optimization 2022-11-07 14:13:36 +02:00
233b850daf NKAI: a few crash/hang fixes 2022-11-07 13:58:20 +02:00
0032947735 regression fixed. Artifact assemble dialog shows multiple times. 2022-11-07 00:36:13 +02:00
f72a3e3884 function ArtifactUtils::checkSpellbookIsNeeded for the artifacts like a Titan's thunder 2022-11-07 00:18:05 +02:00
95ab343116 Net Packs BulkMoveArtifacts structure and BulkMoveArtifacts::applyCl 2022-11-06 23:54:50 +02:00
d0895e30ef callback functions and cleaning up unused code 2022-11-06 23:41:29 +02:00
363e461c3e ArtifactUtils and CArtifactFittingSet class 2022-11-06 23:29:22 +02:00
4ccad9178e Fix potential BattleInfo destruction before usage 2022-11-06 21:46:56 +04:00
0f35082024 Fix crash with objects belonging players without state 2022-11-06 03:26:13 +04:00
e9cf3ede2a Try to handle queries by ai 2022-11-05 06:34:38 +04:00
48925a50f2 Development 2022-11-05 03:35:46 +04:00
219a282916 First step 2022-11-05 03:35:32 +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
7618bc7425 Mantis-2934: fix conditions to upgrade town in h3m format parser 2022-10-23 16:40:07 +03:00
601ced3749 BattleAI: rework movement when no targtes 2022-10-23 11:41:03 +03:00
b43e0ff9e4 Merge pull request #972 from vcmi/cpp-map-editor
Cpp map editor
2022-10-22 12:42:27 +03:00
750f160276 Fix advmap spell mechanics 2022-10-20 22:34:27 +04:00
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
288f36c0c3 Merge pull request #1052 from Nordsoft91/mp-disconnection
MP handle disconnection
2022-10-19 09:56:18 +03:00
7bcb318593 Fix bug related to town entrance 2022-10-19 02:54:06 +04:00
0adae7bb0d Revert "Fix crash for disconnecting client"
This reverts commit 28ab1e9777.
2022-10-19 00:14:16 +04:00
d5403d3eb9 Merge remote-tracking branch 'upstream/develop' into cpp-map-editor 2022-10-17 01:39:11 +04:00
82a9f82e1c BattleAI: retreat 2022-10-14 12:00:56 +03:00
6cbaa40e29 #1065 - fix random hero initial position 2022-10-13 11:58:32 +03:00
4cb31ea912 Merge remote-tracking branch 'upstream/develop' into cpp-map-editor 2022-10-08 23:24:57 +04:00
64a801004c Apply suggestions from code review
Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>
2022-10-08 19:41:38 +04:00
8c481dff46 Fix incorrect templates for mines in HoTA 2022-10-08 12:42:10 +03:00
3ff38b84a2 Support hotseat over multiplier 2022-10-05 01:54:31 +04:00
a9ad583158 Restore AI controlled player for client disconnection 2022-10-04 18:11:12 +04:00
0ea5a8fbe7 Merge remote-tracking branch 'upstream/develop' into mp-disconnection
# Conflicts:
#	server/CVCMIServer.cpp
2022-10-04 17:41:43 +04:00
92dd6d8c17 define app version only in CMakeLists
now it's propagated to code via macros
2022-10-04 12:29:38 +03:00
16a5414247 Reconnection partially works 2022-10-04 05:09:03 +04:00
b91bb41a80 One step forward 2022-10-04 02:25:22 +04:00
382b3ae94a Merge pull request #1041 from vcmi/nkai-fixes
NKAI: android fixes
2022-10-03 20:30:05 +03:00