1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-30 08:57:00 +02:00
Commit Graph

1772 Commits

Author SHA1 Message Date
Laserlicht
2fef4b5d69 voice override 2024-08-31 14:17:25 +02:00
Laserlicht
e4ec26e613 override 2024-08-31 13:15:07 +02:00
Ivan Savenko
7f926fc30e
Merge pull request #4478 from Laserlicht/resource_generation
generate assets to file
2024-08-30 15:36:51 +03:00
Ivan Savenko
408a632002 Deprecate artifact-related building types 2024-08-28 13:50:08 +00:00
Ivan Savenko
55fd7bd7aa Thieves guild information level is now a bonus type 2024-08-28 13:50:07 +00:00
Ivan Savenko
8ef8ffa5c4 Implemented configurable blacksmith. Deprecated ballistaYard type 2024-08-28 13:49:42 +00:00
Ivan Savenko
8371232d29
Merge pull request #4504 from Laserlicht/hota_bonus
disintegrate bonus
2024-08-28 14:00:11 +03:00
Laserlicht
70190ea1fe
Merge branch 'develop' into resource_generation 2024-08-28 00:03:46 +02:00
Laserlicht
4704e92d98 adjust resource naming 2024-08-28 00:02:29 +02:00
Ivan Savenko
11e8b04ac5
Merge pull request #4463 from SoundSSGood/IMarket-refactoring
IMarket refactoring
2024-08-26 22:48:23 +03:00
SoundSSGood
4035ab1550 added CMarketWindow::getMarketTitle() 2024-08-24 13:52:54 +03:00
SoundSSGood
0c5022cae8 Loading market modes from json 2024-08-24 11:51:57 +03:00
Laserlicht
9c4d4e89d6 disintegrate 2024-08-24 00:29:36 +02:00
Laserlicht
02002ce69d
Merge branch 'develop' into resource_generation 2024-08-21 21:52:08 +02:00
Laserlicht
01e55beef1
Merge branch 'develop' into resource_generation 2024-08-20 20:26:52 +02:00
Laserlicht
01c14ae9ce
Merge branch 'develop' into extended_statistic 2024-08-20 20:25:16 +02:00
Ivan Savenko
85f6030c7c
Merge pull request #4318 from IvanSavenko/upscaled_render
Support for xBRZ upscaling filter
2024-08-20 14:23:30 +03:00
Laserlicht
82480e3552 add clean adventure options 2024-08-20 01:46:07 +02:00
Ivan Savenko
16adf8415f Add missing property to schema 2024-08-19 11:54:59 +00:00
Ivan Savenko
6fa2bb7e91 Deprecate previously hardcoded buildings 2024-08-19 11:47:13 +00:00
Ivan Savenko
22a126cf2d Restored replacement of town building bonuses via building upgrade 2024-08-19 11:47:13 +00:00
Ivan Savenko
abfb467f68 Cleanup old code, add compatibility for 1.5 mods 2024-08-19 11:47:13 +00:00
Ivan Savenko
f1e63792f0 Greatly simplify town buildings logic 2024-08-19 11:47:13 +00:00
Ivan Savenko
57430c101f Extracted common properties of buildings into a shared file 2024-08-19 11:47:13 +00:00
Ivan Savenko
49412579b4 Use 1.6 repository 2024-08-18 20:48:16 +00:00
Ivan Savenko
d6059b044d Implement selection of upscaling filter in launcher 2024-08-17 15:25:26 +00:00
Ivan Savenko
e3e44a8ff7 Implemented TODO's in schema 2024-08-15 18:16:49 +00:00
Laserlicht
a42afa2910 code review 2024-08-14 21:51:08 +02:00
Laserlicht
81b1704e39
Merge branch 'vcmi:develop' into extended_statistic 2024-08-14 20:32:47 +02:00
Ivan Savenko
72896d4ed5 Added (mostly) complete schema for validation of rewardable 2024-08-14 17:04:44 +00:00
Ivan Savenko
2151a7fc88 Moved configuration of rewardable town building to 'configuration' entry 2024-08-14 17:04:43 +00:00
Ivan Savenko
cfddba1e2a Fix json formatting 2024-08-14 17:04:43 +00:00
Ivan Savenko
ae256e41a5 Deprecate mana vortex building 2024-08-14 17:04:43 +00:00
Ivan Savenko
b4baaa5105 Use town-specific string for Stables instead of one for adventure map 2024-08-14 17:04:43 +00:00
Ivan Savenko
951b89402b Deprecate buildings that should now use configurable buildings 2024-08-14 17:04:43 +00:00
Ivan Savenko
580855ec2e Replace hardcoded buildings logic that can be represented with
configurable buildings
2024-08-14 17:04:43 +00:00
Ivan Savenko
bde4f8becc add validation for building type instead of obscure error message 2024-08-14 17:03:25 +00:00
Ivan Savenko
89dca5061d
Merge pull request #4384 from Laserlicht/shortcut
add shortcut for list item ordering
2024-08-14 17:04:45 +03:00
Ivan Savenko
1fb8ab5f70
Merge pull request #4429 from Laserlicht/regions
defining own regions extend
2024-08-14 17:04:13 +03:00
Laserlicht
9e9a6f1c5f
Merge branch 'develop' into extended_statistic 2024-08-13 00:49:51 +02:00
Laserlicht
da38ad5f5c
code review 2024-08-12 17:57:34 +02:00
Laserlicht
52b1219db6
code review 2024-08-12 17:53:24 +02:00
Ivan Savenko
f7c82d7909
Merge pull request #4400 from kdmcser/support_0_spellpower_and_knowledge
support configure for minimal primary skill values
2024-08-12 17:16:46 +03:00
Laserlicht
1e298534ae shortcut 2024-08-12 01:07:58 +02:00
Laserlicht
9a9cc10ee7 use Strg instead mouse pos 2024-08-09 22:50:09 +02:00
kdmcser
79f5d260a4 use primary skill array 2024-08-08 22:03:54 +08:00
Ivan Savenko
65af198fbf
Merge pull request #4341 from vcmi/force_portal_connection
Add RMG connection option "forcePortal"
2024-08-07 13:07:45 +03:00
kdmcser
87eb026184 support 0 spellpower and knowledge 2024-08-06 01:26:39 +08:00
Ivan Savenko
b7391f49f6 Merge branch 'vcmi/master' into 'vcmi/develop' 2024-08-05 10:36:10 +00:00
Laserlicht
7071647b72 add shortcut for list item moving 2024-08-04 14:11:10 +02:00