Ivan Savenko
|
3d39963a1c
|
Merge branch 'master' into 'develop'
|
2024-08-26 14:01:00 +00:00 |
|
MichalZr6
|
2a6525c5ef
|
Check battleInt->curInt instead of battleInt
|
2024-08-25 19:43:21 +00:00 |
|
MichalZr6
|
619b35ab33
|
Allow dialogs when in battle interface
But also it is not our turn
|
2024-08-25 19:43:14 +00:00 |
|
Ivan Savenko
|
6d8bc9b859
|
Merge pull request #4500 from MichalZr6/allow_dialogs_when_in_battle
Allow dialogs when in battle interface but not on the players turn
|
2024-08-24 16:18:20 +03:00 |
|
Ivan Savenko
|
c22820f484
|
Merge pull request #4484 from Laserlicht/text_len
campaign text length
|
2024-08-24 16:06:31 +03:00 |
|
Ivan Savenko
|
3e605253db
|
Merge pull request #4481 from Laserlicht/fix_hota
fix for 8th creature
|
2024-08-24 16:06:12 +03:00 |
|
MichalZr6
|
9daabd0710
|
Check battleInt->curInt instead of battleInt
|
2024-08-23 23:30:50 +02:00 |
|
MichalZr6
|
d0e0ab767c
|
Allow dialogs when in battle interface
But also it is not our turn
|
2024-08-23 18:03:58 +02:00 |
|
Ivan Savenko
|
45558552d6
|
Merge 'vcmi/beta' into beta_fix
|
2024-08-23 13:18:09 +00:00 |
|
Ivan Savenko
|
b6cc409772
|
Fix excessive removal of dialogs, e.g. new week or timed events
|
2024-08-22 16:39:30 +00:00 |
|
Laserlicht
|
45fd13bdcd
|
mapname len
|
2024-08-21 22:11:16 +02:00 |
|
Laserlicht
|
61af23d258
|
text length
|
2024-08-21 21:43:54 +02:00 |
|
Laserlicht
|
43fc741a15
|
cleaner
|
2024-08-21 21:24:06 +02:00 |
|
Laserlicht
|
c36a6427c2
|
fix
|
2024-08-21 20:27:39 +02:00 |
|
Ivan Savenko
|
475a20124f
|
Fix crash on right-clicking spell component in some dialogs
|
2024-08-21 18:19:31 +00:00 |
|
Ivan Savenko
|
ff33fbd3a0
|
Merge pull request #4480 from IvanSavenko/update_prebuilts
Update ffmpeg
|
2024-08-21 15:57:50 +03:00 |
|
Laserlicht
|
e19194c3b8
|
fix for 8th creature
|
2024-08-21 00:17:25 +02:00 |
|
Ivan Savenko
|
50a4e3213d
|
Fix ffmpeg deprecation
|
2024-08-20 19:23:55 +00:00 |
|
Laserlicht
|
0901286f9d
|
fix
|
2024-08-20 20:38:38 +02:00 |
|
Laserlicht
|
01c14ae9ce
|
Merge branch 'develop' into extended_statistic
|
2024-08-20 20:25:16 +02:00 |
|
Ivan Savenko
|
85f6030c7c
|
Merge pull request #4318 from IvanSavenko/upscaled_render
Support for xBRZ upscaling filter
|
2024-08-20 14:23:30 +03:00 |
|
Ivan Savenko
|
6a6c13471c
|
Try more robust approach for waiting dialogs in battles in MP
|
2024-08-19 18:20:11 +00:00 |
|
Laserlicht
|
fec3d070b5
|
gui fixes for globallobby
|
2024-08-19 15:23:47 +00:00 |
|
Ivan Savenko
|
b94a61c255
|
Try to fix battle startup if player has waiting dialogs
|
2024-08-19 15:21:45 +00:00 |
|
Ivan Savenko
|
cc5564a7b1
|
Remove no longer used localization strings
|
2024-08-19 11:47:13 +00:00 |
|
Ivan Savenko
|
f1e63792f0
|
Greatly simplify town buildings logic
|
2024-08-19 11:47:13 +00:00 |
|
Ivan Savenko
|
b3158c52ba
|
Fixes for Sonar issues
|
2024-08-17 20:54:29 +00:00 |
|
Ivan Savenko
|
40ece7142b
|
Set no filtering by default for now
|
2024-08-17 19:11:30 +00:00 |
|
Ivan Savenko
|
fb3147fbda
|
Do not initialize shadow on images that don't have shadow palette
|
2024-08-17 19:11:10 +00:00 |
|
Ivan Savenko
|
d6059b044d
|
Implement selection of upscaling filter in launcher
|
2024-08-17 15:25:26 +00:00 |
|
Ivan Savenko
|
f29a687234
|
Clean up scaling code, implemented image size optimization
|
2024-08-17 15:25:26 +00:00 |
|
Ivan Savenko
|
f0448acaa3
|
TBB is now a dependency of lib. Implemented multithreaded xBRZ scale
|
2024-08-17 15:25:26 +00:00 |
|
Ivan Savenko
|
6a17c08b7e
|
Implemeted wider lines for upscaled mode
|
2024-08-17 15:25:26 +00:00 |
|
Ivan Savenko
|
095f5b5e60
|
Fix cursor scaling
|
2024-08-17 15:25:26 +00:00 |
|
Ivan Savenko
|
5c11a10667
|
Fix selection highlight in combat
|
2024-08-17 15:25:26 +00:00 |
|
Ivan Savenko
|
000af42fcb
|
Fix spellbook page flip scaling
|
2024-08-17 15:25:26 +00:00 |
|
Ivan Savenko
|
ffba847f40
|
xBRZ-upscaled images now support common palette-transform effects:
- Player coloring
- Flag color for map
- Glue selection for combat
|
2024-08-17 15:25:26 +00:00 |
|
Ivan Savenko
|
2d12cecded
|
Added draw method to ISharedImage interface
|
2024-08-17 15:25:26 +00:00 |
|
Ivan Savenko
|
502f47c6b5
|
Rename IConstImage to more clear ISharedImage
|
2024-08-17 15:25:26 +00:00 |
|
Ivan Savenko
|
f75a25e369
|
Fix positioning & scale of video files
|
2024-08-17 15:25:26 +00:00 |
|
Ivan Savenko
|
3bc31a2ea0
|
Fix rendering of minimap radar border
|
2024-08-17 15:25:26 +00:00 |
|
Ivan Savenko
|
216ef2a943
|
H3 fonts now use atlas for font data. Implemented xBRZ scaling for fonts
|
2024-08-17 15:25:26 +00:00 |
|
Ivan Savenko
|
85bb133561
|
Fix transparency on dialog box corners when xBRZ is in use
|
2024-08-17 15:25:26 +00:00 |
|
Ivan Savenko
|
0f4bd7253d
|
Fix adventure map rendering
|
2024-08-17 15:25:26 +00:00 |
|
Ivan Savenko
|
954b6b0947
|
Implemented scaling of mouse input events
|
2024-08-17 15:25:26 +00:00 |
|
Ivan Savenko
|
748a3a1b64
|
Fixed minimap generation when upscaled mode is used
|
2024-08-17 15:25:26 +00:00 |
|
Ivan Savenko
|
b527c0d09e
|
Fix warnings in xBRZ
|
2024-08-17 15:25:26 +00:00 |
|
Ivan Savenko
|
4838b51b9d
|
Convert xbrz.cpp to utf-8
|
2024-08-17 15:25:26 +00:00 |
|
Ivan Savenko
|
0529b80bc9
|
Use unix file endings for xBRZ
|
2024-08-17 15:25:26 +00:00 |
|
Ivan Savenko
|
020a825ecd
|
TTF fonts will now be rendered correctly in upscaling mode
Note that TTF rendering bypasses xBRZ - TTF fonts are rendered at larger
point size
|
2024-08-17 15:25:26 +00:00 |
|