Commit Graph
13186 Commits
Author SHA1 Message Date
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
Ivan Savenko 97097c20ad Merge pull request #2874 from SoundSSGood/exchange-window-update
Exchange window update
2023-09-27 15:50:52 +03:00
Ivan Savenko 71a1ed816a Merge pull request #2892 from Laserlicht/highscore_menu
Highscore Menu & end video
2023-09-27 15:48:47 +03:00
Ivan Savenko efe3393408 Merge pull request #2947 from Laserlicht/enableUiEnhancements_button
enableUiEnhancements button
2023-09-27 15:47:25 +03:00
Ivan Savenko 94dbde05a0 Merge pull request #2868 from IvanSavenko/simultaneous_turns
Simultaneous turns
2023-09-27 15:45:02 +03:00
Ivan Savenko 4d43562bca Merge pull request #2924 from Laserlicht/datetime_android
Datetime android
2023-09-27 15:43:46 +03:00
Ivan Savenko 724eb7902e Merge pull request #2950 from soulsource/feature/make-erm-compile-again
Make ERM compile again.
2023-09-27 15:42:33 +03:00
Ivan Savenko d0046d29f2 Merge pull request #2957 from ProjectMutilation/fix-pvs-issues
Fixed some issues found by pvs
2023-09-27 15:40:37 +03:00
Ivan Savenko 9147fd49ab Merge pull request #2932 from Laserlicht/mainmenu_layer
fix layer problem in mainmenu
2023-09-27 15:37:40 +03:00
Maxim Korotkov ade7a035f5 artifactUtils: reduced cyclomatic complexity in check
Signed-off-by: Maxim Korotkov <korotkov.maxim.s@gmail.com>
2023-09-27 09:05:58 +03:00
Maxim Korotkov 59acf639da client: render: fixed copy-past errror in genFromJson()
Signed-off-by: Maxim Korotkov <korotkov.maxim.s@gmail.com>
2023-09-27 09:05:58 +03:00
Maxim Korotkov 56061d116e vcai: Combined cases with the same actions 2023-09-27 09:05:58 +03:00
Maxim Korotkov f874d27797 AI: removed redundant checks
The pointers "up" and "down" were checked against nullptr
but it's always non-null
Also added curly braces for if statement. It's good practice
for avoiding shooting yourself to the foot

Signed-off-by: Maxim Korotkov <korotkov.maxim.s@gmail.com>
2023-09-27 09:05:58 +03:00
Laserlicht 242e0ffa4a fix playername 2023-09-26 22:06:04 +02:00
Laserlicht 2738dc3190 better approach for redrawing 2023-09-26 21:12:04 +02:00
Laserlicht bb358148d8 Update generalOptionsTab.json 2023-09-26 20:58:24 +02:00
Laserlicht 012f4b91b2 Update generalOptionsTab.json 2023-09-26 20:43:47 +02:00
Nordsoft91 8c6381b497 Merge pull request #2951 from Laserlicht/spell_icon
specific spell icon (artifacts)
2023-09-26 20:13:19 +02:00
Nordsoft91 12eac2d4ba Merge pull request #2941 from Laserlicht/spellbook
Big Spellbook
2023-09-26 20:12:30 +02:00
Nordsoft91 c803b57c33 Merge pull request #2889 from Nordsoft91/mod-compatibility-check
Proper mod compatibility check logic
2023-09-26 19:29:46 +02:00
Ivan Savenko 0864f975aa Merge pull request #2860 from IvanSavenko/modding_docs_update
Update modding documentation
2023-09-26 17:29:59 +03:00
Ivan Savenko 42030ed10f Fix hotseat 2023-09-26 17:28:50 +03:00
Laserlicht ac5f552219 fix 2023-09-26 15:56:39 +02:00
Laserlicht 93e2826e3e new constructor 2023-09-26 15:53:44 +02:00
nordsoft 056cba55a8 Show loading screen immediately on restart 2023-09-26 15:45:46 +02:00