1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Commit Graph

5148 Commits

Author SHA1 Message Date
Alexander Wilms
614d000376 Sleep for 10 ms instead of 1000 ms while waiting for server connection 2023-10-03 22:06:32 +02:00
Laserlicht
ec8580b99e Merge branch 'develop' into patch-4map_overview_rework 2023-10-02 21:03:16 +02:00
Nordsoft91
4620d2c96d Merge pull request #2980 from Nordsoft91/proxy-reconnect
Allow to reconnect to proxy server
2023-10-02 20:42:11 +02:00
Nordsoft91
c57d5545c2 Merge pull request #2971 from Nordsoft91/translations
Multi-language support for network game and for VMAPs
2023-10-02 20:41:42 +02:00
Laserlicht
12ca3ea0ec pos from texture 2023-10-01 19:44:04 +02:00
Alexander Wilms
46d785c371 Fix iOS build with ENABLE_PCH=OFF
https://github.com/vcmi/vcmi/issues/2991#issuecomment-1742066891

Fixes #2991
2023-10-01 18:16:41 +02:00
Laserlicht
cbd014ac88 code review 2023-10-01 17:35:56 +02:00
Ivan Savenko
b21a361b99 Merge pull request #2814 from SoundSSGood/arts-counter-impovements
Artifacts counter impovements
2023-10-01 17:53:51 +03:00
nordsoft
213d0c3553 Capture events in chat box 2023-10-01 16:40:26 +02:00
Nordsoft91
d695d87b99 Merge pull request #2964 from kambala-decapitator/fix-docs
improve layout of developer docs
2023-10-01 14:08:38 +02:00
Nordsoft91
041ffceb07 Merge pull request #2952 from Alexander-Wilms/develop
Enable VSync to prevent screen tearing while scrolling across map
2023-10-01 14:08:00 +02:00
Laserlicht
23b8a321f6 file ending 2023-10-01 00:46:29 +02:00
Laserlicht
648a37310f description 2023-10-01 00:35:11 +02:00
Laserlicht
65c21064b5 added var 2023-10-01 00:18:25 +02:00
Laserlicht
58dfc55ca3 only calc minimaps once 2023-09-30 23:50:27 +02:00
Laserlicht
61aae7bccc code review 2023-09-30 22:49:22 +02:00
Laserlicht
73a05d82e1 fix 2023-09-30 20:18:12 +02:00
Laserlicht
8b835c9253 load game support 2023-09-30 20:03:33 +02:00
Laserlicht
c6adcc40f5 add date; cleanup 2023-09-30 17:56:51 +02:00
Laserlicht
79e66c38df layout 2023-09-30 17:14:22 +02:00
Laserlicht
718bafc8af map overview rework 2023-09-30 15:05:12 +02:00
nordsoft
f3fa0f8652 Allow to reconnect to proxy server 2023-09-29 19:49:18 +02:00
Laserlicht
293214bb61 height fix 2023-09-29 00:08:25 +02:00
Ivan Savenko
9ba1aa652d Merge pull request #2967 from IvanSavenko/bugfixing
Miscellaneous bugfixing
2023-09-28 12:11:51 +03: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
0ac893b80f Rumors meta string 2023-09-27 23:22:45 +02:00
nordsoft
03c099d4fd First steps 2023-09-27 22:53:13 +02: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
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
764fbebb35 make script executable 2023-09-27 15:12:50 +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
Alexander Wilms
0d11c5197d Remove superfluous vsyncEnabled attribute 2023-09-26 23:48:53 +02:00
Alexander Wilms
ecc7648ef8 Use display index from settings 2023-09-26 23:05:48 +02:00
Alexander Wilms
e2eeec96a9 Fix stuttering animations when using high frame rate limit or vsync 2023-09-26 22:53:45 +02: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
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