games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-10 09:50:17 +02:00
Code Issues Releases Activity
10,473 Commits 19 Branches 61 Tags 107 MiB
44a625aa6b
Commit Graph

3865 Commits

Author SHA1 Message Date
Konstantin
f264c541fb vcmi: skill-agnostic tactics 
Tactics is split to 2 bonuses, and it is now possible to
block tactics without having tactics itself. But tactics
for two sides is not implemented, because it is huge rework
and not high priority for me now, I want to do basic
secondary skill rework first.
 2023-03-16 16:46:41 +03:00
Konstantin
300a8a15ba vcmi: remove estates bonus 
Now it is handled by GENERATE_RESOURCE::GOLD.
 2023-03-16 16:46:41 +03:00
Konstantin
34a26580a7 vcmi: skill-agnostic resistance 
Uses exiting bonus and new PERCENT_TO_TARGET_TYPE value type
 2023-03-16 16:46:41 +03:00
Ivan Savenko
129b5313c5
Merge pull request #1663 from Adriankhl/fix_load_sleeping_heroes 
Fix client data deserialization, such as sleepingHeroes
 2023-03-16 15:05:18 +02:00
Ivan Savenko
865f9f7d2b
Merge pull request #1511 from IvanSavenko/launcher_welcome_page 
Add welcome/setup page to Laucher
 2023-03-16 15:04:49 +02:00
Ivan Savenko
962f7ac4de
Merge pull request #1682 from IvanSavenko/h3m_text_export 
H3M/H3C text export
 2023-03-16 14:50:57 +02:00
Ivan Savenko
77f92e56ac
Merge pull request #1689 from IvanSavenko/map_renderer_fixes 
Map renderer fixes
 2023-03-16 14:48:57 +02:00
Ivan Savenko
dc926aac03
Merge pull request #1690 from rilian-la-te/fixup-infobars 
Fix yellow text rendering.
 2023-03-16 14:47:43 +02:00
Ivan Savenko
2a2af34788
Merge pull request #1650 from SoundSSGood/arts-swap-regression-fix 
Arts swap regression fixed
 2023-03-16 14:47:31 +02:00
Ivan Savenko
a065fb2e6d Fix scrolling area bounds while in world view mode 2023-03-15 14:47:23 +02:00
Konstantin
c497f17dd1 TextControls: fix centering of the yellow text 2023-03-15 14:35:55 +03:00
Konstantin
4ab9cdd75a infobar: fix tiny rendering 2023-03-15 14:35:34 +03:00
Ivan Savenko
d3533150b8 Fix misplaced width/height in UI 2023-03-15 12:17:08 +02:00
Ivan Savenko
87eab92290 Fix crash on killing hero in boat & visual artifacts from whirpool 2023-03-15 00:31:51 +02:00
Ivan Savenko
39f2bef1ab Update town visual on capturing 2023-03-15 00:30:58 +02:00
Ivan Savenko
844bf9b9ab Do not play embark/disembar sound during enemy turn 2023-03-15 00:30:19 +02:00
Ivan Savenko
f988a67fbf Fix movement animation on revealing FoW 2023-03-15 00:29:12 +02:00
Ivan Savenko
d2152d387f Fix processing of VCMI_Tests map 2023-03-14 21:48:39 +02:00
Ivan Savenko
f42a894723 Implemented h3c translations 2023-03-14 19:46:15 +02:00
Ivan Savenko
a4ef9fd0b8 Added h3m strings generation to 'convert txt' command 2023-03-14 17:54:37 +02:00
Ivan Savenko
369e925af8 Loading of translation mods is now skipped on language mismatch 2023-03-14 16:02:16 +02:00
Adriankhl
18be7d5261 Remove redundant client access to server save game files and redundant includes 2023-03-13 12:27:13 +01:00
Ivan Savenko
e1310f88e3
Merge pull request #1675 from rilian-la-te/scholar-infobox 
Fix #1385 and similar
 2023-03-13 12:49:30 +02:00
Adriankhl
113527c80c Fix paths deserialization 2023-03-13 11:04:06 +01:00
Adriankhl
eba4e4dd2c No longer save/load common game state to/from client file 2023-03-13 10:10:44 +01:00
Konstantin
40222e3f77 vcmi: fix week animation 2023-03-13 01:22:19 +03:00
Konstantin
18200d1d98 vcmi: move getEstimatedComponentHeight 2023-03-13 00:24:26 +03:00
Konstantin
b4940ee247 vcmi: allow showing no more than 8 components 
In InfoWindow there is no place for more than 8 components.
Better to have more annoying windows than window which cannot be closed

Slider may be better of course, but I cannot do it for now.
 2023-03-13 00:24:26 +03:00
Adriankhl
f054064322 Load client data (e.g. sleepingHeroes) from local file if possible 2023-03-12 21:54:51 +01:00
Konstantin
4df4a872c0 showInfoDialog: fix waitWhileDialog regression 2023-03-12 15:01:48 +03:00
Konstantin
3d33da0a9e vcmi: request pop all when hero is moved 
This way new pickup will show immidately.
 2023-03-11 21:41:57 +03:00
