Laserlicht
613da80f55
fix 8th creature and portal of summoning
2024-10-07 16:25:18 +02:00
Laserlicht
b885fd9d3b
added custom icons for buttons made by Ivan
2024-10-07 13:26:43 +02:00
Laserlicht
344e845684
Merge branch 'develop' into adv_search
2024-10-07 12:56:54 +02:00
Laserlicht
a826b88641
Merge branch 'develop' into spell
2024-10-07 12:55:23 +02:00
Ivan Savenko
a7027e10f4
Merge pull request #4696 from Laserlicht/color_param
...
color shift parameter to config
2024-10-06 16:03:45 +03:00
Ivan Savenko
ac5efaaf75
Merge pull request #4703 from IvanSavenko/swresample
...
Use swresample (part of FFmpeg) to de-planarize audio into format that can be consumed by SDL
2024-10-06 16:03:15 +03:00
Laserlicht
4bf02865e4
tavern invite show random hero icon as default
2024-10-04 23:14:02 +02:00
SoundSSGood
e6f4a63951
add sort buttons
2024-10-02 13:35:08 +03:00
SoundSSGood
e22d15b1d8
manageBackpackArtifacts
2024-10-02 12:45:50 +03:00
Laserlicht
a4b60aca10
cleanup
2024-10-01 23:37:27 +02:00
Laserlicht
8e079cf016
add search box
2024-10-01 22:53:05 +02:00
Laserlicht
e86b694b22
fast search
2024-10-01 21:36:45 +02:00
Laserlicht
07aa7bac3c
search for texts
2024-10-01 21:19:42 +02:00
Laserlicht
e85e938865
use subid
2024-10-01 20:44:08 +02:00
Laserlicht
bd58caac13
search feature working
2024-10-01 20:20:19 +02:00
Laserlicht
5ea9063a3b
search with CObjectListWindow
2024-10-01 19:47:10 +02:00
Laserlicht
d04f369d85
search basic implementation
2024-10-01 18:15:32 +02:00
Ivan Savenko
e497a51373
Use swresample (part of FFmpeg) to de-planarize audio into format that
...
can be consumed by SDL
2024-10-01 15:38:15 +00:00
Laserlicht
9c6bd20159
code review
2024-10-01 16:32:28 +02:00
Laserlicht
be31041a48
"general" -> "interface"
2024-10-01 16:09:22 +02:00
Ivan Savenko
cef7466c71
Merge pull request #4643 from SoundSSGood/CArtHandler-refactoring
...
CArtifactSet tidy up
2024-10-01 16:26:32 +03:00
Ivan Savenko
654f5a9100
Merge pull request #4691 from PolishUser/hero-recruitment-sound
...
Add 'newBuilding' sound upon hero recruitment in towns
2024-10-01 15:28:33 +03:00
Laserlicht
844b078482
color shift parameter to config
2024-09-30 19:46:53 +02:00
Laserlicht
31f87cb6ed
improve ui
2024-09-30 18:15:13 +02:00
Laserlicht
e2b49bbf79
fix condition
2024-09-30 02:46:45 +02:00
Laserlicht
713fcd6543
research per day & seperate config
2024-09-30 02:40:28 +02:00
PolishUser
c2ddf8e06a
Add 'newBuilding' sound upon hero recruitment in towns
2024-09-28 23:54:51 +02:00
Dydzio
3bff68958e
Change deleted objects format to use ObjectInstanceID
2024-09-28 22:58:05 +02:00
Ivan Savenko
4ed478b6e5
Improve font mode auto-selection for languages like Chinese
2024-09-28 19:31:16 +00:00
Ivan Savenko
fecfdd7056
Fix centering of multi-line labels
2024-09-28 19:30:50 +00:00
Ivan Savenko
51848ced3b
Add font loading tracking to log
2024-09-28 19:30:26 +00:00
Laserlicht
3813db83ab
make ci happy
2024-09-28 16:16:34 +02:00
Laserlicht
8461189e95
code review + text
2024-09-28 16:10:03 +02:00
Laserlicht
f94f0a3274
new dialog
2024-09-28 15:51:53 +02:00
Laserlicht
d929bfb9d1
rename; introduce factor
2024-09-28 15:05:13 +02:00
Laserlicht
2052a26031
code review
2024-09-28 14:25:11 +02:00
Laserlicht
5bb29732d0
spell description, not spell roll
2024-09-28 12:53:57 +02:00
Laserlicht
afb90c076d
better UI
2024-09-28 02:34:18 +02:00
Laserlicht
3559f9f923
HMI for spell research
2024-09-28 01:47:32 +02:00
Laserlicht
5b2aa4dc71
swapping spells
2024-09-28 00:34:25 +02:00
Laserlicht
857b2e9a35
spell replacement works
2024-09-27 23:52:33 +02:00
Laserlicht
a9327b3fa3
netpacks
2024-09-27 22:47:22 +02:00
Ivan Savenko
7f8f09c8fa
Merge pull request #4668 from Laserlicht/scenario_name
...
Chronicles improvements
2024-09-27 20:01:47 +03:00
Ivan Savenko
19db016473
Merge pull request #4654 from dydzio0614/any-hex-shooting
...
Allow targeting empty hex by shooters with multi-tile SPELL_LIKE_ABILITY
2024-09-27 19:23:33 +03:00
Ivan Savenko
c983aa3887
Merge pull request #4651 from Laserlicht/optimize_vid
...
optimize videowindow (black bg)
2024-09-27 18:50:49 +03:00
Ivan Savenko
dc45d82558
Merge pull request #4665 from SoundSSGood/quickbackpack-shift+click
...
QuickBackpack window is now accessible by shift-clicking
2024-09-27 18:49:23 +03:00
Ivan Savenko
bee2e7200c
Merge pull request #4664 from IvanSavenko/ttf_fonts
...
Integrate true type fonts into VCMI
2024-09-27 18:41:02 +03:00
Ivan Savenko
ff50536568
Fix positioning of stack amount text
2024-09-27 12:05:26 +00:00
Laserlicht
2d60252e4c
read from mapheader; move chr to subfolder
2024-09-24 21:41:37 +02:00
MichalZr6
edf43f5702
Get and translate messages on client side
2024-09-24 19:12:05 +02:00
MichalZr6
6cf423d977
Fix Hill Fort upgrade logic when there are two levels
...
Fixes #2503
2024-09-24 18:29:01 +02:00
MichalZr6
303b0a6552
Fixes based on review remarks
2024-09-24 18:29:01 +02:00
MichalZr6
5c6abb30c6
Fix typo
2024-09-24 18:29:01 +02:00
MichalZr6
162e2ab22e
Additional Wooden Hill Fort message
...
More verbose info-message for unavailable upgrades (creature levels 5 and higher). Some minor refactors.
Added other statusbar message if it's standard Hill Fort
2024-09-24 18:29:01 +02:00
Ivan Savenko
b624069f86
Fix CI
2024-09-24 13:40:15 +00:00
SoundSSGood
f0a5bcfebb
Quick backpack window on shift+click
2024-09-24 16:35:28 +03:00
Ivan Savenko
88f3e982e0
Merge pull request #4662 from Laserlicht/string_color
...
fixes string colorization bug
2024-09-24 16:29:41 +03:00
Ivan Savenko
ca3c6227c4
Add selector for font type in Launcher, add autoselection
2024-09-24 13:25:36 +00:00
Ivan Savenko
87274128e7
Proper support for usage of multiple fonts in a chain
2024-09-24 10:59:35 +00:00
Laserlicht
138cbc6a81
scenario name for campaigns
2024-09-24 11:23:10 +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
Laserlicht
bee5cd00cc
also for color
2024-09-23 21:11:53 +02:00
Laserlicht
03d03491b5
fixes string colorisation bug
2024-09-23 21:07:00 +02:00
Ivan Savenko
557b72f2b3
Launcher now controls ttf fonts usage directly instead of toggling mod
...
from extras
2024-09-23 18:31:44 +00:00
Ivan Savenko
97e24ff126
Integrated Noto fonts into vcmi
2024-09-23 18:15:30 +00:00
Ivan Savenko
5502dcaea4
Remove no longer used support for original version of Chinese fonts
2024-09-23 15:46:12 +00:00
Ivan Savenko
248cff49a4
Moved fonts handling from Graphics to RenderHandler class
2024-09-23 15:43:11 +00:00
Ivan Savenko
92c5fd4156
Merge pull request #4655 from IvanSavenko/bugfixing
...
Bugfixing
2024-09-23 18:01:27 +03:00
Dydzio
230893f423
Merge branch 'develop' into any-hex-shooting
2024-09-23 16:57:27 +02:00
Ivan Savenko
e93a060500
Merge branch 'vcmi/beta' into 'vcmi/develop'
2024-09-23 14:25:53 +00:00
Ivan Savenko
a5de312344
Add workaround for SDL bug - use old code for buggy SDL versions
2024-09-23 14:02:55 +00:00
Ivan Savenko
3319be114f
Fix line break position computation for text without spaces (Chinese)
2024-09-22 20:33:14 +00:00
Dydzio
50b412b35b
Better handling of default cursor action for SPELL_LIKE_ATTACK
2024-09-22 21:14:24 +02:00
Dydzio
f90405a41d
Highlight stacks affected by SPELL_LIKE_ATTACK in spellcast mode
2024-09-22 20:48:18 +02:00
Dydzio
dc56047661
Add hex highlight for SPELL_LIKE_ATTACK in casting mode & minor cleanup
2024-09-22 20:38:49 +02:00
Dydzio
bb69ab1a1a
Fix assert and condition for counting spell hexes
2024-09-22 18:25:18 +02:00
Laserlicht
b7b4277043
fix for smaller window
2024-09-22 17:20:43 +02:00
Laserlicht
8907dc9362
improvement
2024-09-22 17:15:54 +02:00
Laserlicht
6a74b3d26c
optimize videowindow (black bg)
2024-09-22 17:03:20 +02:00
Dydzio
1a2d349267
Initial unconditionally working version
2024-09-22 15:07:44 +02:00
Laserlicht
73d3903e43
fix xbrz font fallback
2024-09-20 21:25:09 +02:00
Ivan Savenko
3e1968c201
Wait for inactive player in hotseat to answer dialog before starting
...
battle
2024-09-19 15:30:51 +00:00
Ivan Savenko
658c359bc7
Merge pull request #4542 from MichalZr6/update_displayed_path
...
Update displayed hero path when hiring/dismissing creatures that give move penalty
2024-09-19 17:35:49 +03:00
Ivan Savenko
fb28de5beb
Merge pull request #4531 from Laserlicht/mouse_right_drag
...
map drag with right mouse
2024-09-19 16:42:33 +03:00
Ivan Savenko
e3d365262e
Merge pull request #4588 from Laserlicht/intro_video_rework
...
Intro video rework
2024-09-19 16:18:31 +03:00
MichalZr6
5f86f5504b
Fix #3286
2024-09-19 09:51:18 +02:00
MichalZr6
7fa965e78b
Fix unintentionally broken line endings to LF in Client.cpp
2024-09-19 09:20:36 +02:00
MichalZr6
e13e72d093
Moved code from NetpacksClient.cpp to Client.cpp
...
Created new function CClient::updatePath that will invalidate paths and update given hero displayed path
2024-09-19 08:43:54 +02:00
MichalZr6
6b4220c510
Add update paths code to netpack visiting methods
2024-09-19 08:43:53 +02:00
Laserlicht
a43475042f
code review
2024-09-18 22:10:25 +02:00
Ivan Savenko
e7779a0b90
Merge pull request #4614 from dydzio0614/hero-description-movement-points
...
Add status bar movement points info for own hero on adventure map or hero list
2024-09-18 15:46:51 +03:00
Ivan Savenko
aa55977de2
Merge pull request #4617 from Laserlicht/asset_gen_missing
...
AssetGenerator: missing assets for generateAll
2024-09-18 15:43:11 +03:00
Laserlicht
fd1f1001c5
fix draw color
2024-09-18 00:09:09 +02:00
Laserlicht
c884566c4f
fix xbrz shadow
2024-09-17 23:58:56 +02:00
Laserlicht
c8f8a3fb6d
missing asset for generateAll
2024-09-17 23:03:30 +02:00
Dydzio
c6edd615ac
Block possibility to move hero if shift-clicking on path end
2024-09-17 21:49:21 +02:00
Dydzio
7979f62f82
Add status bar movement points info for own hero on adventure map or hero list
2024-09-17 21:38:28 +02:00
Ivan Savenko
110def5a1e
Merge pull request #4613 from IvanSavenko/cyan_fix
...
Fix creatures with non-cyan background in battle when xbrz is not in use
2024-09-17 21:33:23 +03:00
Ivan Savenko
d0ac6458b9
Merge pull request #4609 from IvanSavenko/building_fixes
...
Building fixes
2024-09-17 17:50:49 +03:00
Ivan Savenko
b5bacb5c09
Fix creatures with non-cyan background in battle when xbrz is not in use
2024-09-17 14:48:28 +00:00
Ivan Savenko
8b2821456a
Show generic dialog if building was already visited
2024-09-16 19:51:10 +00:00
Ivan Savenko
1d7a89c79b
Only visiting heroes can now activate manual rewardable buildings
...
- This is more clear - in case if building generates queries
- Avoids some edge cases, like what to do if building is single-use and
town has 2 heroes
- In line with hota version of this feature
2024-09-15 10:36:31 +00:00
SoundSSGood
7eda885390
client icons path fixed
2024-09-14 16:03:26 +03:00
Ivan Savenko
500d17a4a4
Merge pull request #4590 from Laserlicht/fix_kingdom
...
fix kingdom overview
2024-09-14 13:45:07 +03:00
Ivan Savenko
37d03bd9eb
Merge pull request #4587 from IvanSavenko/fix_hero_preview
...
Fix crash on accessing hero preview in map setup
2024-09-14 13:44:40 +03:00
Ivan Savenko
bc9937e72c
Fix corrupted shadow on ship image in shipyard
2024-09-13 13:42:27 +00:00
Ivan Savenko
626c34a105
Fix colorization of Fortress and Inferno adventure map image from hota
2024-09-13 12:45:51 +00:00
Ivan Savenko
4abd96dba4
Add debug code to save every loaded image to a file
2024-09-13 12:26:31 +00:00
Laserlicht
789dec0c82
fix kingdom overview
2024-09-13 01:44:11 +02:00
Laserlicht
e963550431
fix and no shadow
2024-09-13 00:03:25 +02:00
Laserlicht
16ae854f17
fix shadow
2024-09-12 23:49:57 +02:00
Laserlicht
21c3cf0960
rename and move window class
2024-09-12 23:35:21 +02:00
Laserlicht
2fbdeb3a5d
skippable video intro
2024-09-12 23:23:00 +02:00
Ivan Savenko
612490712e
Fix cursor pivot/tip offset for xbrz mode
2024-09-12 21:22:41 +00:00
Ivan Savenko
66a2c8dc37
add ImageLocator::toString
2024-09-12 21:22:41 +00:00
Ivan Savenko
2d08e18f6a
Implemented generation of combat unit number window for xbrz mode
2024-09-12 21:22:41 +00:00
Ivan Savenko
915533ed2e
Implemented generation of player-colored version of DiBoxBck
2024-09-12 21:22:41 +00:00
Ivan Savenko
6f6b20b716
Fix fps indicator when xbrz is in use
2024-09-12 21:22:41 +00:00
Ivan Savenko
dfd3f0c1a6
Fixed generation of upscaled spellbook
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
Ivan Savenko
e086ff12b8
Fix crash on accessing hero preview in map setup
2024-09-12 20:13:02 +00:00
Ivan Savenko
39a2c29c97
Removed creatureBank flag from battle, battles now receive BattleLayout
...
struct that defines how units are placed in combat
2024-09-12 12:11:18 +00:00
Dydzio
e843af24bf
Fix broken popping of top interfaces when town was opened during multiplayer game
2024-09-11 23:00:06 +02:00
Laserlicht
258d298775
Merge branch 'develop' into outro_support
2024-09-09 23:09:44 +02:00
Ivan Savenko
ce4548718c
Merge pull request #4544 from IvanSavenko/map_settings
...
Per-map game settings
2024-09-10 00:03:10 +03:00
Ivan Savenko
847de990c1
Merge pull request #4567 from Laserlicht/bonus_double
...
allow double click for campaign bonus selection
2024-09-09 23:37:18 +03:00
Ivan Savenko
068c4bfa1e
Fix compilation with boost 1.86
2024-09-09 16:59:01 +00:00
Laserlicht
45625f0355
added AB intro; play only when resource exists
2024-09-06 22:57:53 +02:00
Laserlicht
7ae8514657
allow double click for bonus selection
2024-09-06 00:22:59 +02:00
Laserlicht
6d9385b8bd
outro for RoE
2024-09-05 21:31:17 +02:00
Ivan Savenko
8225eb454e
Added GameSettings to gamestate, potentially allowing to define game
...
settings per map (or in random map template)
2024-09-05 15:16:27 +00:00
Ivan Savenko
6179521364
Merge pull request #4556 from IvanSavenko/town_building_visit
...
Implemented explicitly visitable town buildings, e.g. hota mana vortex
2024-09-05 17:21:21 +03:00
Ivan Savenko
a72715ad31
Merge pull request #4563 from SoundSSGood/vcmiScrolls
...
Improvements to the artifact creation
2024-09-05 17:10:13 +03:00
SoundSSGood
7466d7452d
vcmiscrolls
2024-09-05 15:51:45 +03:00
Ivan Savenko
624607caae
Merge pull request #4555 from IvanSavenko/xbrz_fonts
...
Improvements for fonts when xbrz is in use
2024-09-05 15:06:25 +03:00
Ivan Savenko
a87ab4e4d7
Merge pull request #4557 from utzuro/fix/rmg-road-type-not-saving
...
RMG: Enable only those roads, that are enabled in persistentStorage.json
2024-09-05 15:06:15 +03:00
Ivan Savenko
c52533a961
Merge pull request #4543 from Laserlicht/chronicles_installer
...
Chronicles support
2024-09-05 15:04:13 +03:00
Ivan Savenko
b09d9d501b
Pass pointer to actual caller in showBlockingDialog callWith
...
Fixes activation of all rewardable buildings in town on blocking dialog
answer
2024-09-04 15:14:56 +00:00
Ivan Savenko
81af66d35b
Move visit query to a separate class, remove no longer needed Cast.h
2024-09-04 14:32:36 +00:00
void
de4f63da90
RMG: Enable only those roads, that are enabled in persistentStorage.json
2024-09-04 08:37:45 +09:00
Ivan Savenko
327ff01471
Implemented explicitly visitable town buildings, e.g. hota mana vortex
...
Added flag `manualHeroVisit` flag to town building. If this flag is set,
then building will only be activated on click and will not give its
effect on hero recrutiment, hero visit, or new day.
This allows implementing changes to Mana Vortex from HotA
2024-09-03 16:31:07 +00:00
Ivan Savenko
8367729235
Added option to define true type fonts size for each xbrz mode
2024-09-03 10:36:50 +00:00
Ivan Savenko
e035ae8b48
Fixed crash on attempt to upscale nonexisting image
2024-09-03 09:22:40 +00:00
Laserlicht
1c809bcb88
fixes build on clang
2024-09-03 00:25:35 +02:00
Ivan Savenko
ed60387041
Try to fix string width computation rounding error
2024-09-02 22:08:59 +00:00
Ivan Savenko
0acc22214b
Read scaling filter for fonts from config
2024-09-02 22:08:19 +00:00
Ivan Savenko
35467039a7
Bitmap fonts now use nearest neighbour scaling instead of xbrz
2024-09-02 21:31:01 +00:00
Ivan Savenko
ee64928454
Merge pull request #4448 from smanolloff/split-client+develop
...
Split vcmiclient in two
2024-09-02 15:34:05 +03:00
Laserlicht
c7064377da
code review
2024-09-01 12:23:10 +02:00
Laserlicht
b80852617a
text len
2024-09-01 03:43:20 +02:00
Laserlicht
0280254810
tarnum icon
2024-08-31 22:05:36 +02:00
Laserlicht
46872b764b
integrate campaign intro
2024-08-31 17:57:27 +02:00
Laserlicht
9c2a5f6baa
window
2024-08-31 17:16:42 +02:00
Simeon Manolov
e502853227
address code review comments
2024-08-31 18:14:05 +03:00
Laserlicht
36914682a5
Merge branch 'develop' into chronicles_installer
2024-08-31 16:18:52 +02:00
Laserlicht
16cbd6a7d2
allow custom loadbar-backgrounds for campaigns
2024-08-31 16:03:42 +02:00
Ivan Savenko
39e5ba32f6
Merge pull request #4530 from IvanSavenko/town_fortifications
...
Support for configurable town fortifications
2024-08-31 13:59:40 +03:00
Ivan Savenko
71c7beb7a5
Merge pull request #4533 from IvanSavenko/town_growth
...
Change logic of neutral towns garrisons to match H3
2024-08-31 13:52:36 +03:00
Ivan Savenko
0a72a0a48e
Merge pull request #4534 from SoundSSGood/BulkEraseArtifacts
...
BulkEraseArtifacts network pack
2024-08-31 13:52:26 +03:00
Ivan Savenko
8cfc1c4ee1
Merge pull request #4535 from IvanSavenko/savecompat_bump
...
Removed save compatibility with 1.4
2024-08-31 13:51:10 +03:00
Ivan Savenko
7f926fc30e
Merge pull request #4478 from Laserlicht/resource_generation
...
generate assets to file
2024-08-30 15:36:51 +03:00
Ivan Savenko
82c37573fa
Removed save compatibility with 1.4
...
All save compatibility checks targeting 1.4 saves have now been removed.
Saves from 1.5 can still be loaded in 1.6
Implemeted few TODO's in serialization that were postponed to avoid
breaking save compatibility in MP for 1.5.X releases.
Fixed missed case for loading black market object from 1.5 saves
2024-08-29 18:51:53 +00:00
SoundSSGood
e15ea4fc75
BulkEraseArtifacts network pack
2024-08-29 20:22:08 +03:00
Ivan Savenko
7064374d87
Fix visions not working for towns
2024-08-29 15:46:03 +00:00
Ivan Savenko
32ad9c1902
Change ordering of UI elements in main menu to fix hota 1.7 menu
2024-08-29 13:18:33 +00:00
Ivan Savenko
9a2d918360
Fixed mouse wheel in xbrz mode, use mouse position information if
...
provided by SDL
2024-08-29 13:18:30 +00:00
Laserlicht
c6f0f8de03
generate assets only when necessary
2024-08-29 00:37:39 +02:00
Laserlicht
f327224d45
remove original resource functionality
2024-08-28 23:44:31 +02:00
Laserlicht
091523d67b
add missing event
2024-08-28 23:37:38 +02:00
Laserlicht
aa6cbdf13b
make it also usable on android
2024-08-28 23:07:00 +02:00
Laserlicht
8f24778e9d
config for right drag
2024-08-28 22:36:41 +02:00
Laserlicht
be7d27234f
map drag with right mouse
2024-08-28 22:17:05 +02:00
Ivan Savenko
36c1ed670f
Support for configurable town fortifications
...
Removed most of hardcoded checks for fort level or for presence of fort/
citadel/castle buildings.
It is now possible to define which parts of town fortifications are
provided by town buildings
Configuration for H3-like fortifications is provided in
buildingsLibrary.json and will be used automatically by mods as long as
mods have buidings named "fort", "citadel" and "castle".
Alternatively, mods can separately define:
- hitpoints of walls (shared value for all sections)
- hitpoints of central, upper and lower towers (separate values)
- presence of moat
- shooters for each tower (separate values)
2024-08-28 19:42:14 +00:00
Ivan Savenko
4c84379110
Open thieves guild if building provides corresponding bonus
2024-08-28 14:04:47 +00:00
Ivan Savenko
408a632002
Deprecate artifact-related building types
2024-08-28 13:50:08 +00:00
Ivan Savenko
55fd7bd7aa
Thieves guild information level is now a bonus type
2024-08-28 13:50:07 +00:00
Ivan Savenko
a1a194d904
Allow replacing war machine if hero has a different machine in the slot
2024-08-28 13:49:42 +00:00
Ivan Savenko
8ef8ffa5c4
Implemented configurable blacksmith. Deprecated ballistaYard type
2024-08-28 13:49:42 +00:00
Ivan Savenko
ce1e0b8875
Moved NewTurn pack generation to NewTurnProcessor
2024-08-28 13:03:24 +00:00
Ivan Savenko
0fd9dbf240
Unified income handling, added IOwnableObject interface
2024-08-28 12:40:44 +00:00
Ivan Savenko
58da447f43
Merge pull request #4523 from IvanSavenko/xbrz_fixes
...
Xbrz fixes
2024-08-28 15:39:45 +03:00
Laserlicht
70190ea1fe
Merge branch 'develop' into resource_generation
2024-08-28 00:03:46 +02:00
Laserlicht
4704e92d98
adjust resource naming
2024-08-28 00:02:29 +02:00
Ivan Savenko
a2bac260e7
Fix images with custom scaling in xBRZ mode
2024-08-27 19:49:41 +00:00
Ivan Savenko
0bbc2bce33
Fix handling of transparency in xbrz and in images with non-cyan
...
transparent color in unscaled mode
2024-08-27 19:44:11 +00:00
Laserlicht
d47271de6c
avoid zero size Y axis
2024-08-27 21:41:50 +02:00
Ivan Savenko
20d5b33ea6
Remove marketModes as member
...
marketModes are now generated in runtime and are not a member of
IMarket. Was not a bad change, but towns load buildings before town type
is randomized, leading to case where market modes are not actually known
when building is added to town (like random towns with market built)
Since altar requires CArtifactSet for work, IMarket will now always
contain it, but it will only be accessible if market supports altar
mode.
2024-08-27 14:07:00 +00:00
Simeon Manolov
20ccc92e6d
move shutdown functions in EntryPoint
2024-08-27 13:12:55 +03:00
Simeon Manolov
e9131538dd
Merge branch 'develop' into split-client+develop
2024-08-27 03:05:07 +03:00
Ivan Savenko
01396b62b7
Extracted handling of type ID's from serializer into a separate class
2024-08-26 19:48:46 +00:00
Ivan Savenko
232a759db7
Remove type registration from library pack applying
2024-08-26 19:48:46 +00:00
Ivan Savenko
b84af1a6de
Significantly simplify packs applying
...
Apparently our logic for packs applying with types registration is
overcomplicated and by now completely unnecessary - it became redundant
after introduction of visitor pattern.
2024-08-26 19:48:46 +00:00
Ivan Savenko
11e8b04ac5
Merge pull request #4463 from SoundSSGood/IMarket-refactoring
...
IMarket refactoring
2024-08-26 22:48:23 +03:00
Ivan Savenko
7b746bcaec
Merge pull request #4496 from Laserlicht/statistic_improve
...
Statistics improve
2024-08-26 19:12:56 +03:00
Ivan Savenko
e65eaf0e06
Merge pull request #4506 from mikeiit/add_missisng_stack_artifact_description
...
Added missing stack artifact description
2024-08-26 19:10:48 +03:00
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
Laserlicht
2c5a1bcbb4
remove comment out line
2024-08-25 11:48:17 +02:00
Laserlicht
d9d82fc836
add horicaontal grid + fixes
2024-08-25 02:21:24 +02:00
Mike
3671079754
Added artifact description
2024-08-24 16:37:11 -07:00
Laserlicht
95d2fbc9b7
fix grid
2024-08-25 00:43:55 +02:00
Laserlicht
62790e9aad
scaling anim have problems -> use other icon
2024-08-25 00:33:36 +02:00
Laserlicht
6e33b86dcb
fix days surived
2024-08-24 23:36:01 +02: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
SoundSSGood
4035ab1550
added CMarketWindow::getMarketTitle()
2024-08-24 13:52:54 +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
Laserlicht
463d18b92d
add grid for weeks/months
2024-08-23 00:46:46 +02:00
Laserlicht
d7ee268c76
touch hovering improvements
2024-08-22 23:27:21 +02: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
c2290f5f6e
fix
2024-08-21 23:01:32 +02:00
Laserlicht
45fd13bdcd
mapname len
2024-08-21 22:11:16 +02:00
Laserlicht
02002ce69d
Merge branch 'develop' into resource_generation
2024-08-21 21:52:08 +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
Simeon Manolov
d05adfc5d5
Merge branch 'develop' into split-client+develop
2024-08-21 17:40:37 +03:00
Simeon Manolov
5a7dc7b552
Merge branch 'develop' into split-client+develop
2024-08-21 17:39:44 +03:00
Simeon Manolov
530c1f2bc1
[SPLIT-CLIENT+DEVELOP] android fix attempt
2024-08-21 16:07:30 +03: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
SoundSSGood
2e3e6b1553
market->getObjInstanceID()
2024-08-21 01:01:23 +03:00
Laserlicht
d8869a33da
remove resource
2024-08-20 22:45:11 +02:00
Ivan Savenko
50a4e3213d
Fix ffmpeg deprecation
2024-08-20 19:23:55 +00:00
Laserlicht
c56d667981
fix
2024-08-20 21:22:40 +02:00
Laserlicht
0901286f9d
fix
2024-08-20 20:38:38 +02:00
Laserlicht
01e55beef1
Merge branch 'develop' into resource_generation
2024-08-20 20:26:52 +02:00
Laserlicht
01c14ae9ce
Merge branch 'develop' into extended_statistic
2024-08-20 20:25:16 +02:00
SoundSSGood
58bb2b58e3
IMarket suggestions
...
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-08-20 18:49:48 +03:00
SoundSSGood
cd7ebea9e3
cleanup unused code
2024-08-20 18:49:47 +03:00
SoundSSGood
fd45b5144d
IMarket serializeable
2024-08-20 18:49:47 +03: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
Laserlicht
6c1776e0b1
AssetGenerator: make it perfect
2024-08-20 03:13:21 +02:00
Laserlicht
f6d5cee24f
fix
2024-08-20 01:58:02 +02:00
Laserlicht
82480e3552
add clean adventure options
2024-08-20 01:46:07 +02:00
Laserlicht
c2b181dc0c
Merge branch 'develop' into resource_generation
2024-08-19 23:43:24 +02:00
Laserlicht
17cb45f692
fix
2024-08-19 23:33:23 +02:00
Laserlicht
fff0159ef6
resource generation
2024-08-19 23:18:14 +02: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
Simeon Manolov
90931cc3e3
android deploy fix attempt
2024-08-19 13:17:38 +03: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
Ivan Savenko
fa65b0019c
First working version of xBRZ upscaler
2024-08-17 15:25:26 +00:00
Ivan Savenko
4171026035
First iteration of upscaled rendering
2024-08-17 15:25:25 +00:00
Ivan Savenko
7f5cd8a7aa
newSurface method now accepts Point instead of two integers
2024-08-17 15:25:25 +00:00
Ivan Savenko
20ba63bba3
Added xBRZ 1.8 library to source code
2024-08-17 15:25:25 +00:00
Laserlicht
0c836e0797
code review
2024-08-17 12:25:16 +02:00
Laserlicht
f7e01eaf67
sonarcloud
2024-08-16 00:03:45 +02:00
Laserlicht
00692888df
sonar cloud fixes
2024-08-15 23:09:04 +02:00
Laserlicht
ba77107e71
fix some sonar cloud issues
2024-08-15 21:48:35 +02:00
Simeon Manolov
be58f61c35
fix indentation
2024-08-15 10:19:20 +03:00
Laserlicht
4796f46c24
fix defeat icon
2024-08-15 00:53:38 +02:00
Laserlicht
5743f151a1
icon drawing
2024-08-15 00:21:02 +02:00
Simeon Manolov
9b655ac43e
ios fix attempt
2024-08-15 00:27:18 +03:00
Laserlicht
b693ce120a
code review
2024-08-14 22:36:54 +02:00
Laserlicht
a42afa2910
code review
2024-08-14 21:51:08 +02:00
Laserlicht
e1fdac42fd
code review
2024-08-14 21:50:53 +02:00
Laserlicht
3551470919
adjusted texts
2024-08-14 21:15:18 +02:00
Laserlicht
39aaa6fe32
data to clipboard; simplify types
2024-08-14 21:01:37 +02:00
Laserlicht
81b1704e39
Merge branch 'vcmi:develop' into extended_statistic
2024-08-14 20:32:47 +02:00
Laserlicht
df8e491b72
prepare icons
2024-08-14 21:11:57 +02:00
Laserlicht
ec2163b974
add val; stat at end turn; events
2024-08-14 19:24:40 +02:00
Simeon Manolov
6767f90066
move ios/ folder
2024-08-14 19:55:22 +03:00
Simeon Manolov
bc162f514e
fix invalid file ref
2024-08-14 19:41:44 +03:00
Simeon Manolov
f2cddaa21b
Split vcmiclient in two
...
Similar to vcmiserver (app) and vcmiservercommon (lib), now
there is vcmiclient (app) and vcmiclientcommon (lib).
2024-08-14 19:20:01 +03:00
Ivan Savenko
49c5f650f7
Merge pull request #4437 from IvanSavenko/battle_sides
...
Unified handling of battle sides ID's
2024-08-14 18:37:05 +03:00
Ivan Savenko
5c7c4a7810
Merge pull request #4443 from IvanSavenko/fix_sonar
...
Fix miscellaneous issues discovered by Sonar
2024-08-14 17:12:27 +03:00
