Ivan Savenko
877f47e37f
Merge branch 'develop' into video
2024-12-02 13:48:30 +02:00
Laserlicht
e6cd3630e0
fix warning
2024-11-30 17:20:39 +01:00
Laserlicht
543185a530
prescale support for video
2024-11-29 23:33:28 +01:00
Ivan Savenko
c3494b4a73
Merge pull request #4982 from kdmcser/fix_dismiss_crash
...
crash fix: dismiss hero when pick artifact
2024-11-27 16:41:44 +02:00
kdmcser
993a4dc73d
crash fix: dismiss hero when pick artifact
2024-11-26 01:11:09 +08:00
Laserlicht
b89db3f044
fix popup
2024-11-21 23:12:27 +01:00
Ivan Savenko
91940dbfc6
Do not show selection highlight on creature preview images
2024-11-17 20:40:38 +00:00
Ivan Savenko
251155d913
More robust management of body/shadow/overlay split
2024-11-17 17:54:55 +00:00
Ivan Savenko
c82db9d574
Fix crash on rearranging troops on non-owned hero
2024-11-17 17:38:54 +00:00
Ivan Savenko
df0c53af41
Merge pull request #4864 from Laserlicht/creature_window_rework
...
Creature window rework
2024-11-15 19:13:58 +02:00
SoundSSGood
27b59dd7ee
crash fixed
2024-11-13 06:39:37 +02:00
Ivan Savenko
da8fe13632
Merge pull request #4870 from SoundSSGood/secSkillPlace-fix
...
CHeroOverview secondary skill icons fixed
2024-11-06 22:02:28 +02:00
Ivan Savenko
e7bea6c3b8
Merge pull request #4852 from IvanSavenko/remove_vlc_entities_serialization
...
Remove remaining pointers to VLC entities from serializer
2024-11-06 22:01:11 +02:00
Ivan Savenko
11d9ee310e
Merge pull request #4785 from Laserlicht/subtitles
...
Subtitles for videos / sync
2024-11-06 21:56:43 +02:00
SoundSSGood
f60813d86f
CHeroOverview secondary skill icons fixed
2024-11-03 17:29:27 +02:00
Laserlicht
0ab4b66026
better approach for scrollbar
2024-11-02 15:16:38 +01:00
Ivan Savenko
0969871835
Merge branch 'develop' into mechanical_bonus
2024-10-31 15:14:51 +02:00
Ivan Savenko
d3af9f1c67
Removed pointer to VLC entity from CStackBasicDescriptor
2024-10-30 16:47:02 +00:00
Ivan Savenko
c98ac01e7a
Replaced public artType member of ArtifactInstance with getter
2024-10-30 16:47:01 +00:00
Ivan Savenko
f12119f86c
Merge pull request #4812 from SoundSSGood/secSkillPlace
...
[Hota] SeafaringAcademy. Initial PR
2024-10-30 13:33:39 +02:00
Laserlicht
bb73a35412
code review + pause handling
2024-10-30 00:35:50 +01:00
SoundSSGood
1fcd750774
suggested changes
2024-10-28 21:58:35 +02:00
Ivan Savenko
ee59bc4e71
Add bonus description generation for map objects
2024-10-25 18:36:02 +00:00
Laserlicht
53b7c5da6f
added MECHANICAL bonus
2024-10-24 21:30:51 +02:00
SoundSSGood
83279211e6
CSecSkillPlace done
2024-10-23 15:01:56 +03:00
SoundSSGood
03b4733c64
CSecSkillPlace
2024-10-22 01:54:04 +03:00
SoundSSGood
7955960901
CTradeableItem refactoring
2024-10-22 01:54:00 +03:00
SoundSSGood
573bb6abc6
CArtPlace now works with artifact ID
2024-10-20 12:56:54 +03:00
Laserlicht
8b427c3989
use json format
2024-10-16 22:47:38 +02:00
Ivan Savenko
c25aef8f48
Merge pull request #4766 from SoundSSGood/fused-artifacts
...
Fused artifacts
2024-10-16 15:08:20 +03:00
Laserlicht
54542c54b3
working subtitles
2024-10-16 03:48:14 +02:00
Laserlicht
4d46a2084d
basic subtitle rendering
2024-10-16 02:36:26 +02:00
SoundSSGood
86d5c05ffa
Fused identical artifacts
2024-10-15 16:51:29 +03:00
Laserlicht
d65938fa17
fix campaign video scrolling for short texts
2024-10-14 23:26:24 +02:00
Laserlicht
9ed4dbaeb4
Merge remote-tracking branch 'upstream/develop' into adv_search
2024-10-14 19:52:55 +02:00
Ivan Savenko
604e3b5c67
Merge pull request #4763 from IvanSavenko/herohandler_split
...
Split CHeroHandler.cpp/.h into 1 file per class
2024-10-14 19:05:48 +03: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
a8e84c55f6
Fix some of the new warnings from sonarcloud
2024-10-11 10:45:29 +00: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
Laserlicht
a826b88641
Merge branch 'develop' into spell
2024-10-07 12:55:23 +02:00
Laserlicht
07aa7bac3c
search for texts
2024-10-01 21:19:42 +02:00
Ivan Savenko
cef7466c71
Merge pull request #4643 from SoundSSGood/CArtHandler-refactoring
...
CArtifactSet tidy up
2024-10-01 16:26:32 +03:00
Laserlicht
afb90c076d
better UI
2024-09-28 02:34:18 +02:00
SoundSSGood
586a32a616
CArtifactSet cleanup
2024-09-23 23:39:19 +03:00
SoundSSGood
b9ae7f1138
CMap put move and remove artifact method
2024-09-23 23:30:38 +03:00
Ivan Savenko
248cff49a4
Moved fonts handling from Graphics to RenderHandler class
2024-09-23 15:43:11 +00:00
Ivan Savenko
e3d365262e
Merge pull request #4588 from Laserlicht/intro_video_rework
...
Intro video rework
2024-09-19 16:18:31 +03:00
Ivan Savenko
915533ed2e
Implemented generation of player-colored version of DiBoxBck
2024-09-12 21:22:41 +00:00
Laserlicht
8fc3fe3cc3
scaling
2024-09-12 23:06:33 +02:00
Laserlicht
822fa61bf2
intro rework
2024-09-12 22:28:45 +02:00
