Nordsoft91
25952f8223
Merge pull request #3027 from Nordsoft91/turn-timer
...
Add game pause
2023-10-10 23:41:36 +02:00
Ivan Savenko
e247c29269
Merge pull request #3021 from Laserlicht/video
...
video loop fix and missing videos/sounds for battle result
2023-10-10 18:48:19 +03:00
Nordsoft91
b6da60b105
Merge pull request #3023 from Laserlicht/video_audio
...
audio from SMK video file
2023-10-10 00:40:33 +02:00
Laserlicht
19788c6399
suggestion
2023-10-09 22:22:10 +02:00
Laserlicht
7ef9e91741
new approach
2023-10-08 21:19:04 +02:00
Laserlicht
89a39fcfc0
code review
2023-10-08 20:27:56 +02:00
Nordsoft91
43636af2e4
Merge pull request #2959 from Alexander-Wilms/faster-server-connection
...
Sleep for 10 ms instead of 1000 ms while waiting for server connection
2023-10-08 17:21:57 +02:00
Nordsoft91
aed2e360ba
Merge pull request #2997 from Alexander-Wilms/fix-ios-pch
...
Enable ccache for iOS and MSVC builds
2023-10-08 16:10:07 +02:00
nordsoft
d7d435dcb7
Add game pause
2023-10-08 16:03:57 +02:00
Laserlicht
a1f6e49f87
vcmi always uses only 2 channels
2023-10-08 14:09:07 +02:00
Laserlicht
639b6c6577
version
2023-10-08 12:49:59 +02:00
Laserlicht
66ff603456
remove crackle
2023-10-08 12:49:59 +02:00
Laserlicht
39e06ea5e1
fix error message
2023-10-08 12:49:59 +02:00
Laserlicht
3c647334b0
remove other pr
2023-10-08 12:49:59 +02:00
Laserlicht
be2b3afe48
implements sounds
2023-10-08 12:49:59 +02:00
Laserlicht
2bbce0f38b
decoding working
2023-10-08 12:49:59 +02:00
Laserlicht
8de4b88a1b
basically playing
2023-10-08 12:49:59 +02:00
Laserlicht
628de69a63
audio
2023-10-08 12:49:59 +02:00
Laserlicht
63fbaa8380
support raw audio
2023-10-08 12:49:59 +02:00
Nordsoft91
088ce9b948
Merge pull request #3013 from Nordsoft91/turn-timer
2023-10-08 12:11:44 +02:00
Laserlicht
42bf5fdd58
video fix
2023-10-07 14:31:49 +02:00
Alexander Wilms
732c39fcc6
Fix build
2023-10-07 00:08:22 +02:00
Alexander Wilms
c8f1512a3f
Use correct address to decide whether we're connecting to a remote server or a local one
2023-10-06 23:33:51 +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
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
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
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
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
39a92cdde3
Add query for dwellings dialog
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
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