games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-16 02:47:36 +02:00
Code Issues Releases Activity
14,004 Commits 21 Branches 65 Tags 121 MiB
e5f60f063c
Commit Graph

6060 Commits

Author SHA1 Message Date
Ivan Savenko
a5f0429691
Merge pull request #3083 from Nordsoft91/editor-improvements-1.4 
Redesign map editor rendering
 2023-10-22 16:56:39 +03:00
Ivan Savenko
4f47555977 Split OBJECT bonus source into OBJECT_TYPE and OBJECT_INSTANCE 2023-10-22 16:55:19 +03:00
Ivan Savenko
ac925bb786 Renamed new types for consistency with code style 2023-10-22 16:55:19 +03:00
Ivan Savenko
31cf3442af Update docs 2023-10-22 16:55:19 +03:00
Ivan Savenko
36a1d6c415 Removed remaining integer bonus subtypes from configs 2023-10-22 16:55:19 +03:00
Ivan Savenko
e54ba7b977 Implement loading of bonus source type 2023-10-22 16:55:19 +03:00
Ivan Savenko
3b010d9596 Renamed MetaIdentifier to VariantIdentifier 2023-10-22 16:55:19 +03:00
Ivan Savenko
80e6485965 MetaIdentifier now uses std::variant internally 2023-10-22 16:55:19 +03:00
Ivan Savenko
b394158dc9 Bonus Source ID now uses metaidentifier 2023-10-22 16:55:18 +03:00
Ivan Savenko
77facf9387 Implement missing functions, fixes linking errors 2023-10-22 16:54:56 +03:00
Ivan Savenko
910ad50417 Fix client & server compilation 2023-10-22 16:54:48 +03:00
Ivan Savenko
0a10fc30b8 (lib) Bonus subtype is now stored as metaidentifier that can store any 
other identifier inside it
 2023-10-22 16:54:43 +03:00
Ivan Savenko
7e034814c1 Partially revert "Translation" type changes to avoid breaking mods 2023-10-22 16:51:08 +03:00
Ivan Savenko
454ba44ac5
Merge pull request #2988 from IvanSavenko/configurable_extensions 
Extension of configurable object functionality
 2023-10-22 16:24:47 +03:00
Ivan Savenko
8752551786
Merge pull request #3086 from Laserlicht/show_random 
show random maps
 2023-10-22 12:29:31 +03:00
Ivan Savenko
adf58fa834 Hide not installed translation mods to languages other than selected one 2023-10-22 00:07:21 +03:00
Ivan Savenko
b50ebba1ba Added mod type "Compatibility" that is hidden in launcher 2023-10-21 23:55:20 +03:00
Ivan Savenko
b2c336de0d JsonNode now uses std::variant internally. Fixes crash on deserialize 2023-10-21 20:41:58 +03:00
Laserlicht
0eba0ee686
show random maps 2023-10-21 02:12:34 +02:00
Ivan Savenko
1c4a142849 Fix remaining TODO's 2023-10-21 00:44:57 +03:00
nordsoft
b9a660f6c3 Redesign map editor rendering 2023-10-20 01:25:06 +02:00
Nordsoft91
d03b75696a
Merge pull request #3067 from Nordsoft91/editor-improvements-1.4 
Add hero placeholder properties
 2023-10-19 22:23:58 +02:00
Johannes Schauer Marin Rodrigues
a1a5bc28c2
convert line endings from CRLF (Windows) to LF (Linux/Unix) 
Mixed line endings cause problems when exporting patches with
git-format-patch and then trying to "git am" a patch with mixed and
non-matching line endings. In such a situation git will fail to apply
the patch.

This commit runs the dos2unix tools on the remaining files with CRLF
(\r\n) line endings to convert them to line-feeds (\n) only.

Files that are Windows specific like *.vcxproj and *.props files were
not converted.

Closes: #3073
 2023-10-19 16:23:21 +02:00
Ivan Savenko
4c0eabf20c Show guards preview for visited banks on right click 2023-10-19 15:41:59 +03:00
Ivan Savenko
01920bb74e Fix treasure chests 2023-10-19 15:41:41 +03:00
Ivan Savenko
8f4791914e Show content preview only for Witch Huts / Shrines / Tree 2023-10-19 15:17:58 +03:00
Ivan Savenko
e0f6b582f5 Display object description only on right-click 2023-10-19 14:36:11 +03:00
Ivan Savenko
530c70c282 Added object descriptions present in H3 2023-10-19 13:34:15 +03:00
Ivan Savenko
901fd77699 Fix Cover of Darkness 2023-10-18 18:04:01 +03:00
Ivan Savenko
8f33fdcd83 Allow learning banned spell from Scholars (H3 logic) 2023-10-18 17:38:40 +03:00
Ivan Savenko
ce480c8c84 Fixed Scholar handling 2023-10-18 17:14:22 +03:00
Ivan Savenko
f7718628dc
Merge pull request #3074 from Nordsoft91/quests 
Fix warnings about empty kill target
 2023-10-18 12:34:44 +03:00
