1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Commit Graph

17618 Commits

Author SHA1 Message Date
Maurycy
1e4956d3ea
Update swedish.json 2024-10-14 01:03:18 +02:00
Maurycy
22d9ad2538
Update swedish.json 2024-10-14 00:27:59 +02:00
Maurycy
024778dfe8
Update swedish.json 2024-10-14 00:18:32 +02:00
Laserlicht
d43997f5ba use sdl mixer to get audio duration 2024-10-13 21:08:43 +02:00
Ivan Savenko
10ad0fc760 Split CHeroHandler.cpp/.h into 1 file per class
All parts of CHeroHandler.cpp are now in lib/entities/hero
Adjusted includes to use new paths
No functionality changes
2024-10-13 14:01:09 +00:00
Ivan Savenko
ad7f0416a7 Added overloaded version of getObjectHandler to CGHeroInstance 2024-10-13 13:06:31 +00:00
Ivan Savenko
184d8de82e Fix typo in assertion 2024-10-13 13:06:07 +00:00
Ivan Savenko
31095248ab Removed typeName and subtypeName properties from CGObjectInstance 2024-10-13 13:05:50 +00:00
Ivan Savenko
4bdc503186 Workaround for prison hero reset on loading map in editor 2024-10-13 08:28:37 +00:00
Łukasz Zając
640ef0ea19
Update polish.json
Added new stuff
2024-10-12 23:57:58 +02:00
Laserlicht
f7e3641c04 fix shortcut bug; add center of selected item 2024-10-12 23:21:26 +02:00
Laserlicht
11eaed9fef code review 2024-10-12 23:01:14 +02:00
altiereslima
c85318a873
Merge branch 'develop' into develop 2024-10-12 08:11:48 -03:00
Ivan Savenko
5d2f3c0f86
Merge pull request #4764 from kdmcser/develop
do lupdate and update Chinese translation
2024-10-12 11:15:43 +03:00
kdmcser
b67b43c811 do lupdate and update Chinese translation 2024-10-12 13:11:35 +08:00
Ivan Savenko
7866179a01
Merge pull request #4762 from IvanSavenko/bugfixing
Fixes for recently reported bugs and regressions
2024-10-11 19:31:00 +03:00
Ivan Savenko
c55a75cc4e Remove copy-pasted code in rewardable town building leading to hero not
registered as visitor
2024-10-11 15:02:48 +00:00
Ivan Savenko
d1e7cb72c2 Fix game gang on random map generation 2024-10-11 15:02:14 +00:00
Ivan Savenko
e221cdccab Fix initialization of hero type in map editor 2024-10-11 15:01:55 +00:00
Ivan Savenko
115439f16a Fix town events not actually giving offered creatures 2024-10-11 15:01:18 +00:00
Maurycy
0c6233c77f
Update swedish.json
Added new code and trimmed some texts.
2024-10-11 13:02:30 +02:00
Ivan Savenko
e14ea4d7fc
Merge pull request #4754 from heroesiiifan/patch-7
Fix video missing error due typo
2024-10-11 13:52:04 +03:00
Ivan Savenko
a8e84c55f6 Fix some of the new warnings from sonarcloud 2024-10-11 10:45:29 +00:00
altiereslima
cb34b7ab50 Update portuguese.json 2024-10-10 19:58:42 -03:00
heroesiiifan
b56b6c1496
Update campaignMedia.json 2024-10-10 21:44:08 +00:00
Ivan Savenko
e0e01d678a
Merge pull request #4753 from IvanSavenko/misc_fixes
Fixes for regressions from recent PR's
2024-10-11 00:32:45 +03:00
Ivan Savenko
bc5b8d071f
Merge pull request #4751 from Laserlicht/patch-3
fix campaign name
2024-10-11 00:22:23 +03:00
Ivan Savenko
d5663c8948 Fix broken layout in "Mod Validation" option 2024-10-10 21:19:56 +00:00
Ivan Savenko
6bed497f2c Fix mod validation reporting failure for well-formed mods 2024-10-10 21:18:43 +00:00
Ivan Savenko
dfff1eae26 Fix crash on losing a hero 2024-10-10 21:16:41 +00:00
Laserlicht
f3a6d4a93f
copy name after init 2024-10-10 22:01:25 +02:00
Ivan Savenko
51838f020b
Merge pull request #4750 from IvanSavenko/savename_fix
Fixes missing names of saves and custom campaigns
2024-10-10 22:41:16 +03:00
Ivan Savenko
341ef633a5 Fixes missing names of saves and custom campaigns 2024-10-10 16:05:50 +00:00
Ivan Savenko
1fc0267ad1
Merge pull request #4748 from IvanSavenko/ci_fix
Quick workaround for failing Android CI
2024-10-10 16:52:55 +03:00
Ivan Savenko
15ad0440f7 Fix iOS build 2024-10-10 12:38:32 +00:00
Ivan Savenko
77cd08d66a Quick workaround for failing Android CI 2024-10-10 12:31:06 +00:00
Ivan Savenko
22ac88ecc4
Merge pull request #4731 from IvanSavenko/reduce_pointers
Reduce usage of pointers to VLC entities
2024-10-10 15:29:40 +03:00
Ivan Savenko
3dd4fa2528 Reduce usage of pointers to VLC entities
Final goal (of multiple PR's) is to remove all remaining pointers from
serializeable game state, and replace them with either identifiers or
with shared/unique pointers.

CGTownInstance::town and CGHeroInstance::type members have been removed.
Now this data is computed dynamically using subID member.

VLC entity of a town can now be accessed via following methods:
- getFactionID() returns ID of a faction
- getFaction() returns pointer to a faction
- getTown() returns pointer to a town

VLC entity of a hero can now be accessed via following methods:
- getHeroTypeID() returns ID of a hero
- getHeroClassID() returns ID of a hero class
- getHeroType() returns pointer to a hero
- getHeroClass() returns pointer to a hero class
2024-10-10 12:28:08 +00:00
Ivan Savenko
81f0222c68
Merge pull request #4741 from IvanSavenko/serialize_local_state
Serialize local state of player interface
2024-10-10 15:03:14 +03:00
Ivan Savenko
5aebf287b9
Merge pull request #4735 from IvanSavenko/private_pos
Reduce usages of ambiguos CGObjectInstance::pos
2024-10-10 15:00:50 +03:00
Ivan Savenko
3113b7f60a
Merge pull request #4704 from IvanSavenko/video_autodetect
Enable autodetection of video scaling parameters
2024-10-10 15:00:40 +03:00
Ivan Savenko
7f6a80ed47
Merge pull request #4738 from IvanSavenko/external_audio
Loading separate audio file in place of audio stream embedded in video
2024-10-10 14:58:04 +03:00
Ivan Savenko
92db0259c3
Merge pull request #4747 from IvanSavenko/mod_compat_fix
Fixes for loading 1.5 mods in vcmi 1.6
2024-10-10 14:57:47 +03:00
Ivan Savenko
0fcd300008
Merge pull request #4746 from Laserlicht/multiple_small_fixes
small fixes
2024-10-10 14:57:37 +03:00
Ivan Savenko
28bc38c94f
Merge branch 'develop' into multiple_small_fixes 2024-10-10 14:57:30 +03:00
Ivan Savenko
51481210c4
Merge pull request #4744 from wb180/vcmiqt_lib
Fix static linking
2024-10-10 14:56:40 +03:00
Ivan Savenko
7458faab58
Merge pull request #4742 from Warzyw647/commander-resistance-type
Changed Commander Resistance type from Dwarf to Golem
2024-10-10 14:56:31 +03:00
Ivan Savenko
75ebd9695d
Merge pull request #4739 from Laserlicht/fix_vmap_name
fix vmap name
2024-10-10 14:56:21 +03:00
Ivan Savenko
f238515a69
Merge pull request #4740 from XCOM-HUB/patch-2
Update swedish.json
2024-10-10 14:56:09 +03:00
Ivan Savenko
a22de74323 Fixes for loading 1.5 mods in vcmi 1.6 2024-10-10 09:50:56 +00:00