games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-10 00:43:59 +02:00
Code Issues Releases Activity
8,670 Commits 21 Branches 64 Tags 117 MiB
9865578faa
Commit Graph

3064 Commits

Author SHA1 Message Date
nordsoft
2eb497b477 Looks like everything works 2022-09-28 23:38:41 +04:00
nordsoft
7ee4fca120 Pass whole gamestate over network 2022-09-28 23:15:05 +04:00
Tomasz Zieliński
475f835769 More style tweaks 2022-09-28 11:38:08 +02:00
Andrey Filipenkov
76b36b8951 iOS can use any resolution 2022-09-27 11:56:12 +03:00
Andrey Filipenkov
6e6bf1e77b don't list resolutions larger than the current screen's in the game options 2022-09-27 11:56:12 +03:00
Andrey Filipenkov
f0b909f772 code improvement 2022-09-27 11:56:12 +03:00
Tomasz Zieliński
f386f42166 Merge remote-tracking branch 'origin/develop' into terrain-rewrite 
# Conflicts:
#	lib/Terrain.cpp
#	lib/Terrain.h
#	lib/battle/CBattleInfoEssentials.cpp
#	lib/rmg/ObstaclePlacer.cpp
#	lib/rmg/RiverPlacer.cpp
 2022-09-27 07:50:17 +02:00
Andrey Filipenkov
1dc7ccb7d0 remove declaration of non-existent function 2022-09-27 07:06:17 +03:00
Andrey Filipenkov
53ac61b52b iOS: don't create unused CConsoleHandler 2022-09-27 07:05:10 +03:00
Andrey Filipenkov
70c51e4370 iOS: don't compile unused function 2022-09-27 07:01:16 +03:00
Andrey Filipenkov
802147c5b7 add some asserts that shouldn't fire 2022-09-26 14:06:55 +03:00
Tomasz Zieliński
25f66097cc Handle RoadType by value / reference 2022-09-26 10:20:39 +02:00
Tomasz Zieliński
f804f8a326 Store RiverType by value, handle by reference 2022-09-26 09:51:36 +02:00
Tomasz Zieliński
11dd71515a comment 2022-09-26 09:18:01 +02:00
Tomasz Zieliński
2bd30556a3 Store TerrainType by havlue and handle by reference 2022-09-26 09:17:55 +02:00
Tomasz Zieliński
cd3a1a02c2 More style tweaks 2022-09-25 21:47:44 +02:00
Andrii Danylchenko
27dbee6069
Merge pull request #975 from Nordsoft91/incomatibility-response 
Incompatibility response
 2022-09-25 18:26:02 +03:00
Andrii Danylchenko
d6c2d05376
Merge pull request #992 from kambala-decapitator/msvc-ai-dlls 
[MSVC] place AI dependencies into the right location at build time
 2022-09-25 17:53:16 +03:00
Andrii Danylchenko
127a7e6653
Merge pull request #959 from kambala-decapitator/fix-cursor-attack 
fix cursor image on hover when there're multiple creatures nearby
 2022-09-25 17:44:10 +03:00
Andrey Filipenkov
3286eb613d [msvc] move AI dll dependencies to the main bin dir after build 2022-09-25 14:09:09 +03:00
Andrey Filipenkov
96c2db4d56 remove useless variable 2022-09-25 13:13:37 +03:00
Nordsoft91
d4f97aadf0
Merge branch 'develop' into incomatibility-response 2022-09-25 13:26:07 +04:00
Tomasz Zieliński
4ea57ea7fc A variety of suggested style tweaks 2022-09-25 09:33:56 +02:00
Andrey Filipenkov
72feb538ce add explicit null pointer checks 2022-09-25 10:05:16 +03: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
Andrey Filipenkov
bca46d9560 fix focusing input on Save screen 2022-09-24 15:55:19 +03:00
Andrey Filipenkov
123fd5933e trigger chat message with pinch gesture 
kambala-decapitator/vcmi#4
 2022-09-24 15:55:19 +03:00