nordsoft
966ffe4377 Fix warnings about empty kill target 2023-10-18 00:13:32 +02:00
Alexandre Detiste
15e45f966c typos found by lintian 2023-10-17 22:06:08 +02:00
Ivan Savenko
48eba6c362 Fix Witch Hut messages to match H3 2023-10-17 16:52:57 +03:00
Ivan Savenko
eedaa63f5f Hnadling of Shrine messages now matches H3 2023-10-17 16:35:34 +03:00
Ivan Savenko
927ce4e60e Improvements to rewardable objects popups 2023-10-16 23:55:37 +03:00
Nordsoft91
1ffc246c8b
Merge pull request #3051 from Laserlicht/name_change 
possibility to change name in lobby
 2023-10-16 22:28:31 +02:00
nordsoft
f6d7755c6a Add hero placeholder properties 2023-10-16 22:24:12 +02:00
Ivan Savenko
850d0ff8eb Show (mostly) correct messages in Shrines 2023-10-16 18:16:15 +03:00
Nordsoft91
02c1425939
Merge pull request #3046 from Nordsoft91/editor-improvements-1.4 
Add map editor zoom and objects lock functionality
 2023-10-16 01:22:18 +02:00
Ivan Savenko
0ea44520fd Fix build 2023-10-16 00:12:39 +03:00
Ivan Savenko
e10de0594e Scholar is now configurable object (partial) 2023-10-16 00:12:39 +03:00
Ivan Savenko
bb05c2dea5 Implemented configurable shrine 2023-10-16 00:12:39 +03:00
Ivan Savenko
dd841bdaa7 Use enum instead of mix of bool's and int's for tile reveal 2023-10-16 00:12:38 +03:00
Ivan Savenko
98fd939ed6 Cartographer/Observatory is now configurable object 2023-10-16 00:12:38 +03:00
Ivan Savenko
f3ed589e35 Use same fow radius calculation as in H3 2023-10-16 00:12:38 +03:00
Ivan Savenko
a3b2354481 Implemented visit mode "limiter". Fixed h3m variable loading 2023-10-16 00:12:38 +03:00
Ivan Savenko
fd01a25352 Implemented basic version of configurable Witch Hut 2023-10-16 00:12:38 +03:00
Ivan Savenko
79b7518b0e Unified Json randomization logic for all entity types 2023-10-16 00:12:38 +03:00
Ivan Savenko
aa0b064154 Fixed randomization of artifacts on some custom maps 2023-10-16 00:12:38 +03:00
nordsoft
4651893b48 Fix hota quests 2023-10-14 00:15:15 +02:00
nordsoft
5f52e6b35e Revert "Auxiliary commit to revert individual files from 2bf8cdc9f525099348439c700af0466955f01b30" 
This reverts commit d9952495391f7ac77dd32dcf33f487e146b3655b.
 2023-10-13 23:35:37 +02:00
Laserlicht
0c6b1ca3c8
possibility to change name 2023-10-13 23:04:35 +02:00
nordsoft
55900ceb66 Add portraits delegate 2023-10-13 20:15:29 +02:00
nordsoft
2bf8cdc9f5 Hota-related bugs were fixed 2023-10-13 12:52:45 +02:00
nordsoft
fbf5492fd9 Remove unnecessary virtuals 2023-10-12 13:30:01 +02:00
nordsoft
74a90cde5d Fix hero level limiter 2023-10-12 12:52:01 +02:00
nordsoft
14b030d2eb Support hota quest gates 2023-10-11 23:15:24 +02:00
nordsoft
7ccd4cdcb2 Refactor quests progress 2023-10-11 21:10:42 +02:00
nordsoft
22c9eecd7d Fix mistake 2023-10-11 08:54:54 +02:00
nordsoft
2b88e6941c Fix mana limiter 2023-10-11 01:43:24 +02:00
nordsoft
6093f042dd Text container fix 2023-10-11 01:26:07 +02:00
nordsoft
8335fffaea Fix rumors 2023-10-11 00:58:32 +02:00
nordsoft
5b10b457cf Fix code review suggestions 2023-10-11 00:47:19 +02:00
nordsoft
62c4e8a98d Fix compiling 2023-10-10 23:44:29 +02:00
nordsoft
31d71ddd25 Minor fixes in text 2023-10-10 23:44:29 +02:00
nordsoft
5eeda3cd25 Quests mostly work 2023-10-10 23:44:29 +02:00
nordsoft
d2d64dbddd Bugfixes 2023-10-10 23:44:29 +02:00
nordsoft
bb238f9b72 New quests work 2023-10-10 23:44:29 +02:00
nordsoft
63bdfb8ff6 New quests implemented 2023-10-10 23:44:29 +02:00
nordsoft
1460541ee5 New limiter based quests 2023-10-10 23:44:29 +02:00
nordsoft
b7568a160c Fixes 2023-10-10 23:44:29 +02:00
nordsoft
6a7b23c007 Additional properties for limiter 2023-10-10 23:44:28 +02:00
nordsoft
937a8d63c7 Check for artifacts copies in limiter 2023-10-10 23:44:28 +02:00
nordsoft
0cf3205e15 Fix quest regressions 2023-10-10 23:44:28 +02:00
nordsoft
d7d435dcb7 Add game pause 2023-10-08 16:03:57 +02:00
Nordsoft91
1c4bbf1078
Merge pull request #3012 from Nordsoft91/fixes 2023-10-08 12:11:32 +02:00
nordsoft
043f54698b Fix translations in map editor / fix crash on game end 2023-10-05 23:34:29 +02:00
SoundSSGood
bcce4c68e5 Artifacts placement fixed 2023-10-05 15:17:02 +03:00
Ivan Savenko
b75a67ef7c
Merge pull request #2973 from IvanSavenko/identifier_explicit_constructor 
Improvements to type safety of Identifier class
 2023-10-05 00:33:07 +03:00
