Commit Graph
100 Commits
Author SHA1 Message Date
nordsoft b6b75beb29 Fixes for map editor
1) fix owner serialization for hero placeholder
2) fix roads/rivers layout
3) fix lasso
2023-10-24 23:58:26 +02:00
nordsoft b9a660f6c3 Redesign map editor rendering 2023-10-20 01:25:06 +02:00
nordsoft 966ffe4377 Fix warnings about empty kill target 2023-10-18 00:13:32 +02:00
nordsoft f6d7755c6a Add hero placeholder properties 2023-10-16 22:24:12 +02:00
nordsoft c8452355ce Revert "Merge pull request #2959 from Alexander-Wilms/faster-server-connection"
This reverts commit 43636af2e4, reversing
changes made to aed2e360ba.

# Conflicts:
#	client/CServerHandler.cpp
2023-10-14 22:52:24 +02:00
nordsoft 4ab203eaae Add more object search flexibility 2023-10-14 03:16:17 +02:00
nordsoft 788147a897 Add line and fill brushes 2023-10-14 02:58:13 +02:00
nordsoft 4651893b48 Fix hota quests 2023-10-14 00:15:15 +02:00
nordsoft 5f52e6b35e Revert "Auxiliary commit to revert individual files from 2bf8cdc9f525099348439c700af0466955f01b30"
This reverts commit d9952495391f7ac77dd32dcf33f487e146b3655b.
2023-10-13 23:35:37 +02:00
nordsoft 55900ceb66 Add portraits delegate 2023-10-13 20:15:29 +02:00
nordsoft 2bf8cdc9f5 Hota-related bugs were fixed 2023-10-13 12:52:45 +02:00
nordsoft 051886c98e Add shurtcuts 2023-10-13 11:13:57 +02:00
nordsoft d85c5189ba Add object lock and zoom functinoality 2023-10-13 11:07:17 +02:00
nordsoft 006def7690 ui improvements 2023-10-13 11:07:17 +02:00
nordsoft 9108f7e3e5 Remove assert triggered while flying 2023-10-12 13:40:28 +02:00
nordsoft fadf086e61 Fix review comments 2023-10-12 13:30:01 +02:00
nordsoft fbf5492fd9 Remove unnecessary virtuals 2023-10-12 13:30:01 +02:00
nordsoft 74a90cde5d Fix hero level limiter 2023-10-12 12:52:01 +02:00
nordsoft 3199b7261f Cosmetic fixes for map editor 2023-10-11 23:28:10 +02:00
nordsoft 14b030d2eb Support hota quest gates 2023-10-11 23:15:24 +02:00
nordsoft 7ccd4cdcb2 Refactor quests progress 2023-10-11 21:10:42 +02:00
nordsoft 22c9eecd7d Fix mistake 2023-10-11 08:54:54 +02:00
nordsoft 7b7aaa36b2 fix compiling 2023-10-11 01:44:58 +02:00
nordsoft 2b88e6941c Fix mana limiter 2023-10-11 01:43:24 +02:00
nordsoft 6093f042dd Text container fix 2023-10-11 01:26:07 +02:00
nordsoft 8335fffaea Fix rumors 2023-10-11 00:58:32 +02:00
nordsoft 5b10b457cf Fix code review suggestions 2023-10-11 00:47:19 +02:00
nordsoft 62c4e8a98d Fix compiling 2023-10-10 23:44:29 +02:00
nordsoft 31d71ddd25 Minor fixes in text 2023-10-10 23:44:29 +02:00
nordsoft 5eeda3cd25 Quests mostly work 2023-10-10 23:44:29 +02:00
nordsoft d2d64dbddd Bugfixes 2023-10-10 23:44:29 +02:00
nordsoft bb238f9b72 New quests work 2023-10-10 23:44:29 +02:00
nordsoft 63bdfb8ff6 New quests implemented 2023-10-10 23:44:29 +02:00
nordsoft 3a17eeb330 Fix typos in rewards widget 2023-10-10 23:44:29 +02:00
nordsoft 1460541ee5 New limiter based quests 2023-10-10 23:44:29 +02:00
nordsoft b7568a160c Fixes 2023-10-10 23:44:29 +02:00
nordsoft 6a7b23c007 Additional properties for limiter 2023-10-10 23:44:28 +02:00
nordsoft 937a8d63c7 Check for artifacts copies in limiter 2023-10-10 23:44:28 +02:00
nordsoft 0cf3205e15 Fix quest regressions 2023-10-10 23:44:28 +02:00
nordsoft 335585bd11 Remove unused variable 2023-10-09 19:21:27 +02:00
nordsoft e2b8c2e9f8 PickObject delegate for random dwellings 2023-10-09 01:24:00 +02:00
nordsoft cfa1a6d880 Show coordinates on map 2023-10-08 20:25:59 +02:00
nordsoft fe7c01cd37 Fix 3024 2023-10-08 17:46:47 +02:00
nordsoft d7d435dcb7 Add game pause 2023-10-08 16:03:57 +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
nordsoft 043f54698b Fix translations in map editor / fix crash on game end 2023-10-05 23:34:29 +02:00
nordsoft 766f9cf19f Mistake fix 2023-10-05 22:55:24 +02:00
nordsoft 189f790b44 Translations bugfixes 2023-10-05 22:54:28 +02:00
nordsoft 7c3329a184 Update translation 2023-10-02 20:46:20 +02:00
nordsoft 10eb19758a Code review fixes 2023-10-01 18:00:36 +02:00
nordsoft 213d0c3553 Capture events in chat box 2023-10-01 16:40:26 +02:00
nordsoft 65e63bdf69 Fix text duplicating 2023-10-01 14:04:46 +02:00
nordsoft f6093a84f0 Add newline symbol 2023-10-01 14:00:08 +02:00
nordsoft 7d56b704a2 Fix events/rumors identifiers 2023-10-01 13:38:16 +02:00
nordsoft 9c5725da66 Convertion finished 2023-10-01 13:32:35 +02:00
nordsoft 4e5580f3d9 Fix typo 2023-10-01 02:39:03 +02:00
nordsoft e9855de101 Layout fixes 2023-10-01 02:35:02 +02:00
nordsoft 3ea7988883 Treasure placement uses random templates now 2023-09-30 23:06:38 +02:00
nordsoft cb02e221f3 Couple fixes 2023-09-30 04:33:41 +02:00
nordsoft 3018178956 Remember folder for images as well 2023-09-30 03:44:13 +02:00
nordsoft 53dadc6dc3 Add map converter 2023-09-30 03:42:29 +02:00
nordsoft 1502ea2250 Fix pandora mana problem 2023-09-30 01:33:12 +02:00
nordsoft ce62ab3e66 Select random object template instead of first 2023-09-30 01:19:18 +02:00
nordsoft f3fa0f8652 Allow to reconnect to proxy server 2023-09-29 19:49:18 +02:00
nordsoft 9631176e58 Fix tests 2023-09-29 00:28:09 +02:00
nordsoft 70796d232b Full support of maps translations 2023-09-29 00:24:45 +02:00
nordsoft ae073ee35d Remove unused identifiers 2023-09-28 23:15:36 +02:00
nordsoft 38d12bbe8c Final changes for map editor translations 2023-09-28 22:48:52 +02:00
nordsoft ab85e724eb Read-only UI logic for translations 2023-09-28 16:20:21 +02:00
nordsoft db93b8eaa1 UI draft for map translations 2023-09-28 15:29:43 +02:00
nordsoft dbf3cad796 Register all text IDs in map editor 2023-09-28 14:49:47 +02:00
nordsoft 98fde9ab1d Add string IDs in map editor 2023-09-28 14:38:31 +02:00
nordsoft 60df49236f Inspector widgets set string ID 2023-09-28 14:03:58 +02:00
nordsoft 232b3e8cf6 Compile map editor 2023-09-28 13:28:37 +02:00
nordsoft 56eefab255 Fix headers 2023-09-28 13:28:24 +02:00
nordsoft 9df85192c9 Revert "Disable map editor"
This reverts commit de1bb1be19.
2023-09-28 13:28:15 +02:00
nordsoft 1dbecc2e18 Revert "Add header"
This reverts commit d661600858.
2023-09-28 13:28:04 +02:00
nordsoft d661600858 Add header 2023-09-28 13:14:23 +02:00
nordsoft a710c88b07 Proper map translations loading 2023-09-28 13:09:01 +02:00
nordsoft 67e1200448 Remove forward declaration 2023-09-28 12:46:28 +02:00
nordsoft de1bb1be19 Disable map editor 2023-09-28 04:33:33 +02:00
nordsoft ba1dbbbb1d New version for map format 2023-09-28 04:23:14 +02:00
nordsoft 65f696b018 Cosmetic changes for json map reader 2023-09-28 03:02:46 +02:00
nordsoft 9098126684 Separate map text identifiers from global 2023-09-28 02:52:49 +02:00
nordsoft 40af83a55c Fix quest 2023-09-28 02:51:58 +02:00
nordsoft 3c2549d905 Fix town name 2023-09-28 02:51:44 +02:00
nordsoft 6da605ff83 Campaign meta strings 2023-09-28 00:10:28 +02:00
nordsoft 5b97c323d3 Rename hero strings to text id 2023-09-28 00:04:05 +02:00
nordsoft 486091a915 Heroes switched to text id 2023-09-28 00:00:32 +02:00
nordsoft 0c94a4d891 Town name switched to id 2023-09-27 23:57:05 +02:00
nordsoft 41da252e67 Seerhut meta strings 2023-09-27 23:49:27 +02:00
nordsoft 00c8c2eb82 Event message meta string 2023-09-27 23:28:17 +02:00
nordsoft f9f79255c5 Creature message meta string 2023-09-27 23:25:19 +02:00
nordsoft 0ac893b80f Rumors meta string 2023-09-27 23:22:45 +02:00
nordsoft ab373f08ab Use meta string for messages 2023-09-27 23:11:11 +02:00
nordsoft 03c099d4fd First steps 2023-09-27 22:53:13 +02:00
nordsoft 056cba55a8 Show loading screen immediately on restart 2023-09-26 15:45:46 +02:00
nordsoft 2a3e371caf Remove any modification of enabled mods during game loading 2023-09-24 23:34:46 +02:00
nordsoft c73c9d773c Fix issue with impossible room ready status 2023-09-24 03:15:10 +02:00