1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-23 00:28:08 +02:00
Commit Graph

7110 Commits

Author SHA1 Message Date
ef4fddd0c4 Merge pull request #2570 from Laserlicht/town_selection_window
Town selection window
2023-08-20 17:37:45 +04:00
6bfbe80cc9 Allow toggling quick combat spells usage 2023-08-19 17:23:55 +02:00
4a6deedd5e Merge pull request #2530 from Nordsoft91/tutorial
Support tutorial
2023-08-19 18:06:15 +04:00
70ddc1f3e5 Merge pull request #2577 from wb180/secondarySkillSerialization
Preserve order of secondary skills during hero json serialization/deserialization
2023-08-18 15:24:02 +03:00
d0b3319f6a Merge remote-tracking branch 'vcmi/beta' into develop 2023-08-18 15:08:23 +03:00
83b00bb7c3 Merge pull request #2610 from vcmi/master
Merge master -> beta
2023-08-18 12:56:05 +03:00
f9564dc8e4 Merge pull request #2563 from vcmi/fix_resources_near_mines
Fix resources placed behind mines
2023-08-18 09:12:56 +02:00
e1e16018d1 code review first batch 2023-08-17 17:29:31 +02:00
daa8a494fc Merge branch 'release_131' into master 2023-08-17 16:19:20 +03:00
96e820ddac Merge pull request #2517 from Laserlicht/folders 2023-08-17 10:09:37 +04:00
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
d26fdaefe4 Battle timer 2023-08-14 23:31:44 +04:00
c59014ce18 Merge remote-tracking branch 'origin/beta' into fix_rmg_teams 2023-08-14 18:59:45 +02:00
2ce50915e1 Fix ios compilation 2023-08-14 05:03:50 +04:00
3c9c302fd2 TurnTimerInfo 2023-08-14 02:16:25 +04:00
1d76f456ad change servercode to make it more robust 2023-08-14 00:08:48 +02:00
2a83f06905 Preserve order of secondary skills during hero serialization/deserialization 2023-08-14 00:06:22 +03:00
4b1224ec8c Implement turn timer feature 2023-08-13 14:07:48 +04:00
a7859dae39 Battle AI: archangels cast again 2023-08-13 09:08:30 +03:00
f13a53c1d9 Merge remote-tracking branch 'vcmi/beta' into develop 2023-08-12 17:28:47 +03:00
92ce97bbc7 Merge remote-tracking branch 'vcmi/master' into beta 2023-08-12 16:20:06 +03:00
abacb5f0ea Fix resources placed behind mines 2023-08-12 10:53:25 +02:00
ccf31d19f8 Merge pull request #2558 from IvanSavenko/localization_fix
Do not ignore translations for maps & campaigns
2023-08-12 11:24:19 +03:00
654489d5d3 Merge pull request #2525 from vcmi/battle-fast-targets
Battle fast targets
2023-08-12 09:22:25 +02:00
917f846a3a Merge pull request #2562 from vcmi/fix_artifact_replacement
Fix regression with replacing quest artifact
2023-08-12 09:14:21 +02:00
52f00ec308 extra function: getFormattedDateTime 2023-08-12 01:13:03 +02:00
4d507f3d8a format fix 2023-08-12 00:00:35 +02:00
f0b60cf166 suggestions; use internally uppercase; fix; fullname 2023-08-11 23:56:20 +02:00
4741bd546f Fix regression 2023-08-11 20:13:25 +02:00
8f450cf253 Fix for monsters spawning at left side of the map 2023-08-11 18:43:22 +02:00
942f8bbf05 Fix possible access to non-existing building 2023-08-11 18:50:39 +03:00
474045194a Do not ignore translations for maps & campaigns 2023-08-11 16:12:02 +03:00
83d97626fe Merge remote-tracking branch 'origin/beta' into fix_rmg_object_pos 2023-08-11 10:58:26 +02:00
b2de5d32d1 Merge pull request #2546 from vcmi/fix_crash_after_battle
Fix crash at battle end
2023-08-11 11:37:30 +03:00
88b23cdce1 Merge pull request #2511 from IvanSavenko/fix_starting_army
Fix starting army
2023-08-11 11:36:30 +03:00
0252d0f986 Fix hota offset + 2 possible crashes 2023-08-11 07:45:24 +02:00
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
2b093b8850 case handling 2023-08-11 01:46:22 +02:00
84436f7f18 Throw runtime error explicitely 2023-08-10 18:29:49 +02:00
f483f7bb53 Fix crash at battle end 2023-08-10 11:52:31 +02:00
1f9ee6aa38 Merge pull request #2524 from Nordsoft91/reward_canrefuse
[1.3.1] Reward can refuse fix
2023-08-09 20:06:26 +03:00
1def98a862 Tutorial implemented 2023-08-09 03:54:09 +04:00
ba9998ac66 BattleAI: fast targets optimization 2023-08-08 20:10:29 +03:00
be6f6da397 Fix for canRefuse flag in rewardable building 2023-08-08 19:27:00 +04:00
2e7e8bb52b Better error message on missing object constructor 2023-08-08 12:50:39 +03:00
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
f0ede46186 Clear spell list, not hero army 2023-08-07 19:12:04 +03:00
a9e895c08f basic subdirectory support 2023-08-06 21:39:39 +02:00
c089e55893 Fix placing road inside underground rock 2023-08-06 21:14:16 +02:00
c524caee5c Fixed possible uncaught exception on starting map 2023-08-06 17:46:49 +03:00