Ivan Savenko
037efdf5fc Improvements to type safety of Identifier class 
- Constructor of Identifier from integer is now explicit
- Lobby hero/town selection now uses Identifiers instead of int's
- Removed serialization workaround for hero portraits
- Added dummy objects for custom heroes portraits for ID resolver to use
- HeroInstance now stores portrait ID only in case of custom portrait
- Fixed loading of campaign heroes portraits on RoE maps
 2023-10-04 18:05:23 +03:00
Ivan Savenko
39a92cdde3 Add query for dwellings dialog 2023-10-04 17:47:12 +03:00
Ivan Savenko
898733eed7 Added Query to track visit duration for Taverns and Markets 2023-10-04 17:47:12 +03:00
Andrii Danylchenko
20a944c551
Merge pull request #2884 from vcmi/nkai-air-water-walking 
NKAI: water and air walking
 2023-10-03 21:46:35 +03:00
Laserlicht
ec8580b99e
Merge branch 'develop' into patch-4map_overview_rework 2023-10-02 21:03:16 +02:00
Nordsoft91
80be1e9f4c
Merge pull request #2981 from Nordsoft91/rmg-template 
Select random object template instead of first
 2023-10-02 20:42:39 +02:00
Nordsoft91
c57d5545c2
Merge pull request #2971 from Nordsoft91/translations 
Multi-language support for network game and for VMAPs
 2023-10-02 20:41:42 +02:00
nordsoft
10eb19758a Code review fixes 2023-10-01 18:00:36 +02:00
Ivan Savenko
b21a361b99
Merge pull request #2814 from SoundSSGood/arts-counter-impovements 
Artifacts counter impovements
 2023-10-01 17:53:51 +03:00
nordsoft
3ea7988883 Treasure placement uses random templates now 2023-09-30 23:06:38 +02:00
Laserlicht
8b835c9253
load game support 2023-09-30 20:03:33 +02:00
Andrii Danylchenko
2dd0d76412 NKAI: water and air walking 2023-09-30 10:37:32 +03:00
nordsoft
1502ea2250 Fix pandora mana problem 2023-09-30 01:33:12 +02:00
nordsoft
ce62ab3e66 Select random object template instead of first 2023-09-30 01:19:18 +02:00
nordsoft
70796d232b Full support of maps translations 2023-09-29 00:24:45 +02:00
nordsoft
ae073ee35d Remove unused identifiers 2023-09-28 23:15:36 +02:00
nordsoft
98fde9ab1d Add string IDs in map editor 2023-09-28 14:38:31 +02:00
nordsoft
60df49236f Inspector widgets set string ID 2023-09-28 14:03:58 +02:00
nordsoft
56eefab255 Fix headers 2023-09-28 13:28:24 +02:00
nordsoft
1dbecc2e18 Revert "Add header" 
This reverts commit d661600858.
 2023-09-28 13:28:04 +02:00