Konstantin
bf67784840 vcmi: correctly show spells from SpellInt.def 2023-03-11 21:41:57 +03:00
Konstantin
de211e9f13 vcmi: all notifications now shows inside the infobar properly 
No more dangling images or text.
 2023-03-11 21:41:57 +03:00
Konstantin
bc228a938a vcmi: use enum class for EComponentType 
There is really no reason not to use it
 2023-03-11 21:41:57 +03:00
Konstantin
2bd74e5c67 vcmi: use small icons for medium components 
It makes more sense due to current UI implementation. It is better
to have icon smaller than have icons overlap
 2023-03-11 21:41:57 +03:00
Konstantin
1ca89c8492 vcmi: implement splitting by ID in infobar 
This will get a much better result than naive sorting
 2023-03-11 21:41:57 +03:00
Konstantin
8a05f5bed7 vcmi: allow set font size on component 
Now it is possible to set arbitrary font size
for CComponent. So, let's use it
 2023-03-11 21:41:57 +03:00
Konstantin
716dd9a43b vcmi: remove a bunch of duplicated showInfoDialog 
These methods duplicated in almost every map object
Just replace it by one such method
 2023-03-11 21:41:57 +03:00
Konstantin
a6cb7fd192 vcmi: allows to more than 8 components in infobar 2023-03-11 21:41:57 +03:00
Konstantin
a0c644a0e5 vcmi: actually implement AUTO for CInfoWindow 
This is possible to use infobar interactions now.
 2023-03-11 21:41:57 +03:00
Konstantin
75358a68a7 vcmi: name infobar height and width 2023-03-11 21:41:57 +03:00
Konstantin
da8840c499 CComponent: do not always assume 80 for text 2023-03-11 21:41:57 +03:00
Konstantin
7a04c28815 vcmi: remove pickupSounds set 
It is unused now, resource pickups handled similar like necromancy
 2023-03-11 21:41:57 +03:00
Konstantin
4617ce10e5 vcmi: allow showing more than one components in infobar 
Up to 8, AFAIK. So, we can show multi-reward in infobox now.
One issue remain - cannot dynamically choose components size
based on text size.
 2023-03-11 21:41:57 +03:00
Konstantin
2fb2a79ca4 vcmi: fix components other than resources in infobar 
Do not redraw infobar when components shows and
we request to show current adventure hero.
Player already knows which hero he used to pick up
components.
 2023-03-11 21:41:57 +03:00
Konstantin
0dbc7169d8 vcmi: fix creature numbers on infobar 
It was rendered on a border
 2023-03-11 21:41:57 +03:00
Ivan Savenko
20ef84bd55
Merge pull request #1670 from rilian-la-te/ffmpeg-6.0 
vcmi: fix build and run with ffmpeg 6.0
 2023-03-11 00:19:06 +02:00
Konstantin
a72af34d9f vcmi: fix build and run with ffmpeg 6.0 2023-03-11 00:12:05 +03:00
Ivan Savenko
0ea73cae7f
Merge pull request #1662 from rilian-la-te/reduce-lexical-cast 
vcmi: reduce boost::lexical_cast usage
 2023-03-10 12:53:21 +02:00
Ivan Savenko
11dc9228e2
Merge pull request #1635 from SoundSSGood/warmachine-buying-fix 
warmachine buying fix
 2023-03-09 15:52:41 +02:00
Konstantin
5366f9190e vcmi: reduce boost::lexical_cast usage 2023-03-09 16:36:46 +03:00
krs
1f06a62219 Do not show visitable for current hero 2023-03-08 22:43:52 +02:00
Ivan Savenko
010c548dc1
Merge pull request #1651 from Adriankhl/fix_sleep_wake 
Fix sleep/wake button icon update
 2023-03-08 19:42:02 +02:00
