Nordsoft91
d4f97aadf0
Merge branch 'develop' into incomatibility-response
2022-09-25 13:26:07 +04:00
Andrey Filipenkov
9f46bf5bff
Apply suggestions from code review
...
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2022-09-24 15:55:26 +03:00
Andrey Filipenkov
b8eef4ce35
support building against iOS SDK < 13.0
2022-09-24 15:55:25 +03:00
Andrey Filipenkov
d2ded404bb
use system background color for the keyboard textfield
...
fix kambala-decapitator/vcmi#45
2022-09-24 15:55:25 +03:00
Andrey Filipenkov
605d5b6481
add dedicated macro when building as single process
...
fix kambala-decapitator/vcmi#40
2022-09-24 15:55:25 +03:00
Andrey Filipenkov
f56acf8a80
fix crash on exiting Custom Campaign
...
fix kambala-decapitator/vcmi#46
2022-09-24 15:55:25 +03:00
Andrey Filipenkov
ef2e45a977
stop text input on connection start
2022-09-24 15:55:25 +03:00
Andrey Filipenkov
3ab21d8491
show loading indicator when starting local server
...
single player or hosting a multiplayer game
2022-09-24 15:55:25 +03:00
Andrey Filipenkov
031ba967d3
fix indentation
2022-09-24 15:55:24 +03:00
Andrey Filipenkov
e1c9903a45
extract iOS helpers into a shared lib
2022-09-24 15:55:24 +03:00
Andrey Filipenkov
84111d99ca
add VCMI logo to splash screen
...
fix kambala-decapitator/vcmi#42
2022-09-24 15:55:24 +03:00
Andrey Filipenkov
7b411a5fc4
fix building vcmiERM for iOS
2022-09-24 15:55:24 +03:00
Andrey Filipenkov
f115a49926
update app icon
...
fix kambala-decapitator/vcmi#41
2022-09-24 15:55:24 +03:00
Andrey Filipenkov
5b50d69db1
use Android's letterboxing code and code style cleanup
2022-09-24 15:55:24 +03:00
Andrey Filipenkov
902de3af7c
CMake cleanup
2022-09-24 15:55:24 +03:00
Andrey Filipenkov
7631e7ef06
move linking to system frameworks to appropriate Find* scripts
2022-09-24 15:55:23 +03:00
Andrey Filipenkov
8dcd3146e7
generate zip with ipa structure using cpack
...
fix kambala-decapitator/vcmi#6
2022-09-24 15:55:23 +03:00
Andrey Filipenkov
1bb6a20b76
get rid of the custom toolchain
2022-09-24 15:55:23 +03:00
Andrey Filipenkov
7d8f09c6d4
add overriding launch type via environment variable VCMI_LAUNCH_TYPE
2022-09-24 15:55:23 +03:00
Andrey Filipenkov
5f24307ac8
fix observing SDL window's view creation on iOS 15
...
also improves observers handling
fix kambala-decapitator/vcmi#38
2022-09-24 15:55:23 +03:00
Andrey Filipenkov
fab3216df0
add setting to control app launch type: launcher or game
...
- removes custom AppDelegate
- now starting launcher using qt_main_wrapper
- when starting SDL from launcher, SDLUIKitDelegate is created and assigned as app delegate
fix kambala-decapitator/vcmi#33
2022-09-24 15:55:23 +03:00
Andrey Filipenkov
89f14ea586
improve setting window resolution
...
fix kambala-decapitator/vcmi#3
2022-09-24 15:55:23 +03:00
Andrey Filipenkov
1c17ad2585
remove locking light mode
2022-09-24 15:55:23 +03:00
Andrey Filipenkov
d113155634
use best scale quality
2022-09-24 15:55:23 +03:00
Andrey Filipenkov
74ba228961
ignore window events: no need to refresh screen
2022-09-24 15:55:22 +03:00
Andrey Filipenkov
1e01780d17
start app with launcher, start SDL from launcher
...
kambala-decapitator/vcmi#33
2022-09-24 15:55:22 +03:00
Andrey Filipenkov
ba9ace46ad
fix compiling storyboard without the need to edit generated xcodeproj manually
2022-09-24 15:55:22 +03:00
Andrey Filipenkov
352358b493
move launch storyboard to iOS subdirectory
2022-09-24 15:55:22 +03:00
Andrey Filipenkov
f43d333721
add UIApplicationSupportsIndirectInputEvents to Info.plist
2022-09-24 15:55:22 +03:00
Andrey Filipenkov
bb00ec8ce2
remove entitlements and shared container usage
...
they're no longer required since we have a single app now
2022-09-24 15:55:22 +03:00
Andrey Filipenkov
5e838008df
merge launcher and client
...
launcher is a static lib now
2022-09-24 15:55:22 +03:00
Andrey Filipenkov
cd4b68c034
fix repeated launches of single player
...
now server actually terminates
2022-09-24 15:55:22 +03:00
Andrey Filipenkov
b7bc8495d8
remove copy-paste
2022-09-24 15:55:22 +03:00
Andrey Filipenkov
342a859a3f
fix typo
2022-09-24 15:55:21 +03:00
Andrey Filipenkov
7f3baf6831
require fullscreen and only landscape on iPad
2022-09-24 15:55:21 +03:00
Andrey Filipenkov
24a5dd797c
fix starting local server
2022-09-24 15:55:21 +03:00
Andrey Filipenkov
de05479532
Revert "attempt to run server in a separate app"
...
This reverts commit 99fe55b295ad95033626c15011cfe49779269156.
2022-09-24 15:55:21 +03:00
Andrey Filipenkov
c6e51852d0
add ability to build VCMI as single process
...
"Client process -> shared VCMI lib <- Server process" is turned into "shared Client-VCMI lib -> process <- static Server-VCMI lib"
- adds lib_client and lib_server targets that define distinct namespaces
- lib_client is a dynamic library which is shared with AI libs, lib_server is static
2022-09-24 15:55:21 +03:00
Andrey Filipenkov
ff635edc0b
wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined
...
preparation for having client and server in a single process
2022-09-24 15:55:21 +03:00
Andrey Filipenkov
1319c8f197
fix building Client with the latest cmake
...
for some reason cmake injects compile flag to Client's resources which breaks ibtool call
2022-09-24 15:55:20 +03:00
Andrey Filipenkov
ede9f33328
fix linking with FFmpeg
2022-09-24 15:55:20 +03:00
Andrey Filipenkov
3388583089
use component-based install to copy only what's needed for every app
2022-09-24 15:55:20 +03:00
Andrey Filipenkov
fae295da88
allow building without codesigning
2022-09-24 15:55:20 +03:00
Andrey Filipenkov
fb32dd0ffc
adapt config to new dependencies
2022-09-24 15:55:20 +03:00
Andrey Filipenkov
9dc5f3ed8b
improve RPATH handling, apply RPATH when installing dylibs
2022-09-24 15:55:20 +03:00
Andrey Filipenkov
67ef0c234d
build Qt launcher, launch Client with it
...
kambala-decapitator/vcmi#17
2022-09-24 15:55:19 +03:00
Andrey Filipenkov
bb9d19deee
fix whitespace
2022-09-24 15:55:19 +03:00
Andrey Filipenkov
f97ff108a7
show SDL's textfield above the keyboard for game chat, extract handling to separate class
...
kambala-decapitator/vcmi#4 kambala-decapitator/vcmi#31
2022-09-24 15:55:19 +03:00
Andrey Filipenkov
217c83a7e7
convert text input rect to screen coordinates
...
workarounds SDL bug related to moving window ensuring that the input is always above the native keyboard
kambala-decapitator/vcmi#31
2022-09-24 15:55:19 +03:00
Andrey Filipenkov
1a45b97f5e
improve keyboard hide detection
2022-09-24 15:55:19 +03:00