nordsoft
d661600858 Add header 2023-09-28 13:14:23 +02:00
nordsoft
a710c88b07 Proper map translations loading 2023-09-28 13:09:01 +02:00
nordsoft
67e1200448 Remove forward declaration 2023-09-28 12:46:28 +02:00
nordsoft
ba1dbbbb1d New version for map format 2023-09-28 04:23:14 +02:00
nordsoft
65f696b018 Cosmetic changes for json map reader 2023-09-28 03:02:46 +02:00
nordsoft
9098126684 Separate map text identifiers from global 2023-09-28 02:52:49 +02:00
nordsoft
40af83a55c Fix quest 2023-09-28 02:51:58 +02:00
nordsoft
3c2549d905 Fix town name 2023-09-28 02:51:44 +02:00
nordsoft
6da605ff83 Campaign meta strings 2023-09-28 00:10:28 +02:00
nordsoft
5b97c323d3 Rename hero strings to text id 2023-09-28 00:04:05 +02:00
nordsoft
486091a915 Heroes switched to text id 2023-09-28 00:00:32 +02:00
nordsoft
0c94a4d891 Town name switched to id 2023-09-27 23:57:05 +02:00
nordsoft
41da252e67 Seerhut meta strings 2023-09-27 23:49:27 +02:00
nordsoft
00c8c2eb82 Event message meta string 2023-09-27 23:28:17 +02:00
nordsoft
f9f79255c5 Creature message meta string 2023-09-27 23:25:19 +02:00
nordsoft
0ac893b80f Rumors meta string 2023-09-27 23:22:45 +02:00
nordsoft
ab373f08ab Use meta string for messages 2023-09-27 23:11:11 +02:00
nordsoft
03c099d4fd First steps 2023-09-27 22:53:13 +02:00
Ivan Savenko
9b482a2b1e Fix boat creation for heroes recruited on water 2023-09-27 21:25:27 +03:00
Ivan Savenko
f4c33f49ee Removed excessive warning 2023-09-27 21:24:37 +03:00
Ivan Savenko
92fdaa20b1 Fix crash on loading Seer Hut with kill monster mission 2023-09-27 21:24:25 +03:00
Ivan Savenko
97097c20ad
Merge pull request #2874 from SoundSSGood/exchange-window-update 
Exchange window update
 2023-09-27 15:50:52 +03:00
Ivan Savenko
71a1ed816a
Merge pull request #2892 from Laserlicht/highscore_menu 
Highscore Menu & end video
 2023-09-27 15:48:47 +03:00
Ivan Savenko
94dbde05a0
Merge pull request #2868 from IvanSavenko/simultaneous_turns 
Simultaneous turns
 2023-09-27 15:45:02 +03:00
Ivan Savenko
4d43562bca
Merge pull request #2924 from Laserlicht/datetime_android 
Datetime android
 2023-09-27 15:43:46 +03:00
Ivan Savenko
d0046d29f2
Merge pull request #2957 from ProjectMutilation/fix-pvs-issues 
Fixed some issues found by pvs
 2023-09-27 15:40:37 +03:00
Maxim Korotkov
ade7a035f5 artifactUtils: reduced cyclomatic complexity in check 
Signed-off-by: Maxim Korotkov <korotkov.maxim.s@gmail.com>
 2023-09-27 09:05:58 +03:00
Nordsoft91
c803b57c33
Merge pull request #2889 from Nordsoft91/mod-compatibility-check 
Proper mod compatibility check logic
 2023-09-26 19:29:46 +02:00
Ivan Savenko
0ab766479d One more documentation update iteration 2023-09-26 15:55:27 +03:00
Ivan Savenko
8210a2cafd Added list of all identifiers from base game 2023-09-26 15:55:27 +03:00
Ivan Savenko
43246477d4 Update bonuses docs 2023-09-26 15:55:27 +03:00
Ivan Savenko
403acc0cf1 Update spell docs 2023-09-26 15:55:27 +03:00
Ivan Savenko
f4ee9424e4 Removed unused properties 2023-09-26 15:55:27 +03:00
Ivan Savenko
9710a6b7b3 Updated terrain/river/road schema, added docs 2023-09-26 15:55:27 +03:00
Ivan Savenko
dfc72134f2 Removed unused property 2023-09-26 15:55:27 +03:00
Ivan Savenko
27b75dbbea Fixed silent errors on invalid Json references in schemas 2023-09-26 15:55:27 +03:00
Ivan Savenko
524c476264 Removed no longer used bonuses 2023-09-26 15:55:27 +03:00
Ivan Savenko
a7ebbf8680 Updated bonus documentation up to SPELL_AFTER_ATTACK 2023-09-26 15:55:27 +03:00
Ivan Savenko
54adeef29f Added temporary UI for simturns testing 2023-09-26 13:42:20 +03:00
Ivan Savenko
5b21a5ffbc Simturn duration is now part of StartInfo 2023-09-26 13:42:20 +03:00
Ivan Savenko
3ea807fb8d Fixed movement through teleporters by AI 2023-09-26 13:42:20 +03:00
Ivan Savenko
d257fb37f0 Use optional instead of Json for queries 2023-09-26 13:42:20 +03:00
Ivan Savenko
c8a96647c3 Add turn limit option to pathfinder 2023-09-26 13:42:20 +03:00
nordsoft
2a3e371caf Remove any modification of enabled mods during game loading 2023-09-24 23:34:46 +02:00
Laserlicht
e93a04409e Revert "another approach" 
This reverts commit 2f64457a9a.
 2023-09-24 15:02:59 +02:00
