35e1b86683
remove no longer needed adjustments
2022-09-24 15:55:24 +03:00
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
2d3002bc1d
add standard lib target back
...
- the moved CMakeLists.txt is turned into a macro (adds whitespace difference)
- now uses absolute paths to the lib and include dirs
- refactors iOS install section to use "early continue" in the foreach loop
2022-09-24 15:55:21 +03:00
267e8df7db
move lib/CMakeLists.txt to cmake_modules/VCMI_lib.cmake
...
preparation to be able to duplicate the lib target
2022-09-24 15:55:21 +03:00
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
27551a9eae
fix using local minizip after rebase
2022-09-24 15:55:20 +03:00
3388583089
use component-based install to copy only what's needed for every app
2022-09-24 15:55:20 +03:00
13d0de17cd
use shared path as user data when available
2022-09-24 15:55:19 +03:00
821672a1a4
refactor VCMIDirsIOS::dataPaths()
2022-09-24 15:55:19 +03:00
497bf58d32
disable modules
2022-09-24 15:55:19 +03:00
2354023731
move extern "C" to header
2022-09-24 15:55:18 +03:00
01c17d856f
support restarting server thread
...
kambala-decapitator/vcmi#27
2022-09-24 15:55:18 +03:00
2fc4d48215
load game data from shared dir
...
kambala-decapitator/vcmi#15
2022-09-24 15:55:18 +03:00
9b3c2f2a82
some cleanup
2022-09-24 15:55:18 +03:00
568e7446b9
show logs without debugger attached
2022-09-24 15:55:17 +03:00
dde9a5d5d2
todo updates
2022-09-24 15:55:17 +03:00
75282366c0
log messages with os_log
2022-09-24 15:55:17 +03:00
cfa22c33ad
use rpath properly
2022-09-24 15:55:17 +03:00
b6c4126bed
install files after building server/client
...
package required files inside app bundle
2022-09-24 15:55:17 +03:00
e72e5cea6f
attempt to run server in a separate app
...
partially reverts 3258f8bb40487e3731bf452dbda1add6294ff4b2
2022-09-24 15:55:17 +03:00
26a1cc5b73
todos
2022-09-24 15:55:16 +03:00
98d507d0a5
disable console colors as Xcode doesn't render them
2022-09-24 15:55:16 +03:00
b8fa692bda
simulator reads data from the macOS directory
2022-09-24 15:55:16 +03:00
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
d6f8e4328c
implement setting thread name on macOS/iOS
2022-09-24 15:55:16 +03:00
8249171066
implement VCMIDirs
2022-09-24 15:55:16 +03:00
824aec8416
Apply suggestions from code review
...
Co-authored-by: Andrey Filipenkov <decapitator@ukr.net >
2022-09-24 13:03:46 +04:00
0b56778e00
Fix for compatibility in rewrite
2022-09-23 20:01:54 +02:00
a5077245a8
Merge remote-tracking branch 'origin/develop' into terrain-rewrite
...
# Conflicts:
# lib/Terrain.cpp
# lib/Terrain.h
2022-09-23 20:01:13 +02:00
f883395710
A little refactoring
2022-09-23 19:26:38 +02:00
09931b6c9d
Moved roads and rivers to config files.
...
This also allows adding new ones via mods.
2022-09-23 18:57:16 +02:00
ebe45d512d
Moved roads and rivers to TerrainTypeHandler, by analogy to TerrainType.
2022-09-23 16:24:01 +02:00
8f6f9707a6
Read error message from translate.json
2022-09-23 15:20:11 +04:00
e74890c4b1
Add system message about mods incompatibility
2022-09-23 15:02:45 +04:00
cfbd933d7d
Merge pull request #905 from Nordsoft91/mod-version-launcher
...
Mod versioning in launcher [part 4]
2022-09-23 13:59:29 +03:00
3101a207a0
hotfix for broken game loading
2022-09-23 12:34:44 +04:00
eb7c263010
Merge pull request #964 from kambala-decapitator/warriors-tomb-message
...
fix showing "visited" message for Warrior's Tomb
2022-09-23 11:08:52 +03:00
6aaf77812b
Changed logic for zone placement.
...
Now every zone can be surface, underground, or both. This is separate from water <-> land distinction.
Iand type is now a combination of flags and can take multiple values: "type": ["LAND", "WATER", "SURFACE", "SUB", "ROCK"]. In nothing is specified, terrains get LAND | SURFACE flags by default.
Non-surface zones will default to DIRT, and non-underground zones will default to SUBTERRA.
2022-09-22 18:23:31 +02:00
43a1a8b76d
Merge pull request #928 from kambala-decapitator/quick-recruit-no-creatures
...
show message instead of the Quick Recruit dialog when there're no creatures in town
2022-09-22 18:21:45 +03:00
89d0de53da
Merge remote-tracking branch 'upstream/develop' into features/cpp-map-editor
...
# Conflicts:
# .github/workflows/github.yml
# launcher/modManager/cmodlist.cpp
# lib/CModHandler.cpp
# lib/CModHandler.h
2022-09-22 17:09:47 +04:00
b4d3445559
Merge pull request #971 from kambala-decapitator/fix-warnings
...
Fix most project warnings
2022-09-22 16:05:32 +03:00
2c7198a01a
Increment vcmi version
2022-09-22 16:41:23 +04:00
afe84f16e8
Merge pull request #968 from kambala-decapitator/disable-scripting
...
Disable scripting modules by default
2022-09-22 15:23:17 +03:00
3d3c513603
Merge pull request #929 from Nordsoft91/branch-merge-versioning
...
Mods versioning [part 3]
2022-09-22 14:56:20 +03:00
c9c79887a7
remove unused variables
2022-09-22 11:54:10 +03:00
3616827aad
use default implementation of special methods
2022-09-22 11:54:09 +03:00
a1cf120ea6
add missing virtual destructors
2022-09-22 11:54:09 +03:00
e53613caa7
Fixed crash in pathfinder
2022-09-21 21:44:39 +02:00
7e6ed0583c
disable all scripting code when configuring without scripting modules
2022-09-21 19:31:42 +03:00
6cd810e065
fix showing "visited" message for Warrior's Tomb
2022-09-21 15:19:04 +03:00
