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

106 Commits

Author SHA1 Message Date
Ivan Savenko
e93a060500 Merge branch 'vcmi/beta' into 'vcmi/develop' 2024-09-23 14:25:53 +00:00
Dydzio
c6edd615ac Block possibility to move hero if shift-clicking on path end 2024-09-17 21:49:21 +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
748a3a1b64 Fixed minimap generation when upscaled mode is used 2024-08-17 15:25:26 +00:00
Ivan Savenko
79c55bc898
Merge pull request #4425 from IvanSavenko/ui_cleanup
Remove old code from UI system
2024-08-12 17:16:03 +03:00
Ivan Savenko
9fba3d97f1 Renamed & unified OBJECT_CONSTRUCTION macro set 2024-08-09 15:30:04 +00:00
Laserlicht
0e28791075 scroll only if in focus 2024-08-07 20:47:29 +02:00
Ivan Savenko
b7391f49f6 Merge branch 'vcmi/master' into 'vcmi/develop' 2024-08-05 10:36:10 +00:00
Ivan Savenko
dde5cea601 Fix activation of world view on end turn in multiplayer 2024-08-04 13:19:12 +00:00
Ivan Savenko
1aa391fdf8 Split CGeneralTextHandler file into 1 file per class form
All text processing code is now located in lib/texts.
No changes other than code being moved around and adjustment of includes

Moved without changes:
Languages.h           -> texts/Languages.h
MetaString.*          -> texts/MetaString.*
TextOperations.*      -> texts/TextOperations.*

Split into parts:
CGeneralTextHandler.* -> texts/CGeneralTextHandler.*
                      -> texts/CLegacyConfigParser.*
                      -> texts/TextLocalizationContainer.*
                      -> texts/TextIdentifier.h
