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

413 Commits

Author SHA1 Message Date
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
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
Ivan Savenko
671b61c64e Implement various todo's and review suggestions 2024-03-27 13:10:55 +02:00
Ivan Savenko
4ed961fb96 Partially unified handling of pregame and in-game chats 2024-03-27 13:10:55 +02:00
SoundSSGood
0813fdbf8c market window 2024-03-25 12:44:33 +02: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
af671d109f Made graphical primitive-based UI more configurable 2024-02-18 20:48:45 +02:00
Ivan Savenko
c23953eac5 Remove custom casts 2024-02-14 12:56:37 +02:00
Ivan Savenko
7992144763 Gem class is now Sorceress 2024-01-30 23:34:27 +02:00
Laserlicht
0225590bb5
add info for not implemented replay; reorder button code; fix exit position 2024-01-27 17:36:19 +01: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
b4a1a755a4
Merge pull request #3498 from IvanSavenko/simturns_pathfinder
[1.4.3] Fixes for simultaneous turns
2024-01-15 12:00:54 +02:00
Ivan Savenko
b453b9d6d0 Fix UI lock on ending turn while simturns are active 2024-01-13 23:38:43 +02:00
Laserlicht
2d511ecf1c
console fix 2024-01-13 18:59:59 +01:00
Alexander Wilms
f3277b7953 Define each identifier in a dedicated statement 2024-01-10 00:22:23 +00:00
Ivan Savenko
8037d575ad Fix crash on attempt to access not visible tile 2024-01-04 23:54:06 +02:00
Ivan Savenko
bcbd708fa7 Added more checks to detect illegal access in CList's class 2023-12-24 00:16:29 +02:00
Ivan Savenko
a08546e964 Correctly update hero list on reordering via radial menu 2023-12-23 18:13:55 +02:00
Ivan Savenko
5d7901cd8c Fixed timer countdown sound playback 2023-12-22 22:46:29 +02:00
Ivan Savenko
ebbba0029f Fix positioning and size of turn timers widget with English fonts 2023-12-22 18:40:29 +02:00
Ivan Savenko
d8c69d39d8 Restored sound notifications 2023-12-22 18:40:29 +02:00
Ivan Savenko
fc595c5d84 propagate turn timer state every second to ensure correct UI 2023-12-22 18:40:28 +02:00
Ivan Savenko
f834cb3d99 Display different timers separately when applicable 2023-12-22 18:40:28 +02:00
Ivan Savenko
da9c0feebc Reworked timer widget to show timers for all players 2023-12-22 18:40:28 +02:00
Dydzio
30a9a32549 Do not trigger console via alt->tab 2023-12-19 20:02:45 +01:00
Ivan Savenko
5f4608c9f0 Fixed memory corruption on usage of radial wheel to reorder towns/heroes 2023-12-16 13:46:29 +02:00
Ivan Savenko
653304b004 Implemented accumulating timers, rename creature timer to unit timer 2023-12-07 13:57:16 +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
10e50548e7 Converted Component class to use VariantIdentifier instead of int 2023-11-02 12:00:04 +02:00
Ivan Savenko
b88a8da4e8 Split off some netpack structures into separate files 2023-10-23 13:59:15 +03:00
Ivan Savenko
3880ea58b9 Merge branch 'josch/dos2unix' into develop 2023-10-22 18:39:03 +03:00
Laserlicht
737525756f
fix redraw 2023-10-21 17:28:23 +02:00
Laserlicht
e03f2a9d3a
improvements for non quadratic maps 2023-10-21 16:49:50 +02: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
2fcbf78e4e
unused var 2023-10-17 21:22:27 +02:00
Laserlicht
464c65a595
fix 2023-10-17 21:17:57 +02:00
Laserlicht
e05102192b
heroes and more buttons 2023-10-17 21:13:08 +02:00
Laserlicht
d5b16ac96c
rename 2023-10-16 01:43:50 +02:00
Laserlicht
f3262a47c0
Update client/adventureMap/CList.cpp
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2023-10-16 01:42:01 +02:00
Laserlicht
4528f42cdf
fix segmentation fault; update townlist on adventuremap 2023-10-15 15:53:19 +02:00
Laserlicht
3b853bff08
sort town feature 2023-10-15 14:31:33 +02:00
Laserlicht
f9db3d131f
lastActivated with overload 2023-10-10 23:51:05 +02:00
Laserlicht
53ee843e7e
fixes problem with radial menu 2023-10-10 22:33:22 +02:00
Laserlicht
890c4ac19d
quick army managment click next 2023-10-10 22:11:06 +02:00
nordsoft
9b54b25a6c Show timer only for one player 2023-10-06 18:17:05 +02:00
nordsoft
a09c595cf4 Support simturn timers 2023-10-06 18:17:05 +02:00
Ivan Savenko
b75a67ef7c
Merge pull request #2973 from IvanSavenko/identifier_explicit_constructor
Improvements to type safety of Identifier class
2023-10-05 00:33:07 +03:00
Ivan Savenko
037efdf5fc Improvements to type safety of Identifier class
- Constructor of Identifier from integer is now explicit
- Lobby hero/town selection now uses Identifiers instead of int's
- Removed serialization workaround for hero portraits
- Added dummy objects for custom heroes portraits for ID resolver to use
- HeroInstance now stores portrait ID only in case of custom portrait
- Fixed loading of campaign heroes portraits on RoE maps
2023-10-04 18:05:23 +03:00
Ivan Savenko
898733eed7 Added Query to track visit duration for Taverns and Markets 2023-10-04 17:47:12 +03:00
Ivan Savenko
56074e18a9 Block turn end button after player ends turn 2023-09-26 13:42:20 +03:00
Laserlicht
72e4941982
dimlevel as class variable 2023-09-24 12:08:27 +02:00
Laserlicht
b143c2786f
use dimming to hide screen 2023-09-24 00:58:48 +02:00
Ivan Savenko
a9abd294da
Merge pull request #2876 from IvanSavenko/revisit_object_button_block
Block revisit object shortcut if no visit is possible
2023-09-20 22:09:36 +03:00
Ivan Savenko
42d9ba6c82
Merge pull request #2877 from IvanSavenko/simturn_fixes
Changes for simturns support
2023-09-20 22:09:25 +03:00
Ivan Savenko
d3ced6b703 Block revisit object shortcut if no visit is possible 2023-09-19 19:51:31 +03:00
Ivan Savenko
8c0d78f1d9 Added initiator-player to packs that add/remove/move objects 2023-09-19 19:24:34 +03:00
Laserlicht
a2174dc83f
fix window open while sound playing 2023-09-19 11:20:16 +02:00
Laserlicht
6ae09d8458
newday 2023-09-19 09:52:32 +02:00
Laserlicht
bcf32984ce
always sound at chat message 2023-09-19 01:08:49 +02:00
Ivan Savenko
c8e6a7cd27 Fixed most common cases of movement actions 2023-09-16 20:07:26 +03:00
Laserlicht
19693d251d comments 2023-09-15 15:15:33 +02:00
Laserlicht
6d69326c1a alternative implementation 2023-09-15 15:15:33 +02:00
Laserlicht
8d160101ed alt mode to select instead of changing path 2023-09-15 15:15:33 +02:00
Ivan Savenko
f8541d0ae4 Merge branch 'vcmi/master' into 'vcmi/develop' 2023-09-15 13:59:02 +03:00
Ivan Savenko
a09147a433 Do not block map layer toggles in world view mode 2023-09-12 21:15:14 +03:00
Nordsoft91
0a799ecc46
Merge pull request #2740 from Laserlicht/fix_cursor_issue 2023-09-11 22:20:11 +02:00
Laserlicht
2cb28178ae
code review 2023-09-10 20:52:35 +02:00
Ivan Savenko
63a8cd9642 Fix quest log button block status 2023-09-05 23:31:26 +03:00
Ivan Savenko
47249ee5ed Fix resource bar UI in hotseat 2023-09-05 23:31:20 +03:00