1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Commit Graph

11199 Commits

Author SHA1 Message Date
Ivan Savenko
4f703df4ac Removed old bonuses data 2023-03-31 00:16:27 +03:00
Ivan Savenko
508d68f77c Rewardables will use per-object name, if available 2023-03-30 22:29:58 +03:00
Dydzio
93c9632814 Minor readability fix 2023-03-30 21:19:05 +02:00
Ivan Savenko
e652b3eef0 Removed old code - VCMI now supports json-based animations everywhere 2023-03-30 19:59:19 +03:00
Dydzio
e70dd599bb Update / tweak translations 2023-03-30 18:58:31 +02:00
Ivan Savenko
46ccd65080 Removed largely unused signal handling, fixes build with musl c library 2023-03-30 14:56:13 +03:00
Konstantin
cd1730b1fb vcmi: remove obstacle caster logic
It is possible now to cast something via obstacle
Immune creatures should not trigger an obstacle trigger now
and should not reveal it.
2023-03-30 14:41:40 +03:00
Konstantin
db428faeeb vcmi: allow obstacles to store another spells
It will be used as trigger spell, if set
If not set, it will be ignored
2023-03-30 14:41:40 +03:00
Konstantin
57c35f39ca WIP: Moat placer 2023-03-30 14:41:40 +03:00
Konstantin
d90d00eeac vcmi: rework ProxyCaster
Now ProxyCaster can be used without hero and can even cast something
with default values.
2023-03-30 14:41:40 +03:00
Konstantin
847437bbfa BattleInfo: update bonus tree when unit is moved
This is a semi-dirty hack to force uncaching a bonuses with
UnitOnHexLimiter
2023-03-30 12:51:59 +03:00
Konstantin
4c08e6a0f9 vcmi: add UnitOnHex limiter
Bonus will be accepted, if unit stands in listed hexes
2023-03-30 12:51:59 +03:00
Konstantin
ffe24627e7 HeroBonus: change limiters to enum class
Also remove unused functions.
2023-03-30 12:42:24 +03:00
Konstantin
777818b388 HeroBonus: use 64 bit for tree counter (to be more robust) 2023-03-30 12:41:17 +03:00
Konstantin
0e69aac96f HeroBonus: removed unused functions 2023-03-30 12:41:17 +03:00
Konstantin
89fd742c1a NetPacks: add BATTLE type to GiveBonus
Will work as battlefield effect of current battle.
2023-03-30 12:41:17 +03:00
Konstantin
5716925b47 NetPacks: change GiveBonus enum to enum class. 2023-03-30 12:41:17 +03:00
Ivan Savenko
1084da00df Fix initial value of sound/music labels in settings 2023-03-30 12:23:47 +03:00
Ivan Savenko
484f0a175a Blocked movement of war machines in tactics phase 2023-03-30 12:20:13 +03:00
Ivan Savenko
9e75568574 Fixed Roland's specialty to use Swordsmen instead of Griffins 2023-03-30 12:19:31 +03:00
Ivan Savenko
974be97e6d
Merge pull request #1792 from IvanSavenko/happy_dydzio
Fixes for beta - graphical artifacts
2023-03-30 00:11:19 +03:00
Ivan Savenko
bfd8d3e1f7
Merge pull request #1790 from IvanSavenko/creature_specialty_loading_refactoring
Refactoring of hero specialty loading code
2023-03-30 00:11:08 +03:00
Ivan Savenko
8a3e1b0230
Merge pull request #1789 from IvanSavenko/beta_fixes
Fixes for 1.2 release
2023-03-30 00:09:51 +03:00
Ivan Savenko
abecda52b6
Merge pull request #1793 from heroesiiifan/patch-1
Update german translation
2023-03-30 00:09:40 +03:00
Tomasz Zieliński
46a24043e8 Add back Mines. 2023-03-29 17:06:17 +02:00
Tomasz Zieliński
401f2342c0 Place Mines after Towns and Monoliths. 2023-03-29 16:54:22 +02:00
Tomasz Zieliński
5ed3c2d518 Place towns and monoliths first - preferably at the zone border. 2023-03-29 16:25:13 +02:00
Ivan Savenko
3e1506dba3
Merge pull request #1767 from Adriankhl/fix_battle_thread_shutdown
Properly shutdown battle thread
2023-03-29 14:40:15 +03:00
Ivan Savenko
f5a54d7e53 Removed no longer used field 2023-03-29 14:34:19 +03:00
Ivan Savenko
a42dc923e4 Remove hardcoded constant 2023-03-29 14:33:44 +03:00
Ivan Savenko
9e1517662b
Merge pull request #1785 from krs0/feature/english_descriptions_revisited
English.json strings revisited
2023-03-29 14:32:40 +03:00
Ivan Savenko
1fcaeba8e0 Fix stack amount boxes flickering between actions 2023-03-29 13:21:43 +03:00
Ivan Savenko
3af829e6af Fix stack label position updates 2023-03-29 13:03:40 +03:00
heroesiiifan
8ea33d892f
Ingame strings - german 2023-03-28 23:18:45 +00:00
heroesiiifan
c4adccea81
Launcher - german 2023-03-28 23:01:45 +00:00
Ivan Savenko
0c023347dd Fix potential nullptr dereference 2023-03-28 23:50:57 +03:00
Ivan Savenko
06f9759aee Fix crash on using Teleport/Sacrifice spells 2023-03-28 23:50:42 +03:00
Ivan Savenko
0ce06e0f30 Improved rendering of stack amount boxes 2023-03-28 23:50:22 +03:00
krs
3a4066a644 Minor tweak to PressKeyToSkipIntro 2023-03-28 23:06:29 +03:00
krs
c180878dc6 Some rewordings according to review 2023-03-28 22:46:39 +03:00
Ivan Savenko
2cca15c2db Fix graphical artifact in hero movement animation 2023-03-28 22:37:53 +03:00
krs
f8fe56e8b3 English.json strings revisited 2023-03-28 22:10:22 +03:00
Ivan Savenko
498c968e45
Merge pull request #1779 from IvanSavenko/launcher_fixes
Launcher improvements for 1.2
2023-03-28 21:18:48 +03:00
Tomasz Zieliński
045942fd68 Fixed warning-as-error 2023-03-28 18:25:56 +02:00
Ivan Savenko
0c7dae0913 Allow formation change while in hero exchange query 2023-03-28 19:12:35 +03:00
Ivan Savenko
be52d46981 Fix Whirlpool sounds 2023-03-28 19:05:38 +03:00
Ivan Savenko
6d04c0b4db Fix affinities of Dungeon heroes 2023-03-28 18:58:30 +03:00
Ivan Savenko
9062d67f80 Fixed volume of ambient sounds 2023-03-28 18:56:44 +03:00
Tomasz Zieliński
b184e80b72 Use the most suitable template for object 2023-03-28 17:53:08 +02:00
Ivan Savenko
238de8a5d7 Properly disable combat panel during spell targeting 2023-03-28 18:14:09 +03:00