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

389 Commits

Author SHA1 Message Date
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
87b5f955d1 Fix some shortcuts not active during enemy turn in multiplayer 2024-07-29 17:13:31 +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
8d4f8dcf9c Add unassigned by default hotkeys to show visitable or blocked tiles 2024-07-19 19:38:40 +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
0e407540ec Fixed player-coloring on adventure map 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
a1fb3b8b01 Reduce direct access to CAnimation, removed various caching schemes 2024-07-19 10:08:50 +00:00
Ivan Savenko
2020d96070
Merge pull request #4071 from IvanSavenko/fix_rng_syncronization
[1.6] Fix potential desync if client uses different stdlib with different random number generators
2024-07-19 13:08:09 +03:00
Ivan Savenko
662254155a Merge branch 'vcmi/master' into 'vcmi/develop' 2024-07-17 13:57:36 +00:00
Ivan Savenko
63bcf7d83c Replaced most of usages of CRandomGenerator with vstd::RNG in library 2024-07-16 13:13:07 +00:00
Ivan Savenko
7328c9ffd6 Fix path and music not updating on new turn 2024-07-16 13:08:15 +00:00
Ivan Savenko
6b8f94e6e7 Merge remote-tracking branch 'vcmi/master' into develop 2024-07-11 17:43:44 +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
Alexander Wilms
02e429e973 Fix typos using https://github.com/crate-ci/typos
Changes were reviewed manually
2024-06-24 03:47:19 +02:00
Ivan Savenko
3bea383b59 Merge branch 'vcmi/beta' into 'vcmi/develop' 2024-06-21 12:58:36 +00:00
Ivan Savenko
b4c6906471 Merge branch 'vcmi/beta' into 'vcmi/develop' 2024-06-11 19:22:23 +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
b8beb4fb13 Fixes for various minor issues detected by Sonar Cloud 2024-06-01 11:48:30 +00:00
Ivan Savenko
df83fa33a1 Merge branch 'vcmi/master' into 'vcmi/develop' 2024-05-31 09:34:21 +00:00
Ivan Savenko
16f963bed5 Fix zooming with keyboard shortcuts 2024-05-19 09:58:55 +00:00
Ivan Savenko
6ba36cf6c0 Add separate shortcuts for adventure map and settings window 2024-05-19 09:12:36 +00:00
Ivan Savenko
0db8266495 Implemented some of the requested shortcuts 2024-05-19 09:12:36 +00:00
Ivan Savenko
88fbb7ee71 Most of buttons created in cpp now have assigned shortcut 2024-05-19 09:12:36 +00:00
Ivan Savenko
947d07faa4 Add separate shortcuts for saving and loading of artifact costumes 2024-05-18 16:27:42 +00:00
Ivan Savenko
d27b854cb1 Reorganized music, video and sound players:
- All XXXplayers are now in client/media directory
- Reogranized code on one class per file basis
- Extracted interfaces from handlers. Handlers now implement
corresponding interface.
- CCS now only stores pointer to an interface
2024-05-15 17:05:12 +00:00
Ivan Savenko
bbdd2ffb37 Force-show on-screen keyboard when clicking on active status bar 2024-05-15 12:45:45 +00:00
Laserlicht
79206ce65b fix hotseat hide 2024-05-14 22:25:10 +02:00
Ivan Savenko
da9d82b697
Merge pull request #3973 from vcmi/master
Merge master -> beta
2024-05-14 16:59:10 +03:00
Ivan Savenko
4787b9eded Block movement if first node in path needs more move points that we have 2024-05-13 17:25:20 +00: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
dd9e002031 Add hotkey to track human player hero in MP. Fixed broken 'toggle grid'
hotkey
2024-04-30 19:10:10 +03:00
Ivan Savenko
49691ef743 Unblock interface during turn of another human player 2024-04-30 17:51:31 +03:00
Ivan Savenko
1dc962804e Fixed possible crash on having selectable reward with no visual image 2024-04-25 14:04:45 +03:00
Ivan Savenko
21dff9413e
Merge pull request #3786 from IvanSavenko/instant_movement
Instant movement
2024-04-22 11:08:00 +03:00
Ivan Savenko
d5a2ad1be8 Allow sending requests to move across multiple tiles at once 2024-04-20 12:28:50 +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
Ivan Savenko
5b43720dda
Merge pull request #3686 from dydzio0614/dimension-door-changes
Dimension door changes
2024-04-10 11:47:36 +03:00
Ivan Savenko
f73243eb1c
Merge pull request #3669 from SoundSSGood/market-window-unified
Market window and widgets
2024-04-09 12:48:25 +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
fe42fab2d6 Merge remote-tracking branch 'origin/develop' into dimension-door-changes 2024-03-28 18:26:21 +01:00