Andrey Filipenkov
44d0e19c71 remove focus from active text input after keyboard is closed 
allows focusing same text input again
kambala-decapitator/vcmi#4 kambala-decapitator/vcmi#10
 2022-09-24 15:55:19 +03:00
Andrey Filipenkov
27b7cb8f1f show long press hints higher 
kambala-decapitator/vcmi#29
 2022-09-24 15:55:19 +03:00
Andrey Filipenkov
783c0eab26 fix coordinates of long press (right click) 
kambala-decapitator/vcmi#1 kambala-decapitator/vcmi#26
 2022-09-24 15:55:18 +03:00
Andrey Filipenkov
fd92150566 use same aspect ratio fix as on android 
kambala-decapitator/vcmi#26
 2022-09-24 15:55:18 +03:00
Andrey Filipenkov
4647bd8981 add App Group entitlement 
kambala-decapitator/vcmi#9
 2022-09-24 15:55:18 +03:00
Andrey Filipenkov
d716db942c fall back to OpenGLES if Metal is unavailable 2022-09-24 15:55:18 +03:00
Andrey Filipenkov
5823a384bd show keyboard automatically when joining multiplayer 
kambala-decapitator/vcmi#10
 2022-09-24 15:55:18 +03:00
Andrey Filipenkov
59fe73e454 some random cleanup 2022-09-24 15:55:18 +03:00
Andrey Filipenkov
e3539049cd implement RMB click as long press 
kambala-decapitator/vcmi#1
 2022-09-24 15:55:18 +03:00
Andrey Filipenkov
2b1e6ca342 prevent showing keyboard automatically in main menu 
closes kambala-decapitator/vcmi#10
 2022-09-24 15:55:18 +03:00
Andrey Filipenkov
7def214740 more Xcode-compatible Info.plist 2022-09-24 15:55:17 +03:00
Andrey Filipenkov
13dd451ff5 add simple app icons 2022-09-24 15:55:17 +03:00
Andrey Filipenkov
dde9a5d5d2 todo updates 2022-09-24 15:55:17 +03:00
Andrey Filipenkov
d2b1cc00e8 enable same adventure map tweaks as on android 2022-09-24 15:55:17 +03:00
Andrey Filipenkov
6e41e3154c fix running on device from Xcode 
proper codesigning
 2022-09-24 15:55:17 +03:00
Andrey Filipenkov
cfa22c33ad use rpath properly 2022-09-24 15:55:17 +03:00
Andrey Filipenkov
b6c4126bed install files after building server/client 
package required files inside app bundle
 2022-09-24 15:55:17 +03:00
Andrey Filipenkov
92a7936202 add Info.plist to sources 2022-09-24 15:55:17 +03:00
Andrey Filipenkov
93e9bc4e51 restrict both apps to 64-bit iPad with multitasking and Metal 2022-09-24 15:55:17 +03:00
Andrey Filipenkov
e72e5cea6f attempt to run server in a separate app 
partially reverts 3258f8bb40487e3731bf452dbda1add6294ff4b2
 2022-09-24 15:55:17 +03:00
Andrey Filipenkov
2e18299897 make server a static lib, run it in a separate thread 
issues to solve:
- dynamic_cast error 2: One or more of the following type_info's has hidden visibility or is defined in more than one translation unit. They should all have public visibility. 13CPackForLobby, 20LobbyClientConnected, 20LobbyClientConnected.
- error setting socket option: set_option: No buffer space available
 2022-09-24 15:55:16 +03:00
Andrey Filipenkov
a33db4f03b fix creating SDL window, enforce landscape 2022-09-24 15:55:16 +03:00
Andrey Filipenkov
fe86ac97b6 make app launch 
although it crashes on start because of boost.filesystem
 2022-09-24 15:55:16 +03:00
Andrey Filipenkov
c4233ad706 exclude some code similar to android 2022-09-24 15:55:16 +03:00
Andrey Filipenkov
d6a92f23aa fix leading whitespace 2022-09-24 15:55:16 +03:00