Alexander Wilms
2bee8b5109
Make suggested changes
2023-10-06 19:55:40 +02:00
Alexander Wilms
4bed3c4726
Check CMAKE_GENERATOR, move iOS options to top level
2023-10-06 19:39:32 +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
Alexander Wilms
c5378f560e
Mark ccache as required if ENABLE_CCACHE is ON, set ENABLE_CCACHE to ON by dafault instead of setting it in CMakePresets.json
2023-10-06 12:44:56 +02:00
Alexander Wilms
510fb205e7
Add CMake option for enabling ccache for IOS and MSVC build
2023-10-06 01:06:10 +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
Ivan Savenko
2e3e116bc4
Merge pull request #3008 from IvanSavenko/fix_conan_docs
...
Fix conan docs
2023-10-05 19:41:58 +03:00
Ivan Savenko
0826b542e3
Apply suggestions from code review
...
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2023-10-05 19:09:07 +03:00
SoundSSGood
bcce4c68e5
Artifacts placement fixed
2023-10-05 15:17:02 +03:00
Ivan Savenko
63453d4ad2
Reverted conan docs to older (but more correct) version
2023-10-05 00:38:00 +03:00
Ivan Savenko
b75a67ef7c
Merge pull request #2973 from IvanSavenko/identifier_explicit_constructor
...
Improvements to type safety of Identifier class
2023-10-05 00:33:07 +03:00
Ivan Savenko
84da774005
Merge pull request #2995 from Laserlicht/patch-4
...
[Docs] Update Building_Linux.md
2023-10-05 00:26:48 +03:00
Ivan Savenko
c80a73e5fc
Merge pull request #3007 from Fabrice-TIERCELIN/fix-chinese-translation
...
Fix Chinese translation
2023-10-05 00:02:03 +03:00
Ivan Savenko
f72a106e30
Overwrite Catherine / Kendal portraits in AB+ correctly
2023-10-04 23:23:09 +03:00
Ivan Savenko
179def179f
Merge pull request #2969 from IvanSavenko/tavern_query
...
Add query for Tavern, Dwelling and Market visits
2023-10-04 22:34:45 +03:00
Fabrice Tiercelin
99221c2d56
Fix Chinese translation
2023-10-04 21:04:06 +02:00
Ivan Savenko
56d5c74a61
Merge pull request #2996 from Nordsoft91/fix-2992
...
Capture key event in chat box
2023-10-04 19:59:06 +03:00
Ivan Savenko
d97a7ac5d3
Merge pull request #3000 from Nordsoft91/russian-translation
...
Update russian translation
2023-10-04 19:33:01 +03:00
Ivan Savenko
037efdf5fc
Improvements to type safety of Identifier class
...
- Constructor of Identifier from integer is now explicit
- Lobby hero/town selection now uses Identifiers instead of int's
- Removed serialization workaround for hero portraits
- Added dummy objects for custom heroes portraits for ID resolver to use
- HeroInstance now stores portrait ID only in case of custom portrait
- Fixed loading of campaign heroes portraits on RoE maps
2023-10-04 18:05:23 +03:00
Ivan Savenko
46e4d862a5
Fix AI recruitment
2023-10-04 17:47:12 +03:00
Ivan Savenko
39a92cdde3
Add query for dwellings dialog
2023-10-04 17:47:12 +03:00
Ivan Savenko
3cb489e9bd
Fix University and Altar
2023-10-04 17:47:12 +03:00
Ivan Savenko
898733eed7
Added Query to track visit duration for Taverns and Markets
2023-10-04 17:47:12 +03:00
Ivan Savenko
e322d0a084
Merge pull request #2966 from IvanSavenko/simplify_ui_lock
...
Simplified locking of game UI state
2023-10-04 16:50:23 +03:00
Alexander Wilms
b58cca7770
100 connection attempts is not always enough
2023-10-03 22:06:32 +02:00
Alexander Wilms
a66d8ecb8f
Use ui16 instead of uint for connectionAttemptCount to fix MinGW build
2023-10-03 22:06:32 +02:00
Alexander Wilms
e1401d26c5
hostAddress can be localhost, return from justConnectToServer() is maximum number of attempts is exceeded
2023-10-03 22:06:32 +02:00
Alexander Wilms
39427d6658
Use different delay and maximum number of connection attempts for local and remote servers
2023-10-03 22:06:32 +02:00
Alexander Wilms
9f9930a9dd
CServerHandler::justConnectToServer(): Read settings only once
2023-10-03 22:06:32 +02:00
Alexander Wilms
614d000376
Sleep for 10 ms instead of 1000 ms while waiting for server connection
2023-10-03 22:06:32 +02:00
Andrii Danylchenko
20a944c551
Merge pull request #2884 from vcmi/nkai-air-water-walking
...
NKAI: water and air walking
2023-10-03 21:46:35 +03:00
Nordsoft91
d517ca9ba7
Merge pull request #2990 from Laserlicht/patch-4map_overview_rework
...
Map preview rework
2023-10-02 22:33:35 +02:00
Laserlicht
ec8580b99e
Merge branch 'develop' into patch-4map_overview_rework
2023-10-02 21:03:16 +02:00
nordsoft
7c3329a184
Update translation
2023-10-02 20:46:20 +02:00
Nordsoft91
80be1e9f4c
Merge pull request #2981 from Nordsoft91/rmg-template
...
Select random object template instead of first
2023-10-02 20:42:39 +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
Alexander Wilms
c7523326a0
Make ccache work with MSVC build
2023-10-02 12:36:47 +02:00
Alexander Wilms
65354da5f1
Add CMake preset for iOS build without precompiled headers, which is required for ccache
2023-10-02 05:43:38 +02:00
Alexander Wilms
d14c872164
iOS CI build: Make XCode work with ccache
2023-10-02 05:43:33 +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
nordsoft
10eb19758a
Code review fixes
2023-10-01 18:00:36 +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
Ivan Savenko
b919b3a2d1
Merge pull request #2983 from Alexander-Wilms/faster-ci
...
CI: Install all packages at once on Linux
2023-10-01 17:53:30 +03:00
nordsoft
213d0c3553
Capture events in chat box
2023-10-01 16:40:26 +02:00