Laserlicht
2f64457a9a
another approach 2023-09-24 12:54:35 +02:00
Laserlicht
fccecf023b
no invalid json 2023-09-24 01:30:03 +02:00
Laserlicht
f3e1943aaf
Merge branch 'develop' into highscore_menu 2023-09-23 21:38:17 +02:00
Laserlicht
6f8b62d77d
codereview 2023-09-23 20:41:30 +02:00
Laserlicht
a4769782c5
correct format 2023-09-23 19:01:18 +02:00
Nordsoft91
1f2ca138dd
Merge pull request #2919 from Nordsoft91/fix-2893 2023-09-23 18:02:33 +02:00
Laserlicht
455ead7b4a
fix datetime format (android) 2023-09-23 17:27:00 +02:00
Nordsoft91
a36450e2d1
Merge pull request #2882 from Nordsoft91/ai-cheating 
Add basic system to give more advantages for ai player
 2023-09-23 03:21:19 +02:00
nordsoft
a5492b30c3 Add pre-battle message 2023-09-23 02:35:21 +02:00
nordsoft
61141a0406 Fix gcc compiling 2023-09-23 01:10:45 +02:00
nordsoft
dce1ac1538 Redesign mod incompatibility message 2023-09-23 00:32:48 +02:00
Laserlicht
b0e5a11e62
fix win build 2023-09-22 22:09:01 +02:00
Ivan Savenko
455c13164e
Merge pull request #2886 from IvanSavenko/h3m_parser_fixes 
H3m parser fixes
 2023-09-22 18:53:51 +03:00
nordsoft
5b24fe289b Assembling difficulty json instead of overriding 2023-09-22 14:46:43 +02:00
nordsoft
2a2f0a657e Fix battle bonuses serialization 2023-09-22 13:34:00 +02:00
Laserlicht
92b0e2b400
initial highscore support 2023-09-22 01:39:35 +02:00
nordsoft
16b147d588 Fix negative spell cost 2023-09-22 01:12:10 +02:00
Nordsoft91
ec582328b4
Merge pull request #2887 from Laserlicht/campaign_improvement 
campaign improvements
 2023-09-22 01:01:59 +02:00
nordsoft
099109b7d2 Minor fixes 2023-09-22 00:52:19 +02:00
Laserlicht
9e78f9c69c
CodeReview 2023-09-21 23:41:00 +02:00
nordsoft
60eef59bc9 Show root mods for maps 2023-09-21 22:38:01 +02:00
nordsoft
4691907f9c Show root mods only 2023-09-21 22:28:29 +02:00
Laserlicht
5fd2eee3e8
code review 2023-09-21 21:27:06 +02:00
nordsoft
a05f8339ae Proper mod compatibility check system 2023-09-21 04:31:08 +02:00
Laserlicht
dfb5ccbeaf
add persistent storage & completed campaign support 2023-09-20 22:18:53 +02:00
Ivan Savenko
42d9ba6c82
Merge pull request #2877 from IvanSavenko/simturn_fixes 
Changes for simturns support
 2023-09-20 22:09:25 +03:00
Ivan Savenko
3f35ed000c Fixed parsing of some user-made H3M maps 2023-09-20 22:00:03 +03:00
Ivan Savenko
02dfecd38b Fixed hota maps templates loading 2023-09-20 21:59:16 +03:00
Ivan Savenko
921569e02e Fixed "Long Live the King", 1st scenario victory condition 2023-09-20 21:58:47 +03:00
nordsoft
cb3bbc6680 Restructured difficulty config 2023-09-20 16:12:26 +02:00
nordsoft
0de912e67b Add basic system to add more advantages for ai player 2023-09-20 03:50:35 +02:00
Laserlicht
34182069f5
campaignset 2023-09-20 03:13:54 +02:00
Nordsoft91
648e8c7acb
Merge pull request #2856 from Laserlicht/hero_overview 
Hero overview
 2023-09-19 19:36:19 +02:00
Ivan Savenko
8c0d78f1d9 Added initiator-player to packs that add/remove/move objects 2023-09-19 19:24:34 +03:00
Nordsoft91
807f308c91
Merge pull request #2844 from Nordsoft91/rewardable-quests 
New rewardable interface for SeerHuts and pandoras
 2023-09-19 17:59:24 +02:00
nordsoft
326791886d Rename and events modal mode always 2023-09-19 17:11:03 +02:00
SoundSSGood
48ec2d7e2a
Merge branch 'vcmi:develop' into exchange-window-update 2023-09-19 16:22:00 +03:00
SoundSSGood
6280e778dc fix build 2023-09-19 16:04:37 +03:00
SoundSSGood
f47def3588 refactoring 2023-09-19 13:31:57 +03:00
SoundSSGood
a83f290e13 bulk move artifacts only equipped, only backpack 2023-09-19 13:31:42 +03:00
Ivan Savenko
219f81d28b Added explicit "PlayerEndsTurn" netpack 
- PlayerEndsTurn pack is now sent when player ends turn
- YourTurn pack has been renamed to PlayerStartsTurn for consistency
- PlayerStartsTurn will no longer replace list of acting players
- PlayerEndsGame and PlayerEndsTurn will remove player from acting list
 2023-09-18 20:55:01 +03:00
