1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Commit Graph

12096 Commits

Author SHA1 Message Date
Ivan Savenko
317183e00d
Merge branch 'develop' into info-box-army-management 2023-07-18 16:05:09 +03:00
Ivan Savenko
e0977693b0
Merge pull request #2336 from IvanSavenko/left_button_map_drag
Left button map drag
2023-07-18 16:03:05 +03:00
Tomasz Zieliński
9b649b0b79 Build fix 2023-07-18 10:55:26 +02:00
Tomasz Zieliński
03b3771f19 Ban Navigation on maps without water 2023-07-18 10:54:36 +02:00
Dydzio
48a72f90f7 Add option for persistent hero info window as in HD mod 2023-07-17 23:25:16 +02:00
SoundSSGood
ff278d5f3a cleanup unused 2023-07-17 22:26:21 +03:00
SoundSSGood
f33dec9337 picked art fixed 2023-07-17 22:24:43 +03:00
Fabrice Tiercelin
10793956e0 Mod list view translations 2023-07-17 20:08:05 +02:00
Tomasz Zieliński
025b0814c8 + Handled banning spells and artifacts
+ Rename allowedSpell => allowedSpells
2023-07-17 17:21:28 +02:00
Ivan Savenko
64a22d8590 Workaround for false double-clicking of elements in hero/town lists 2023-07-17 17:40:28 +03:00
Tomasz Zieliński
fbd1d728ec Water heroes will now be correctly banned on random maps. 2023-07-17 16:23:34 +02:00
Ivan Savenko
6fd3c0f8bc Fixes loading of hota maps with enabled wog mod (identifiers conflict) 2023-07-17 16:38:23 +03:00
Ivan Savenko
36efef0ee3 Do not play new day animation on game start 2023-07-17 16:30:12 +03:00
Ivan Savenko
a7b1fa819f Attempt to handle UI scaling range on retina displays 2023-07-17 16:27:48 +03:00
Ivan Savenko
f4d383a354 Retranslate About tab on language change 2023-07-17 16:27:21 +03:00
Ivan Savenko
22b09f7164 Fixed parsing of some hota campaigns 2023-07-17 16:22:43 +03:00
Ivan Savenko
81d0ac4d6b Removed excessive warnings from console - this is legal case 2023-07-17 16:22:29 +03:00
Ivan Savenko
b94de1b799 Fixed amount of gold given by resource cheat - x1000 instead of x100 2023-07-17 16:15:49 +03:00
Ivan Savenko
f23de91fad
Merge pull request #2334 from Laserlicht/patch-3
Battleintro: Skip with mouse button
2023-07-17 15:40:24 +03:00
Ivan Savenko
be057f0d67
Merge pull request #2337 from heroesiiifan/patch-4
add missing languages in serveral places
2023-07-17 15:40:14 +03:00
SoundSSGood
b1351d8532 two scrolling modes demo 2023-07-16 21:16:12 +03:00
Tomasz Zieliński
bda126a1fd Merge remote-tracking branch 'origin/develop' into ban_stuff_on_water_maps 2023-07-16 18:54:50 +02:00
Dydzio
ee663b1595 Changes from code review 2023-07-16 15:56:42 +02:00
Dydzio
1b676933e5
Fix indent
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2023-07-16 15:46:43 +02:00
Dydzio
5882cbae78 Merge branch 'develop' into unlimited-autosave 2023-07-16 15:19:04 +02:00
Dydzio
fe26ab4501 Add settings entry, immediately refresh info bar on setting toggle 2023-07-16 14:52:43 +02:00
heroesiiifan
cd91f69172
new languages in android 2023-07-16 09:17:16 +00:00
heroesiiifan
b09e50f29a
adding missing lang to mod.json 2023-07-16 09:13:32 +00:00
heroesiiifan
4b4b73d374
added missing lang in settings.json 2023-07-16 09:10:32 +00:00
Ivan Savenko
61750d30c2 Implemented dragging map via left mouse click (off by default) 2023-07-16 12:00:40 +03:00
Dydzio
f8fbafff2f Fix github #2335 - town garrison not updating in info box 2023-07-16 10:18:43 +02:00
Dydzio
dbfcb5a749 Implement interactable town tooltip 2023-07-16 10:17:37 +02:00
Dydzio
013d4cd208 Fix slot deselect when selected shortly after new day animation bypass 2023-07-15 23:15:59 +02:00
Dydzio
ea0ee87299 Interactable hero status - alternative infobox component 2023-07-15 23:14:59 +02:00
Dydzio
484d03334c New garrison interface layout: Reversed two rows + labels below slot 2023-07-15 23:11:21 +02:00
Michael
4e242f98fd
Battleintro: Skip with mouse button 2023-07-15 21:18:04 +02:00
SoundSSGood
9427de6344 initial files 2023-07-15 22:15:32 +03:00
SoundSSGood
3ea6f530ad backpack window initial 2023-07-15 22:15:32 +03:00
Ivan Savenko
a4ba5a9b65
Merge pull request #2327 from IvanSavenko/bugfixing_from_stream
Fix accumulated minor bugs
2023-07-15 21:55:19 +03:00
Ivan Savenko
2673eb8798
Merge pull request #2326 from IvanSavenko/cheat_code_fixes
Improvements for cheat code handling
2023-07-15 21:55:07 +03:00
Dydzio
1711b3848f Remove unused variable 2023-07-15 20:03:07 +02:00
Ivan Savenko
b193f832a5 Fix regression 2023-07-15 21:01:14 +03:00
Ivan Savenko
fcb13771f3 Store cheater state per player 2023-07-15 21:01:14 +03:00
Ivan Savenko
baa865d857 Extracted message-related functionality of CGameHandler to separate file 2023-07-15 21:01:13 +03:00
Ivan Savenko
71d6b8c882
Merge pull request #2321 from IvanSavenko/tavern_fixes
Fixes & improvements to tavern/hero pool handling
2023-07-15 20:46:49 +03:00
Ivan Savenko
463efea7bb Fix hero retreating handling & code cleanup 2023-07-15 19:55:30 +03:00
Ivan Savenko
cb16636fce Implemented preserving hero on retreat on 7th day after end of turn 2023-07-15 19:55:30 +03:00
Ivan Savenko
9a38d8ea97 Implemented tavern slot selection using rules similar to H3 2023-07-15 19:55:30 +03:00
Ivan Savenko
ec7e046617 Fix hero pool persistency between saves 2023-07-15 19:55:30 +03:00
Ivan Savenko
539c508870 Implemented persistent random seed for hero pool 2023-07-15 19:55:30 +03:00