SoundSSGood
e24eb6cc12 regression fixed 2023-03-08 17:20:38 +02:00
krs
7e97885e73 Renamed showBlockable to showBlocked 2023-03-08 01:19:26 +02:00
Ivan Savenko
76927cf434 Fix selection of current resolution 2023-03-07 15:35:04 +02:00
Ivan Savenko
d7e914d0eb Fix resolution selection menu texts 2023-03-07 15:27:54 +02:00
Adriankhl
368def1609 Fix sleep/wake button, now the icon is updated properly after left click 2023-03-07 13:51:05 +01:00
Ivan Savenko
db9a296d02 Fix debug renderer 2023-03-07 00:06:58 +02:00
Ivan Savenko
df4fe33c3a Do not switch InfoBar to hero during another player turn 2023-03-07 00:06:58 +02:00
Ivan Savenko
5f396af14c Remove excessive logging 2023-03-07 00:06:58 +02:00
Ivan Savenko
1d03900f16 Fix render priority of heroes 2023-03-07 00:06:58 +02:00
Ivan Savenko
322b8e8840 Fix visibility of garrisoned heroes while picking up resources 2023-03-07 00:06:58 +02:00
Ivan Savenko
b7025125d5 Added map swipe option 2023-03-05 23:53:06 +02:00
Ivan Savenko
2e69a4769d Implemented framerate limit option (not available in UI) 2023-03-05 21:06:52 +02:00
Ivan Savenko
37b2fb7ff3 Fixed map options to support adventure map rewrite 2023-03-05 20:14:23 +02:00
Ivan Savenko
7030fa8fe7 Allow changing queue size instantly on option toggle 2023-03-05 19:55:38 +02:00
Ivan Savenko
5f5ba0a54c Fix town-related options 2023-03-05 19:55:38 +02:00
Ivan Savenko
105d988624 Remove debug code 2023-03-05 19:55:38 +02:00
Ivan Savenko
5fb5513572 Attempt to trace crash caused by iterator invalidation 2023-03-05 19:55:38 +02:00
Ivan Savenko
d34268d7d5 Split "Show available creatures in town" into two buttons 2023-03-05 19:55:38 +02:00
Ivan Savenko
cbe6a80020 Do not block "Load" button in battle 2023-03-05 19:55:38 +02:00
Ivan Savenko
b2e5e55c1e Added labels that indicate current option values 2023-03-05 19:55:37 +02:00
Ivan Savenko
2f556ccf60 Improved General options tab layout presentation 2023-03-05 19:53:27 +02:00
Ivan Savenko
c976176453 Added additional buttons for movement speeds 2023-03-05 19:53:26 +02:00
Ivan Savenko
f09897b2b4 Remove unnecessary redraws 2023-03-05 19:51:42 +02:00
Ivan Savenko
c011a5a9cf Added lines to window to separate UI elements into groups 2023-03-05 19:51:42 +02:00
Ivan Savenko
7ef5163d9d
Merge pull request #1581 from IvanSavenko/map_render_rewrite 
Adventure Map - rendering rewrite
 2023-03-05 19:51:07 +02:00
SoundSSGood
142375c050 warmachine buying fix 2023-03-05 18:06:04 +02:00
Ivan Savenko
59d8989399 Fix initialization of movement speed settings 2023-03-05 18:02:59 +02:00
Ivan Savenko
30911eb593 Lock UI during movement animation 2023-03-05 18:02:59 +02:00
Ivan Savenko
c328aadfed Update hero paths on new day 2023-03-05 18:02:59 +02:00
Ivan Savenko
b61cae5b37 Fixed minor issues discovered during testing 2023-03-05 18:02:59 +02:00
Ivan Savenko
165f6a0944 Implemented terrain transition animation 2023-03-05 18:02:59 +02:00
Ivan Savenko
58aa5c0427 Formatting 2023-03-05 18:02:59 +02:00
Ivan Savenko
b57a07b10f Restored ambient sounds functionality 2023-03-05 18:02:59 +02:00
Ivan Savenko
cdcd5a29dd Updated path to renamed directory 2023-03-05 18:02:59 +02:00
Ivan Savenko
225ae2ed46 Renamed directory 2023-03-05 18:02:59 +02:00
Ivan Savenko
c2d2402365 Object render order should now match H3 2023-03-05 18:02:59 +02:00
Ivan Savenko
b9e55db223 Minor fixes 2023-03-05 18:02:59 +02:00
Ivan Savenko
6196d538e7 Fix terrain tooltip 2023-03-05 18:02:59 +02:00
Ivan Savenko
387a7b421a Refactoring of new code, multiple functionality changes: 
- Implemented separate Map View contexts for different map modes
- Puzzle map now works
- Enemy movement now works as in H3
- Removed no longer used code
- Implemented missing embark/disembark sounds
- Fixed view focusing on embarking/disembarking
- Fixed focusing on movement near edge of terra incognita
- Fixed sea movement sound
 2023-03-05 18:02:58 +02:00
Ivan Savenko
46200b133f Remove default parameter 2023-03-05 17:57:36 +02:00
Ivan Savenko
45e2875342 Completely removed old TerrainRect class 2023-03-05 17:57:36 +02:00
Ivan Savenko
fbb8c18c23 Improved map view selection tracking 2023-03-05 17:57:36 +02:00
Ivan Savenko
b9056ef248 Moved swipe handling to TerrainRect class 2023-03-05 17:57:34 +02:00
Ivan Savenko
f6cf8b23c2 Implemented grayscale filter for map 2023-03-05 17:48:02 +02:00
Ivan Savenko
5905dd6111 Grail digging check is now in library 2023-03-05 17:48:02 +02:00
Ivan Savenko
d21c41e436 Fix caching 2023-03-05 17:48:02 +02:00
Ivan Savenko
6a89245bd4 Working version of image caching 2023-03-05 17:48:02 +02:00