nordsoft
2960895041 Issues fixed 2023-09-17 22:19:45 +02:00
Laserlicht
21f37cfafb
simplified 2023-09-17 21:41:55 +02:00
Laserlicht
05fad115b5
Added new Widgets an functions for simplification 2023-09-17 20:34:31 +02:00
nordsoft
a517e6ad8e Message split for pandora box 2023-09-17 18:02:24 +02:00
nordsoft
e3538f24ab Fix components problem 2023-09-17 16:04:34 +02:00
nordsoft
44d72dce51 Use enum in h3m map parser 2023-09-17 15:06:49 +02:00
nordsoft
7b22aefb12 Some minor fixes 2023-09-17 13:03:42 +02:00
Ivan Savenko
c8e6a7cd27 Fixed most common cases of movement actions 2023-09-16 20:07:26 +03:00
Ivan Savenko
80b80a0ae6 Minor cleanup of hero movemen code 2023-09-16 20:07:26 +03:00
Andrii Danylchenko
903be33bf3 #2689 - fix approaching guards when closest tile is double-guarded 2023-09-16 17:47:34 +03:00
nordsoft
a3b60bf829 Fix warning 2023-09-16 14:30:25 +02:00
nordsoft
4f76eb3fce Add limiter serialization 2023-09-15 23:00:33 +02:00
nordsoft
4af2d917c0 Fix messages for pandoras 2023-09-15 21:13:07 +02:00
nordsoft
b5b5d881c4 Merge remote-tracking branch 'upstream/develop' into rewardable-quests 2023-09-15 21:08:22 +02:00
nordsoft
68c61797f8 Implement select all option for rewardable objects 2023-09-15 21:08:14 +02:00
nordsoft
c1c13cfafb Pandora and events work as rewardable object 2023-09-15 15:29:41 +02:00
Laserlicht
1c68937d95 new approach 2023-09-15 15:26:14 +02:00
Ivan Savenko
f8541d0ae4 Merge branch 'vcmi/master' into 'vcmi/develop' 2023-09-15 13:59:02 +03:00
nordsoft
06f01c3b82 Seerhut works as rewardable object 2023-09-15 10:06:06 +02:00
Dydzio
56c969be4f Fix commanders requirements for special skills to match WoG 2023-09-13 23:08:22 +02:00
Ivan Savenko
248afa523d
Merge pull request #2823 from dydzio0614/pathfinder-tile-cost 
Fix pathfinder tile cost
 2023-09-13 22:50:04 +03:00
Ivan Savenko
4d9cca36c6
Merge pull request #2811 from IvanSavenko/update_modding_docs 
Update modding documentation
 2023-09-13 22:07:29 +03:00
Ivan Savenko
c6588e0bd1 Updated schemas & docs for several game entities 2023-09-13 21:55:36 +03:00
Dydzio
9399bcc15d Fix pathfinder tile cost 2023-09-13 18:54:08 +02:00
Konstantin P
1522ed85e2 vcmi: make "noneOf" selector more restrictive 
It should do "or-not" instead of "and-not".
 2023-09-13 17:09:59 +03:00
nordsoft
574047c55c Start making new serialization for rewardables 2023-09-13 09:18:46 +02:00
nordsoft
96d6a48f01 Backward compatible json serialization 2023-09-13 02:14:35 +02:00
nordsoft
ef3f0174dd Rewardable seer hut and quest gate 2023-09-13 01:40:07 +02:00
Ivan Savenko
935a18f077 Use error messages from H3 2023-09-12 21:34:58 +03:00
Ivan Savenko
e4aa981925 Add more logging to mod downloading process 2023-09-12 21:15:14 +03:00
SoundSSGood
82eb2f8a2b Artifact assembling changes 2023-09-12 19:17:35 +03:00
Ivan Savenko
9ae7f53d66
Merge pull request #2791 from Nordsoft91/fix-2790 
Fix for random dwellings
 2023-09-12 12:38:55 +03:00
nordsoft
a89a8019ab Added skills customization 2023-09-11 20:37:25 +02:00
Nordsoft91
96433436dd
Merge pull request #2782 from Nordsoft91/editor-improvements-1.4 
Map editor: events, rumors
 2023-09-11 20:36:13 +02:00
Nordsoft91
a18aa2cf7e
Merge pull request #2802 from Laserlicht/voice_camp 
Voice for campaigns
 2023-09-11 18:15:23 +02:00
Ivan Savenko
f13f213d8c
Merge pull request #2780 from IvanSavenko/fix_siege_regression 
Fix crash on obstacle creation (e.g. moat)
 2023-09-11 15:56:33 +03:00
