games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Code Issues Releases Activity
11,605 Commits 19 Branches 61 Tags 108 MiB
d4728f78ce
Commit Graph

11605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ivan Savenko
d4728f78ce Support for hota victory conditions 2023-06-20 19:37:27 +03:00
Ivan Savenko
a84666edf6 MetaString can be serialized in json 2023-06-20 19:37:27 +03:00
Ivan Savenko
d51fe62804 Win/loss condition texts use MetaString 2023-06-20 19:37:27 +03:00
Ivan Savenko
56d69e790b Renamed MetaString methods to more logical names 2023-06-20 19:37:27 +03:00
Ivan Savenko
2636a0dcc3 Moved MetaString to a new file 2023-06-20 19:37:27 +03:00
Ivan Savenko
f35b3a0dc3 Replace MetaString operator << with member function 2023-06-20 19:37:27 +03:00
Ivan Savenko
c43783db58 Use string ID's instead of raw strings for win/loss conditions 2023-06-20 19:37:27 +03:00
Ivan Savenko
8dde8018d0 Implemented support for fixed monster def's from hota 2023-06-20 19:37:27 +03:00
Ivan Savenko
6f743916db Moved CGCreature to a new file 2023-06-20 19:37:27 +03:00
Ivan Savenko
7c88bb7e4f Detect mirror maps 2023-06-20 19:37:27 +03:00
Ivan Savenko
636b2ea856 Removed no longer used code - moved to hota mod 2023-06-20 19:37:27 +03:00
Ivan Savenko
6ed0fbe579 Fix excessive warning - neutral town with Portal is perfectly legal 2023-06-20 19:37:27 +03:00
Ivan Savenko
d742b6b809 Fix mapping of map objects linked to game entities 2023-06-20 19:37:27 +03:00
Ivan Savenko
f86133705e Fix loading of allowed artifacts from hota h3m 2023-06-20 19:37:27 +03:00
DjWarmonger
02ea798c97
Merge pull request #2229 from vcmi/zone_placement_improvements 
Zone placement improvements
 2023-06-17 08:53:08 +02:00
Ivan Savenko
2e2938303a
Merge pull request #2209 from IvanSavenko/map_object_configuration 
Support for json configuration of some map objects
 2023-06-16 19:32:05 +03:00
Ivan Savenko
ece9982ca0 Fix build 2023-06-16 18:11:45 +03:00
Ivan Savenko
5118a642bc Fix duplicated randomResource object 2023-06-16 18:00:19 +03:00
Ivan Savenko
58661fc8ec Moved DwellingInstanceConstructor to a new file 2023-06-16 17:59:50 +03:00
Ivan Savenko
77b58bc66d Cleaned up object constructors to reduce duplicated code 2023-06-16 17:59:50 +03:00
Ivan Savenko
4d947be287 Adventure map shipyard nwo has configurable boat type 2023-06-16 17:59:50 +03:00
Ivan Savenko
487f441f47 Implemented boat selection for town shipyards 2023-06-16 17:59:49 +03:00
Ivan Savenko
6aedb99117 Cleaned up IShipyard interface 2023-06-16 17:59:10 +03:00
Ivan Savenko
a94b68e6aa Hill fort upgrade costs are now loaded from json 2023-06-16 17:59:10 +03:00
Ivan Savenko
2e7c382612 Moved creature upgrade logic to CGObjectInstance inheritors 2023-06-16 17:59:10 +03:00
Ivan Savenko
fc190b14bb Spell shrines can now be configured in json 2023-06-16 17:59:10 +03:00
Ivan Savenko
5cfbdd2967 Partially split CommonConstructors.cpp into few separate files 2023-06-16 17:59:10 +03:00
Ivan Savenko
0901c8feaf Use boost::multiarray instead of manual memory management in CMap 2023-06-16 17:59:10 +03:00
DjWarmonger
c52b5d3bd0
Merge pull request #2216 from vcmi/water_prison_tavern 
Water Prison & Tavern
 2023-06-16 16:30:05 +02:00
