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

6607 Commits

Author SHA1 Message Date
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
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
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