Laserlicht
994da3fcf2
code review 2023-09-11 14:44:07 +02:00
Laserlicht
00f07f93d1
wait while audio playing; no audio on custom campaigns 2023-09-11 14:04:44 +02:00
Laserlicht
fc1ce85a72
basic voice support 2023-09-11 12:57:10 +02:00
Ivan Savenko
fd3217c875 Fix few more missing BattleID's 2023-09-11 13:20:16 +03:00
nordsoft
6e3817f18c Events serialization 2023-09-10 01:54:55 +02:00
nordsoft
cc3864a0fa Fix for random dwellings 2023-09-09 21:17:21 +02:00
nordsoft
01bf146640 Change string id 2023-09-09 14:31:44 +02:00
nordsoft
f6e3c6a487 Fix 2023-09-09 14:27:51 +02:00
Ivan Savenko
e8453916cf Merge remote-tracking branch 'vcmi/beta' into develop 2023-09-08 18:49:06 +03:00
Ivan Savenko
fccd564d8d
Merge pull request #2769 from IvanSavenko/touch_tolerance 
(1.3.2) Implemented tolerance for touch events
 2023-09-08 16:45:04 +03:00
Ivan Savenko
c4e2417326 Fix crash on obstacle creation (e.g. moat) 2023-09-08 16:35:43 +03:00
Ivan Savenko
5d67481aaf
Merge pull request #2774 from IvanSavenko/beta_bugfixing 
(1.3.2) Beta bugfixing
 2023-09-08 13:15:52 +03:00
Ivan Savenko
ef0eb8e930
Merge pull request #2772 from wb180/tavernPoolHeroesFix 
Remove(reduce durations) of bonuses for tavern heroes
 2023-09-07 10:54:44 +03:00
Ivan Savenko
f39fbe5151
Merge pull request #2757 from IvanSavenko/filesystem_refactor 
Filesystem refactor - part 1
 2023-09-07 10:51:02 +03:00
Ivan Savenko
1f1f978328 Fixed battle replay 2023-09-06 16:03:47 +03:00
Ivan Savenko
ef94e7a78a Fix build 2023-09-06 16:03:47 +03:00
Ivan Savenko
9fa7a93fb0 Properly pass battleID in all battle netpack's 2023-09-06 16:03:47 +03:00
Ivan Savenko
747e28947a Fix build 2023-09-06 16:03:47 +03:00
Ivan Savenko
41210c1dbf Client-side support for multiple battles 2023-09-06 16:03:47 +03:00
Ivan Savenko
036df2e0ad Support multiple battles in AI 2023-09-06 16:03:46 +03:00
Ivan Savenko
3a88180494 Separated game and battle callback (server & client only) 2023-09-06 16:03:39 +03:00
Ivan Savenko
fc4dfda00f Added support for concurrent battles to gamestate and server 2023-09-06 16:03:02 +03:00
Ivan Savenko
f92af94f19 Fix crash on removing object during visit 2023-09-06 12:32:26 +03:00
Evgeniy Meshcheryakov
47f5dd14fa Remove(reduce durations) of bonuses for tavern heroes 2023-09-06 09:12:23 +03:00
Ivan Savenko
3973624278 Implemented tolerance for touch events 2023-09-06 01:06:01 +03:00
Ivan Savenko
1a82280cb2 Fix build 2023-09-05 13:16:08 +03:00
Ivan Savenko
f30355839f Fix build 2023-09-05 00:55:54 +03:00
Ivan Savenko
609f25f344 Add sanity check 2023-09-04 22:43:16 +03:00
Ivan Savenko
b6a1a8f0da Json Serializer should now use identifers storage properly 2023-09-04 22:23:20 +03:00
Ivan Savenko
9735fa6d06 Fix regresssion - crash 2023-09-04 22:22:45 +03:00
Ivan Savenko
12c4f8d18c Fixed serialization of PlayerColor in json 2023-09-04 22:22:24 +03:00
Ivan Savenko
86a7f5f5cd Removed getStr(bool), replaced with similar toString() 2023-09-04 22:21:02 +03:00
Ivan Savenko
7e27ac7073 IdentifierStorage is now separate handler in VLC 2023-09-04 18:56:16 +03:00
Ivan Savenko
c8a6cd74cc Additional checks for invalid access to IdentifierStorage 2023-09-04 18:56:16 +03:00
Ivan Savenko
82989e6302 Use pointers in containers to guaranteed fixed address 2023-09-04 18:56:16 +03:00
Ivan Savenko
a30e7ba321 Remove bitmasks of PlayerColor's. Add encode/decode methods 2023-09-04 18:56:16 +03:00
Ivan Savenko
3f921fa771 Serialization version bump 2023-09-04 18:22:34 +03:00
Ivan Savenko
6a260a60cf Fix resource creation 2023-09-04 18:22:34 +03:00
Ivan Savenko
9cfcf5ea19 Fix regressions 2023-09-04 18:22:34 +03:00
Ivan Savenko
0f88b8969b Removed some usages of std string as resource path 2023-09-04 18:22:34 +03:00
Ivan Savenko
8dfdfffd87 Use ResourcePath for audio files 2023-09-04 18:22:34 +03:00
Ivan Savenko
97b7d44c88 Use ResourcePath for video accessing 2023-09-04 18:22:34 +03:00
Ivan Savenko
6f0108e462 Use ResourcePath for referencing texts and json's 2023-09-04 18:22:34 +03:00
Ivan Savenko
823ffa7a07 Always use ResourcePath for referencing images and animations 2023-09-04 18:22:34 +03:00
nordsoft
d113168db4 Fix neutral objects serializing 2023-09-04 01:42:51 +04:00
nordsoft
385202a02a Fix abandoned map crash 2023-09-04 01:42:51 +04:00
nordsoft
8040cafb3d Code review tweaks 2023-09-01 15:17:46 +04:00
nordsoft
15037b782f Fix assert 2023-09-01 04:39:32 +04:00
nordsoft
e9ba1d73d1 Support partial versions 2023-09-01 04:36:53 +04:00
nordsoft
ea7ab9d5ed Migrate launcher to vcmi versions 2023-09-01 04:12:41 +04:00
Nordsoft91
c45ab07d0b
Merge pull request #2698 from Nordsoft91/turn-timer 
Turn timer fixes
 2023-09-01 00:31:52 +04:00