2024-07-20 12:55:17 +00:00
Ivan Savenko
0d6ec0d224 Reviewed usage of EBlitMode, now specified clearly in all cases 2024-07-19 10:08:50 +00:00
Ivan Savenko
920a39844b Unified naming of method to recolor UI element to current player scheme 2024-07-19 10:08:50 +00:00
Ivan Savenko
7328c9ffd6 Fix path and music not updating on new turn 2024-07-16 13:08:15 +00:00
Ivan Savenko
575d15c425 Fix centering on selected map object on loading save 2024-07-08 20:52:37 +00:00
Ivan Savenko
2584432b92 Fix crash on clicking on map when player is not making turn in MP 2024-07-04 08:46:39 +00:00
Ivan Savenko
fc1a20239e Swapped functions of Ctrl and Shift on adventure map 2024-06-11 17:14:06 +00:00
Ivan Savenko
56ee3713fe Pressing shift will now add tile coordinates to adventure map hover text 2024-06-04 14:11:53 +00:00
Ivan Savenko
16f963bed5 Fix zooming with keyboard shortcuts 2024-05-19 09:58:55 +00:00
Laserlicht
79206ce65b fix hotseat hide 2024-05-14 22:25:10 +02:00
Ivan Savenko
7267e02b8d Better handling of Ctrl / Cmd modifier keys on Apple systems:
- Test only for Cmd modifier key when processing mouse clicks
- Test both Ctrl and Cmd modifier key when processing keyboard input
- This logic is now used for all Apple systems - macOS and iOS
2024-05-12 17:09:31 +00:00
Ivan Savenko
49691ef743 Unblock interface during turn of another human player 2024-04-30 17:51:31 +03:00
Laserlicht
68e63630d8
Code review
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-04-20 00:23:25 +02:00
Laserlicht
cf4384071d
use CIntObject instead of IShowActivatable 2024-04-19 23:11:24 +02:00
Laserlicht
19b75c3d88
possibility to disable dimming of small windows 2024-04-19 22:50:05 +02:00
Ivan Savenko
320469d773 Cleanup 2024-04-10 20:04:08 +03:00
Ivan Savenko
8353bca34f Small refactoring of adventure map spell casting:
- Removed duplicated checks for DD possibility
- Moved most of spell-specific code from AdventureMapInterface to library
code
- AdventureSpellMechanics class now provides methods to check whether
spellcast is possible, similarly to battle spells
- If it is not possible to cast adventure map spell (e.g. no mana or no
move points) game will show infowindow immediately on clicking spellbook
instead of on cast attempt
- If hero does not have movement points for a DD, game will show correct
error message
- Added game settings 'dimensionDoorFailureSpendsPoints' due to
discovered H3 logic
2024-04-10 20:04:08 +03:00
Dydzio
3f94d316cb Fix cursor & add way to access danger info for HotA-like DD cursor 2024-04-01 20:18:35 +02:00
Dydzio
3bb66de551 Serverside validation, setting for terrain compatibility before cast etc 2024-04-01 18:12:38 +02:00
Dydzio
e69c096f94 Move dimension door FoW limit check to lib 2024-04-01 15:13:18 +02:00
Dydzio
25f9e6a3e9 Add setting to allow previous VCMI mechanics of dimension door 2024-03-27 23:39:08 +01:00
Dydzio
048fb1867d Merge remote-tracking branch 'origin/develop' into dimension-door-changes 2024-03-27 23:03:33 +01:00
Dydzio
38659abcb8 Fix wrong cursor assignment for uncovered tiles beyond DD range 2024-03-27 22:48:53 +01:00
Dydzio
4f0a286167 Fix checks for tile visibility in tile click/hover handlers 2024-03-27 22:06:31 +01:00
Dydzio
807035c321 temporarily add TODO's 2024-03-25 09:21:42 +01:00
Dydzio
982e67cea8 Working version of SoD dimension door spell 2024-03-24 23:58:04 +01:00
Ivan Savenko
c23953eac5 Remove custom casts 2024-02-14 12:56:37 +02:00
Ivan Savenko
bd5682ecc3 Merge remote-tracking branch 'vcmi/master' into develop 2024-01-19 13:49:54 +02:00
Laserlicht
a1f4fcb78a
hide adventuremap 2024-01-18 00:47:18 +01:00
Alexander Wilms
cca08e29da Remove duplicate semicolons 2024-01-16 19:02:39 +00:00
Ivan Savenko
b9f4c557fa Fix cursor on visiting sea objects from land 2024-01-16 00:12:51 +02:00
Ivan Savenko
b453b9d6d0 Fix UI lock on ending turn while simturns are active 2024-01-13 23:38:43 +02:00
Ivan Savenko
a08546e964 Correctly update hero list on reordering via radial menu 2023-12-23 18:13:55 +02:00
Ivan Savenko
da9c0feebc Reworked timer widget to show timers for all players 2023-12-22 18:40:28 +02:00
Ivan Savenko
3b3c4860b2 Avoid creation of new threads without mutex protection 2023-12-03 15:58:03 +02:00
Andrii Danylchenko
26b6d1cf74 NKAI: fix capturing shipyards 2023-12-02 14:03:54 +02:00
Ivan Savenko
3880ea58b9 Merge branch 'josch/dos2unix' into develop 2023-10-22 18:39:03 +03:00
Johannes Schauer Marin Rodrigues
a1a5bc28c2
convert line endings from CRLF (Windows) to LF (Linux/Unix)
Mixed line endings cause problems when exporting patches with
git-format-patch and then trying to "git am" a patch with mixed and
non-matching line endings. In such a situation git will fail to apply
the patch.

This commit runs the dos2unix tools on the remaining files with CRLF
(\r\n) line endings to convert them to line-feeds (\n) only.

Files that are Windows specific like *.vcxproj and *.props files were
not converted.

Closes: #3073
2023-10-19 16:23:21 +02:00
Laserlicht
e05102192b
heroes and more buttons 2023-10-17 21:13:08 +02:00
Laserlicht
4528f42cdf
fix segmentation fault; update townlist on adventuremap 2023-10-15 15:53:19 +02:00
Laserlicht
53ee843e7e
fixes problem with radial menu 2023-10-10 22:33:22 +02:00