1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-10 22:31:40 +02:00
Commit Graph

19620 Commits

Author SHA1 Message Date
George King
fa1386748e Moved dirs.json load to constructor 2025-04-07 17:32:45 +02:00
George King
a9b23ae028 Fix build 2025-04-07 16:51:25 +02:00
George King
d2e5fdce56 Various tweaks 2025-04-07 16:37:51 +02:00
George King
451f22a22f Update lib/VCMIDirs.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2025-04-07 10:21:31 +02:00
George King
2df2d48b4a Update lib/VCMIDirs.cpp
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2025-04-07 09:55:47 +02:00
George King
5c83e54a9e Update lib/VCMIDirs.cpp
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2025-04-07 09:53:27 +02:00
George King
a08e923934 Allow changing default directories in Windows 2025-04-06 22:14:51 +02:00
George King
37ec51527c Allow changing default directories in Windows 2025-04-06 22:13:04 +02:00
Ivan Savenko
e1be9af5e6 Merge pull request #5602 from IvanSavenko/fuzzy_bump
Bump fuzzylite submodule to latest commit
2025-04-02 16:01:34 +03:00
Ivan Savenko
f2ffe32d5c Merge pull request #5597 from BenFradet/fix-dwellings
Fix dwellings recruitment text
2025-04-02 13:57:12 +03:00
Ivan Savenko
549a729e20 Merge pull request #5591 from IvanSavenko/vector_replace
Support for replacement of individual entries in json lists
2025-04-02 13:55:19 +03:00
Ivan Savenko
dd823d1681 Merge pull request #5560 from GeorgeK1ng/campaigns
[1.7] Campaigns configurations improvements
2025-04-02 13:54:50 +03:00
Ivan Savenko
40870d8f64 Bump fuzzylite submodule to latest commit 2025-04-01 17:58:21 +03:00
Ivan Savenko
efe2f4e0ba Merge pull request #5596 from BenFradet/fix-fedora-building
Fix fedora building instructions
2025-03-30 21:24:36 +03:00
Ben Fradet
f18715bd48 Update lib/mapObjects/CGDwelling.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2025-03-30 20:09:57 +02:00
Ivan Savenko
58a6aabd4c Switch list patching to more user-friendly 1-based indexing 2025-03-30 17:18:47 +03:00
Ivan Savenko
4dc82284b4 Add docs 2025-03-30 17:12:42 +03:00
benfradet
dc1358a416 Fix dwellings recruitment text 2025-03-29 23:31:01 +01:00
benfradet
b7965f007f Fix fedora building instructions 2025-03-29 23:24:26 +01:00
Ivan Savenko
aeb6c0be26 Support for replacement of individual entries in json lists
It is now possible for mods to modify json lists precisely, without full
replacement. Supported options:
- `append`: appends a single item to end of list
- `appendItems`: appends multiple items to end of list
- `insert@NUM`: inserts a single item *before* item NUM (item counting
is 0-based)
- `modify@NUM`: allows editing of a single item NUM (item counting is 0-
based)

Example - addition of a new item into town hall slots:
```json
"hallSlots":
{
	"modify@4" : {
		"append" : [ "dwellingLvl7B", "dwellingUpLvl7B" ]
	}
},
```
This would modify 4th element (last row) by appending new entry to the
end of last row

```json
{
	"modify@4" : {
		"insert@1" : [ "dwellingLvl5B", "dwellingUpLvl5B" ]
	}
},
```
This would add new slot not in the end of last row, but before 1st item
(between 5th and 6th dwellings)
2025-03-27 19:22:50 +00:00
Ivan Savenko
4df4438f59 Merge pull request #5588 from IvanSavenko/ci_fix
Fix CI failure in develop branch
2025-03-26 22:33:09 +02:00
Ivan Savenko
c6a541752e Fix unused variable on serialization 2025-03-26 19:55:56 +00:00
Ivan Savenko
1c96489721 Merge pull request #5569 from Laserlicht/configeditor
Editor for JSON config in launcher
2025-03-26 17:28:26 +02:00
Ivan Savenko
0197d226c9 Merge pull request #5565 from kdmcser/new_morale_luck
support setting dice molecule for rolling morale and luck
2025-03-26 16:53:13 +02:00
Ivan Savenko
33f708c744 Merge pull request #5577 from GeorgeK1ng/skill_removal
Skill removal as reward
2025-03-26 16:47:37 +02:00
heroesiiifan
032d4bf112 Merge pull request #5574 from heroesiiifan/bela
add belarussian
2025-03-26 16:46:46 +02:00
Ivan Savenko
dfbe6d1965 Merge pull request #5572 from IvanSavenko/old_banks_remove
Remove deprecated support for banks in 1.5 format
2025-03-26 16:45:56 +02:00
Ivan Savenko
bc07fa2fa3 Merge pull request #5571 from IvanSavenko/boost_old_remove
Remove old boost includes and defines
2025-03-26 16:45:39 +02:00
kdmcser
5c1adc7df5 change config format 2025-03-26 00:18:45 +08:00
Laserlicht
a371501005 code review 2025-03-23 13:09:03 +01:00
George King
474e044caf Update lib/mapObjects/CGHeroInstance.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2025-03-22 18:25:30 +01:00
George King
cae84e0e77 Skill removal as reward 2025-03-22 17:16:46 +01:00
George King
1edd666ac1 Page identification when needed 2025-03-21 22:12:15 +01:00
George King
11774c279d Update AssetGenerator.cpp 2025-03-21 17:20:37 +01:00
George King
551c1021b9 Remove not needed variables 2025-03-21 17:16:25 +01:00
George King
a62c658224 Fix AB typo 2025-03-21 17:15:27 +01:00
George King
1996c77d49 Update client/mainmenu/CCampaignScreen.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2025-03-21 17:14:55 +01:00
George King
11c32c7a8c Update client/mainmenu/CCampaignScreen.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2025-03-21 17:14:24 +01:00
George King
38f18366ea Merge pull request #2 from vcmi/develop
Update branch
2025-03-21 14:33:49 +01:00
George King
5a69e21a0d Added new buttons images by Aph-ra 2025-03-21 14:33:00 +01:00
George King
e058f31dc8 Delete Mods/vcmi/Content/Sprites/campaigns/next.png 2025-03-21 14:32:24 +01:00
George King
a5ebfc13d8 Delete Mods/vcmi/Content/Sprites/campaigns/back.png 2025-03-21 14:32:15 +01:00
George King
e5f873fff2 Remove obsolete string 2025-03-21 14:31:02 +01:00
George King
b237ed7b7a Add files via upload 2025-03-21 14:20:36 +01:00
George King
1123d944fc Make new buttons moddable 2025-03-21 14:17:08 +01:00
George King
fada0b9d74 Change Chronicles campaigns screen shortcuts to "T" as Tarnum 2025-03-20 19:55:14 +01:00
DjWarmonger
a3d1159512 Merge pull request #5550 from vcmi/non_euclidean_roads
Curved roads
2025-03-20 16:24:00 +01:00
DjWarmonger
1e9f65693f Merge pull request #5523 from vcmi/town_hints
Town hints
2025-03-20 16:23:44 +01:00
Laserlicht
11459d9268 editor for JSON config in launcher 2025-03-19 19:03:28 +01:00
George King
4a0d8a2015 Merge pull request #1 from vcmi/develop
Update branch
2025-03-19 09:45:29 +01:00