Konstantin P
08967efd91 Teleport: check immunities in applicable() 
Attempt to fix #2677
 2023-08-31 19:58:46 +03:00
Ivan Savenko
7255dda624
Merge pull request #2629 from dydzio0614/neutral-creature-popup 
Improve neutral creature adventure map popup
 2023-08-31 15:44:19 +03:00
Ivan Savenko
adb633be30
Merge pull request #2715 from IvanSavenko/regression_fix 
Fix several recently discovered regressions
 2023-08-31 15:41:04 +03:00
Nordsoft91
49614f5851
Merge pull request #2695 from Nordsoft91/mod-compatibility 2023-08-31 12:14:54 +04:00
Ivan Savenko
3e169ef2f5 Fix visiting of markets 2023-08-31 01:07:59 +03:00
nordsoft
cc3ca9a41e Timers fixes 2023-08-30 03:33:59 +04:00
nordsoft
9a42abe2a7 Extended timer info to exhange between client and server 2023-08-30 03:11:46 +04:00
Ivan Savenko
695a51d8c8 Merge remote-tracking branch 'vcmi/beta' into develop 2023-08-28 21:19:53 +03:00
nordsoft
4ee47b01ae Make possible to play with different timers independently 2023-08-28 19:45:15 +04:00
nordsoft
98f7ed9dfd Implement player start turn query 2023-08-28 18:56:36 +04:00
nordsoft
93f14c984d Fix compatibility check with patch version 2023-08-28 17:49:13 +04:00
nordsoft
925bde68ff Fix compatibility check with game version 2023-08-28 17:43:33 +04:00
nordsoft
0a6ea63b09 Revert "Add compatibility with minor version" 
This reverts commit 6e7b13fcbe.
 2023-08-28 17:41:00 +04:00
nordsoft
3962b71262 Remove unused variable 2023-08-28 17:10:52 +04:00
Nordsoft91
1586c6c6a0
Merge pull request #2668 from IvanSavenko/remove_current_player 
Remove "currentPlayer" from gamestate
 2023-08-28 17:10:28 +04:00
Nordsoft91
ffc4b989f0
Merge pull request #2679 from Laserlicht/smooth_scroll 
Smooth scroll
 2023-08-28 17:08:57 +04:00
nordsoft
6e7b13fcbe Add compatibility with minor version 2023-08-28 16:21:46 +04:00
Ivan Savenko
ce20d913e0 Fix checking PlayerColor's for validness 2023-08-27 01:35:38 +03:00
Michael
2286e0c7b1
implement speed and move 2023-08-26 21:13:33 +02:00
Michael
fe6d96f4a0
angle calc 2023-08-26 20:19:25 +02:00
Ivan Savenko
edd029c79c Replace "currentPlayer" from gamestate with "activePlayers" 
- Allows multiple active players at once, e.g. simturns
- Cleared up validation of netpacks by server, e.g. always check for
pack sender
 2023-08-25 18:56:15 +03:00
Ivan Savenko
b61c9a9e35 Fix build 2023-08-25 13:46:42 +03:00
Ivan Savenko
e2718db791 Converted several enumerations into constants 2023-08-25 13:38:02 +03:00
Ivan Savenko
c2d5f7f22f Formatting & cleanup 2023-08-25 13:38:02 +03:00
Ivan Savenko
e54287ea5d Converted remaining identifier to new system 2023-08-25 13:38:02 +03:00
Ivan Savenko
0240ee886d Converted (almost) all namespace enum's to enum classes 2023-08-25 13:38:02 +03:00