Commit Graph
100 Commits
Author SHA1 Message Date
Ivan Savenko c77d353086 Fix build 2023-06-25 17:42:36 +03:00
Ivan Savenko e0ea994656 Moved some pathfinding options to game settings 2023-06-25 17:42:36 +03:00
Ivan Savenko 6546242c03 Workaround-ish fix for last scenario of Angel Wings (un)equipping 2023-06-25 17:42:36 +03:00
Ivan Savenko 03c3797945 Fixed pathfinding with free ship boarding (Admiral's Hat) 2023-06-25 17:42:36 +03:00
Ivan Savenko 08cfbe79cf Added encapsulation for movement points access 2023-06-25 17:42:36 +03:00
Ivan Savenko edf7756783 Recalculate paths on (un)equipping Angel Wings 2023-06-25 17:42:36 +03:00
Ivan Savenko f66a8a9cf0 Do not allow stopping movement while in air
(client-side check, since proper fix would require major rewrite)
2023-06-25 17:42:36 +03:00
Ivan Savenko 90c68588f9 Implemented fly movement sound 2023-06-25 17:42:36 +03:00
Ivan Savenko f7b27da00e Implemented support for "coast visitable" objects:
- objects marked as coast visitable can be visited from land even when
placed in water
- added isBlockedVisitable and isCoastVisitable method to
CGObjectInstance
- implemented json config for these properties in banks
2023-06-25 17:42:33 +03:00
Ivan Savenko a84ccb37c2 Merge pull request #2250 from IvanSavenko/event_handling_fixes
Slider input event fix
2023-06-25 17:39:55 +03:00
Ivan Savenko b93b8f45db Merge pull request #2240 from krs0/feature/show_max_range_limit_for_ranged_units
Show max range limit for ranged units
2023-06-25 17:39:31 +03:00
Ivan Savenko 1c135456f4 Merge pull request #2243 from IvanSavenko/fix_ship_shipyard
Cleanup & fix shipyard / boat creation code
2023-06-23 15:09:11 +03:00
Ivan Savenko ce3e150d59 Minor formatting 2023-06-23 13:55:52 +03:00
Ivan Savenko 1fb2b60999 Remove no longer relevant check 2023-06-23 13:42:09 +03:00
Ivan Savenko 44261ecc21 Fix boat positioning 2023-06-23 13:42:09 +03:00
Ivan Savenko caccd58eb0 boat offsets for shipyards are counted from visitable position 2023-06-23 13:42:09 +03:00
Ivan Savenko 6a08a96d0c Added createObject call as wrapper around NewObject netpack 2023-06-23 13:42:08 +03:00
Ivan Savenko d8879f1e53 NewObject pack now receives visitable position instead of h3m position 2023-06-23 13:34:51 +03:00
Ivan Savenko 56680e102d Merge pull request #2245 from IvanSavenko/platform_settings
Allow defining default values of settings per platform
2023-06-23 13:32:30 +03:00
Ivan Savenko 69dc95c3c8 Merge pull request #2235 from IvanSavenko/hota_h3m_support
Hota h3m support
2023-06-23 13:32:10 +03:00
Ivan Savenko a4ecec0a10 Fix swapped localizations 2023-06-23 12:19:26 +03:00
Ivan Savenko a505cc464e Fixed slider's behavior, especially for mobile systems 2023-06-22 23:49:38 +03:00
Ivan Savenko 7c5dcfd47b Fix closing dropdown box via clicking outside bounds 2023-06-22 22:34:05 +03:00
Ivan Savenko dfeeeb1f5f Removed no longer used 2023-06-22 22:12:05 +03:00
Ivan Savenko 4e7412faa6 Split mouseDragged event from mouseMoved 2023-06-22 22:11:48 +03:00
Ivan Savenko 0cd19b0a9f Merge pull request #2249 from mikeiit/settings
Updated settings.json
2023-06-22 14:27:26 +03:00
Ivan Savenko ccc85ff4eb Merge pull request #2246 from IvanSavenko/pathfinding_reorganization
Pathfinding code reorganization
2023-06-21 18:22:44 +03:00
Ivan Savenko 849ce1124d Merge pull request #2222 from IvanSavenko/fix_long_touch_gesture
Improvements for long tap (right-click) handling
2023-06-21 17:19:10 +03:00
Ivan Savenko ebc7a82c2e Converted pathfinder enum's to enum class 2023-06-21 15:38:57 +03:00
Ivan Savenko f78470a301 Fix build 2023-06-21 14:55:25 +03:00
Ivan Savenko bd4d2788ed Split pathfinder into multiple smaller files 2023-06-21 13:46:09 +03:00
Ivan Savenko 87fcfa4add Removed excessive pathfinder includes 2023-06-21 12:00:44 +03:00
Ivan Savenko 8f602b2ef6 Allow defining default values of settings per platform 2023-06-21 10:55:30 +03:00
Ivan Savenko 2885694eff Update translation 2023-06-20 20:15:04 +03:00
Ivan Savenko 967dc95867 Rename panning->gesturing for consistency 2023-06-20 19:58:05 +03:00
Ivan Savenko 0be9aff99f Fix battle queue stack highlighting 2023-06-20 19:58:05 +03:00
Ivan Savenko 108688389e Fix accessing potentially non-existing UI element 2023-06-20 19:58:05 +03:00
Ivan Savenko e5df7656a2 Added debug option to test touchscreen input on desktop systems 2023-06-20 19:58:05 +03:00
Ivan Savenko ffdac314e9 Added selection of long touch duration 2023-06-20 19:58:05 +03:00
Ivan Savenko 06437cbde6 Renamed gesture-related methods, remove unused code 2023-06-20 19:58:05 +03:00
Ivan Savenko 563d7dd41f Renamed RCLICK -> SHOW_POPUP 2023-06-20 19:58:05 +03:00
Ivan Savenko 8ad577255f Replaced isMouseButtonPressed with isMouseLeftButtonPressed 2023-06-20 19:58:05 +03:00
Ivan Savenko 82288996a2 Fix cursor visibility on closing popup 2023-06-20 19:58:05 +03:00
Ivan Savenko 85a11c090e Enter popup await mode only if there is an active popup 2023-06-20 19:58:05 +03:00
Ivan Savenko e9788e2904 Cleaned up EventDispatcher code 2023-06-20 19:58:05 +03:00
Ivan Savenko d4aa778547 Replaced clickRight event with showPopupWindow/closePopupWindow 2023-06-20 19:58:05 +03:00
Ivan Savenko 7c62146cd6 Update localization 2023-06-20 19:37:28 +03:00
Ivan Savenko d1917898a9 Update validation schemas 2023-06-20 19:37:27 +03:00
Ivan Savenko 80f67337d8 Do not send mouseMoved to elements that have just unsubscribed 2023-06-20 19:37:27 +03:00
Ivan Savenko f0a154037c Attempt to improve def palette detection 2023-06-20 19:37:27 +03:00
Ivan Savenko c4772ae59d Load new hota quests as empty quests, to avoid unexpected behavior 2023-06-20 19:37:27 +03:00
Ivan Savenko 6564502a0e Implemented mapping of hero portraits 2023-06-20 19:37:27 +03:00
Ivan Savenko 3913b8e98c Heroes placed on water in map will be automatically given boat 2023-06-20 19:37:27 +03:00
Ivan Savenko 738ace99cb Fix animations in editor which use copy-pasted code from client 2023-06-20 19:37:27 +03:00
Ivan Savenko 9b5e81929f Fix build 2023-06-20 19:37:27 +03:00
Ivan Savenko d4728f78ce Support for hota victory conditions 2023-06-20 19:37:27 +03:00
Ivan Savenko a84666edf6 MetaString can be serialized in json 2023-06-20 19:37:27 +03:00
Ivan Savenko d51fe62804 Win/loss condition texts use MetaString 2023-06-20 19:37:27 +03:00
Ivan Savenko 56d69e790b Renamed MetaString methods to more logical names 2023-06-20 19:37:27 +03:00
Ivan Savenko 2636a0dcc3 Moved MetaString to a new file 2023-06-20 19:37:27 +03:00
Ivan Savenko f35b3a0dc3 Replace MetaString operator << with member function 2023-06-20 19:37:27 +03:00
Ivan Savenko c43783db58 Use string ID's instead of raw strings for win/loss conditions 2023-06-20 19:37:27 +03:00
Ivan Savenko 8dde8018d0 Implemented support for fixed monster def's from hota 2023-06-20 19:37:27 +03:00
Ivan Savenko 6f743916db Moved CGCreature to a new file 2023-06-20 19:37:27 +03:00
Ivan Savenko 7c88bb7e4f Detect mirror maps 2023-06-20 19:37:27 +03:00
Ivan Savenko 636b2ea856 Removed no longer used code - moved to hota mod 2023-06-20 19:37:27 +03:00
Ivan Savenko 6ed0fbe579 Fix excessive warning - neutral town with Portal is perfectly legal 2023-06-20 19:37:27 +03:00
Ivan Savenko d742b6b809 Fix mapping of map objects linked to game entities 2023-06-20 19:37:27 +03:00
Ivan Savenko f86133705e Fix loading of allowed artifacts from hota h3m 2023-06-20 19:37:27 +03:00
Ivan Savenko 2e2938303a Merge pull request #2209 from IvanSavenko/map_object_configuration
Support for json configuration of some map objects
2023-06-16 19:32:05 +03:00
Ivan Savenko ece9982ca0 Fix build 2023-06-16 18:11:45 +03:00
Ivan Savenko 5118a642bc Fix duplicated randomResource object 2023-06-16 18:00:19 +03:00
Ivan Savenko 58661fc8ec Moved DwellingInstanceConstructor to a new file 2023-06-16 17:59:50 +03:00
Ivan Savenko 77b58bc66d Cleaned up object constructors to reduce duplicated code 2023-06-16 17:59:50 +03:00
Ivan Savenko 4d947be287 Adventure map shipyard nwo has configurable boat type 2023-06-16 17:59:50 +03:00
Ivan Savenko 487f441f47 Implemented boat selection for town shipyards 2023-06-16 17:59:49 +03:00
Ivan Savenko 6aedb99117 Cleaned up IShipyard interface 2023-06-16 17:59:10 +03:00
Ivan Savenko a94b68e6aa Hill fort upgrade costs are now loaded from json 2023-06-16 17:59:10 +03:00
Ivan Savenko 2e7c382612 Moved creature upgrade logic to CGObjectInstance inheritors 2023-06-16 17:59:10 +03:00
Ivan Savenko fc190b14bb Spell shrines can now be configured in json 2023-06-16 17:59:10 +03:00
Ivan Savenko 5cfbdd2967 Partially split CommonConstructors.cpp into few separate files 2023-06-16 17:59:10 +03:00
Ivan Savenko 0901c8feaf Use boost::multiarray instead of manual memory management in CMap 2023-06-16 17:59:10 +03:00
Ivan Savenko 46e367bdec Merge pull request #2227 from wb180/launcherSettingsFixQt6
Replaced deprecated(removed from qt6) signals
2023-06-14 16:07:04 +03:00
Ivan Savenko 3924f0f081 Merge pull request #2211 from SoundSSGood/art-refactoring-hotfix
Fixing regressions
2023-06-14 16:06:35 +03:00
Ivan Savenko 8614419954 Merge pull request #2208 from IvanSavenko/obstacles_foreground
Implemented foreground/background obstacles
2023-06-14 15:49:08 +03:00
Ivan Savenko caf627a652 Merge pull request #2207 from IvanSavenko/fix_black_color
Fix colors in def palette turning into transparency unconditionally
2023-06-14 15:48:15 +03:00
Ivan Savenko 3d5ea269ca Merge pull request #2156 from krs0/feature/Highlight_For_Ranged_Full_Damage_Limit
Highlight Ranged Full Damage Limit
2023-06-11 23:02:55 +03:00
Ivan Savenko 428fb832c6 Implemented foreground/background obstacles:
- obstacles now have "foreground" field
- if "foreground" field set, obstacle will appear on top of other
objects, such as units
- if "foreground" is not set, obstacle will appear below units
- updated schema and cleared up obstacles config
2023-06-06 15:53:14 +03:00
Ivan Savenko 61a8c53bb6 Fix colors in def palette turning into transparency unconditionally 2023-06-05 23:51:18 +03:00
Ivan Savenko ee8c8dca7b Merge pull request #2185 from IvanSavenko/touch_input_gestures
Touch input gestures
2023-06-05 22:29:08 +03:00
Ivan Savenko 18105aa96d Minor fixes for settings window 2023-06-05 21:19:10 +03:00
Ivan Savenko 4e834db017 Fix relative cursor mode 2023-06-05 19:28:29 +03:00
Ivan Savenko 238a02eb5e It is now possible to cancel attack-via-swiping by moving finger away 2023-06-05 19:20:20 +03:00
Ivan Savenko 6283329aeb Added option to disable edge scrolling 2023-06-05 19:20:20 +03:00
Ivan Savenko ec55ec76b6 Show cursor (including attack direction) when swiping in battle 2023-06-05 19:20:18 +03:00
Ivan Savenko db1045aecd Fix panning limits for minimap 2023-06-05 19:20:08 +03:00
Ivan Savenko 0f2a339ab5 Implemented pinch gesture to scale adventure map 2023-06-05 19:20:08 +03:00
Ivan Savenko a08ff1e6ef Removed no longer used touchscreen option 2023-06-05 19:20:08 +03:00
Ivan Savenko e6e91c64b6 Implemented minimap panning gesture 2023-06-05 19:20:08 +03:00
Ivan Savenko 84934d931a Minor improvements to swipe in battle 2023-06-05 19:20:08 +03:00