DjWarmonger
c448f6275e
Merge pull request #2234 from vcmi/fix_pandora 
Fix empty Pandora message
 2023-06-16 10:10:20 +02:00
Tomasz Zieliński
190244369c Fix empty Pandora message 2023-06-15 22:06:31 +02:00
Tomasz Zieliński
adec58f5bf - Set fixed boat type for Tavern / Prison 
- Move magical boat offset to static function
 2023-06-15 17:53:18 +02:00
DjWarmonger
71a4713df4
Merge pull request #2232 from wb180/fixCrashInVCAI 
Okay, that's certainly a good change even if the code is quite messy otherwise.
 2023-06-15 15:20:38 +02:00
Evgeniy Meshcheryakov
6591508618 Fix crash in VCAI 2023-06-15 14:22:33 +03:00
DjWarmonger
79a1041648
Merge pull request #2230 from vcmi/fix_seer_huts 
Fix crash which could occur if we can't add any Seer Hut to RMG pool
 2023-06-15 09:50:00 +02:00
Tomasz Zieliński
f1356dd5bf Merge remote-tracking branch 'origin/develop' into water_prison_tavern 2023-06-14 20:58:02 +02:00
Tomasz Zieliński
ce25ed4de2 Fix crash which coudl occur if we can't add any Seer Hut to RMG pool (Fear template). 2023-06-14 20:50:14 +02:00
Ivan Savenko
46e367bdec
Merge pull request #2227 from wb180/launcherSettingsFixQt6 
Replaced deprecated(removed from qt6) signals
 2023-06-14 16:07:04 +03:00
Ivan Savenko
3924f0f081
Merge pull request #2211 from SoundSSGood/art-refactoring-hotfix 
Fixing regressions
 2023-06-14 16:06:35 +03:00
Ivan Savenko
8614419954
Merge pull request #2208 from IvanSavenko/obstacles_foreground 
Implemented foreground/background obstacles
 2023-06-14 15:49:08 +03:00
Ivan Savenko
caf627a652
Merge pull request #2207 from IvanSavenko/fix_black_color 
Fix colors in def palette turning into transparency unconditionally
 2023-06-14 15:48:15 +03:00
Tomasz Zieliński
14d46cbed8 Keep the distance between zone guards and other objects, while trying to place them closer to zone centers at the same time. 2023-06-14 14:12:42 +02:00
Tomasz Zieliński
2603e11f48 Simplify and correct ZonePlacer main loop, make sure to save optimal solution at every step. 2023-06-14 14:07:31 +02:00
DjWarmonger
3be7720868
Merge pull request #2218 from vcmi/pregenerate_treasures 
Okay, merging this for PvP feedback.
 2023-06-13 20:46:34 +02:00
Evgeniy Meshcheryakov
09c4d1a7b3 Replaced deprecated(removed from qt6) signals 2023-06-13 20:56:27 +03:00
Tomasz Zieliński
e1f8ae94ac + Do not limit treasures to make space for more treasures if there are none ;eft 
+ Make sure RMG won't get stuck in infinite loop for weird treasure values (eg. 0).
 2023-06-12 22:15:59 +02:00
Tomasz Zieliński
6ebbdf0537 More cleanup of Long Run template 2023-06-12 20:51:04 +02:00
Tomasz Zieliński
5219f1db9d Fix useless template setting 2023-06-12 20:33:21 +02:00
Tomasz Zieliński
3d3c97bf93 Fix potential infinite loop 2023-06-12 20:32:58 +02:00
Ivan Savenko
3d5ea269ca
Merge pull request #2156 from krs0/feature/Highlight_For_Ranged_Full_Damage_Limit 
Highlight Ranged Full Damage Limit
 2023-06-11 23:02:55 +03:00