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

5445 Commits

Author SHA1 Message Date
Ivan Savenko
d0b3319f6a Merge remote-tracking branch 'vcmi/beta' into develop 2023-08-18 15:08:23 +03:00
Ivan Savenko
83b00bb7c3
Merge pull request #2610 from vcmi/master
Merge master -> beta
2023-08-18 12:56:05 +03:00
DjWarmonger
f9564dc8e4
Merge pull request #2563 from vcmi/fix_resources_near_mines
Fix resources placed behind mines
2023-08-18 09:12:56 +02:00
Ivan Savenko
daa8a494fc Merge branch 'release_131' into master 2023-08-17 16:19:20 +03:00
Nordsoft91
96e820ddac
Merge pull request #2517 from Laserlicht/folders 2023-08-17 10:09:37 +04:00
Ivan Savenko
ef0cd0ba6e Fixed mod dependencies check on save loading to prevent crashes:
- mods that don't affect game objects can be ignored when loading save
- gameplay-affecting mods that were present in save must be active
- gameplay-affecting mods that were not in save must not be active
2023-08-14 23:55:04 +03:00
Andrii Danylchenko
a7859dae39 Battle AI: archangels cast again 2023-08-13 09:08:30 +03:00
Ivan Savenko
f13a53c1d9 Merge remote-tracking branch 'vcmi/beta' into develop 2023-08-12 17:28:47 +03:00
Ivan Savenko
92ce97bbc7 Merge remote-tracking branch 'vcmi/master' into beta 2023-08-12 16:20:06 +03:00
Tomasz Zieliński
abacb5f0ea Fix resources placed behind mines 2023-08-12 10:53:25 +02:00
Ivan Savenko
ccf31d19f8
Merge pull request #2558 from IvanSavenko/localization_fix
Do not ignore translations for maps & campaigns
2023-08-12 11:24:19 +03:00
DjWarmonger
654489d5d3
Merge pull request #2525 from vcmi/battle-fast-targets
Battle fast targets
2023-08-12 09:22:25 +02:00
DjWarmonger
917f846a3a
Merge pull request #2562 from vcmi/fix_artifact_replacement
Fix regression with replacing quest artifact
2023-08-12 09:14:21 +02:00
Michael
52f00ec308
extra function: getFormattedDateTime 2023-08-12 01:13:03 +02:00
Michael
4d507f3d8a
format fix 2023-08-12 00:00:35 +02:00
Michael
f0b60cf166
suggestions; use internally uppercase; fix; fullname 2023-08-11 23:56:20 +02:00
Tomasz Zieliński
4741bd546f Fix regression 2023-08-11 20:13:25 +02:00
Tomasz Zieliński
8f450cf253 Fix for monsters spawning at left side of the map 2023-08-11 18:43:22 +02:00
Ivan Savenko
942f8bbf05 Fix possible access to non-existing building 2023-08-11 18:50:39 +03:00
Ivan Savenko
474045194a Do not ignore translations for maps & campaigns 2023-08-11 16:12:02 +03:00
Tomasz Zieliński
83d97626fe Merge remote-tracking branch 'origin/beta' into fix_rmg_object_pos 2023-08-11 10:58:26 +02:00
Ivan Savenko
b2de5d32d1
Merge pull request #2546 from vcmi/fix_crash_after_battle
Fix crash at battle end
2023-08-11 11:37:30 +03:00
Ivan Savenko
88b23cdce1
Merge pull request #2511 from IvanSavenko/fix_starting_army
Fix starting army
2023-08-11 11:36:30 +03:00
Tomasz Zieliński
0252d0f986 Fix hota offset + 2 possible crashes 2023-08-11 07:45:24 +02:00
DjWarmonger
f5926c4023
Merge pull request #2498 from vcmi/fix_roads_in_rock
Fix placing road inside underground rock
2023-08-11 07:22:36 +02:00
Michael
2b093b8850
case handling 2023-08-11 01:46:22 +02:00
Tomasz Zieliński
84436f7f18 Throw runtime error explicitely 2023-08-10 18:29:49 +02:00
Tomasz Zieliński
f483f7bb53 Fix crash at battle end 2023-08-10 11:52:31 +02:00
Ivan Savenko
1f9ee6aa38
Merge pull request #2524 from Nordsoft91/reward_canrefuse
[1.3.1] Reward can refuse fix
2023-08-09 20:06:26 +03:00
Andrii Danylchenko
ba9998ac66 BattleAI: fast targets optimization 2023-08-08 20:10:29 +03:00
nordsoft
be6f6da397 Fix for canRefuse flag in rewardable building 2023-08-08 19:27:00 +04:00
Ivan Savenko
2e7e8bb52b Better error message on missing object constructor 2023-08-08 12:50:39 +03:00
Ivan Savenko
e57f8742cd Rename ambiguos 'clear' to 'clearSlots'
A lot of map objects inherit from CCreatureSet and as result - get
clean() method that resets object army
2023-08-07 19:13:02 +03:00
Ivan Savenko
f0ede46186 Clear spell list, not hero army 2023-08-07 19:12:04 +03:00
Michael
a9e895c08f
basic subdirectory support 2023-08-06 21:39:39 +02:00
Tomasz Zieliński
c089e55893 Fix placing road inside underground rock 2023-08-06 21:14:16 +02:00
Ivan Savenko
c524caee5c Fixed possible uncaught exception on starting map 2023-08-06 17:46:49 +03:00
Ivan Savenko
8b0f9c86f8 Fixed possible crash on invalid town building name 2023-08-06 13:30:20 +03:00
Ivan Savenko
041236837b Possible fix for crash from Android crash reporting 2023-08-05 12:49:38 +03:00
Ivan Savenko
dd17896082 Fix crash on bonus parsing failure (outdated mods?) 2023-08-05 12:49:02 +03:00
Ivan Savenko
ad8695ac91 Fix saving games - regression from filesystem changes 2023-08-04 18:41:42 +03:00
Ivan Savenko
537f9fa048 Merged master into develop 2023-08-03 23:38:32 +03:00
Tomasz Zieliński
44fae4945d Update distances in all zones adjacent to object 2023-08-02 20:41:29 +02:00
DjWarmonger
ca0eacc283
Merge pull request #2458 from vcmi/fix_water_tavern
Fix crash at water tavern
2023-08-02 20:03:02 +02:00
Tomasz Zieliński
250b27ba46 Fix crash due to missing boat for neutrla heroes 2023-08-02 17:19:23 +02:00
Tomasz Zieliński
f6247164ad Fix crash, fix invisible boat blocking the tile 2023-08-01 18:51:33 +02:00
Ivan Savenko
8a81b3013f Fixed transferring of artifacts from backpack in campaigns 2023-07-31 22:06:54 +03:00
Ivan Savenko
d9e7a8f88a
Merge pull request #2446 from IvanSavenko/bugfixing
(1.3.0) Bugfixing
2023-07-31 16:21:43 +03:00
Ivan Savenko
62fddca21e Split massive CModHandler class/file into multiple parts:
- IdentifierStorage is now a separate handler in VLC
- Renamed ModHandler::Incompatibility exception to ModIncompatibility
- Extracted ModScope namespace from ModHandler
- Extracted ModUtilities namespace from ModHandler
- Split CModHandler.cpp on per-class basis
- Replaced some direct members with unique_ptr to reduce header includes
2023-07-30 22:17:47 +03:00
Ivan Savenko
8ea7e91189 moved mod-related files to new directory 2023-07-30 20:38:32 +03:00