games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity
13,359 Commits 19 Branches 62 Tags 111 MiB
8335fffaea
Commit Graph

13359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ivan Savenko
9ba1aa652d
Merge pull request #2967 from IvanSavenko/bugfixing 
Miscellaneous bugfixing
 2023-09-28 12:11:51 +03: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
47a17cc4a7
Merge pull request #2965 from IvanSavenko/movement_fix 
Fix freeze on moving through teleporters without set path
 2023-09-27 23:08:27 +03:00
Ivan Savenko
9b482a2b1e Fix boat creation for heroes recruited on water 2023-09-27 21:25:27 +03:00
Ivan Savenko
16424d2fc0 Fixed boat boarding 2023-09-27 21:25:04 +03:00
Ivan Savenko
f4c33f49ee Removed excessive warning 2023-09-27 21:24:37 +03:00
Ivan Savenko
92fdaa20b1 Fix crash on loading Seer Hut with kill monster mission 2023-09-27 21:24:25 +03:00
Ivan Savenko
71ad9d6707 Fix crash on starting map as non-red player 2023-09-27 21:23:54 +03:00
Ivan Savenko
03a939fd52 Remove redundant thread name - this method is not thread entry point 2023-09-27 19:13:26 +03:00
Ivan Savenko
195320dcf2 Removed remaining references to 'pim' name 2023-09-27 18:50:01 +03:00
Ivan Savenko
0dcfd6e65c Removed optional locking in waitWhileDialog method 2023-09-27 18:44:08 +03:00
Ivan Savenko
d6b9fa8fbd Replaced CPlayerInterface::pim with CGuiHandler::interfaceLock 
- Removed CPlayerInterface::pim since this lock does not actually
protects LOCPLINT but rather entire game UI state
- added more logical CGuiHandler::interfaceLock
- interface lock is now non-recursive and is locked only once by initial
caller that want to access GUI
 2023-09-27 18:33:52 +03:00
Ivan Savenko
c330998518 Fix freeze on moving through teleporters without set path 2023-09-27 17:17:06 +03:00
Alexander Wilms
f52562eeb7 Fix freezing of hero and long enemy turns without sleeping in FramerateManager::framerateDelay() 2023-09-27 16:09:52 +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
Andrey Filipenkov
0db567da37 improve layout of some dev docs 2023-09-27 15:25:41 +03:00
Andrey Filipenkov
764fbebb35 make script executable 2023-09-27 15:12:50 +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