jadebenn
7b819d508b
Squashed commit of the following:
...
commit f4311e593f0e81c69de8d7aa52a0fcd1bfe9f15d6e781da2de3fe9316e781da2e76ccd72c63a6123fe6ccd72c6a9b96cfd71a4c4adcee81ee45639c4adcee8e87f9fcb5b28ce8ac57f9fcb5b75553740e8a039a8029fda7eae64f8a624d3bc0ce6368f4ccabf7d7ea68bf957d0b12f9baa62d357bbd6e4edd886abe413f239c6c771b8926c6966afd2fab74c90b6a4b6b7c0d907626f8ebbbdf9adc0e845ec66e97681542078480f843c02c98f5c10d1585fd86833fa54876bf886cc15a26ce88af35727a61a05b027fee143f22ada829ec35b57495e70c376d41349d6ed37dbb521040c2d40632ece568189fcbd73aa21a9c420a72016338279c396dccac945bb9a7d86aa6c9a7d86aa6c338279c396bd73aa21a90c2d40632ed41349d6ed829ec35b571a05b027fecc15a26ce85fd86833fa0f843c02c945ec66e9766e41423dc3bc79a17ddbd6031ce9f524cbd94a807812f27330ef8029d418c27b14ef8029d46f04a7bc2b8d9fc6b4e973a19afaaab0426d34a0aa9ce7d9043cdb5c10c331f7da00ff89145f97cf661e0939https://github.com/jadebenn/DarkflameServer into MSVCCompilerFlags
commit 145f97cfdc661e0939b7018e5707d781e5f059d5a3d70197f2005d439a4abba825f0c8199c8224a51116ba83c1c5db651116ba83069316bd6ec7b3d9e89316bd6eeb62fb8ad029666a1f62fb8ad071d5089b7224f94edfd5089b72cc7c9f56ff766cc99fae4296276391050184c5962763916d4b7d1d65933fa80063e9ae2115c68d119937f5d9ab39754597e7058be3dc10d7776fb270f37560989b7c593ae98a34544d0eb682f13fa92239507dd78b50872239507d3c
2024-11-17 12:33:15 -06:00
Aaron Kimbrell
07cb19cc30
chore: remove json ( #1561 )
...
we can't use it currently due to threadsafety issues, so just going to remove it until we actually need it and will re-add it as a vendored file later due to cmake issues pulling in things
2024-05-02 06:35:55 -05:00
Aaron Kimbrell
3801a97722
feat: add nlohmann/json lib ( #1552 )
...
* feat: add nlohmann/json lib
* remove build test off
2024-04-24 21:35:45 -05:00
jadebenn
35ce8771e5
chore: supress warnings on external library headers and actually get rid of the last old-style casts ( #1502 )
...
* chore: supress warnings on external library headers and actually get rid of the last old-style casts
* remove commented out section I forgot
* update cmake required version to 3.25 unless we can find another way to do this
* update readme
* Update CMakeLists.txt
2024-03-17 20:48:09 -05:00
Daniel Seiler
554a9a6806
fix: Dissolve more CMake dependencies ( #1387 )
...
* fix: more include changes
* fix: remove dZoneManager from global include
* fix: dDatabase
* fix: dCommon
* fix: object libs
* fix: rebase
* fix: bcrypt
* wip: try simplified connector build
* fix: update dockerfile
* fix: mariadb C/C++ on apple
* feat: Move scripts to CMAKE_MODULE_PATH
* fix: dPropertyBehaviors
* fix: macos?
* fix: Dockerfile
* fix: macos?
* fix: macos?
* fix: macos?
* fix: macos?
* fix: macos?
* try: install_name_tool
* fix not building on unix
* fix include paths
* Remove code changes
Will fix in another PR.
* format pass
remove 2 more included directories.
remove commented out code
add status to messages
* comments and format
surround include directories with quotes
remove commented out code
remove debug messages
* Update CMakeLists.txt
---------
Co-authored-by: David Markowitz <EmosewaMC@gmail.com>
Co-authored-by: David Markowitz <39972741+EmosewaMC@users.noreply.github.com>
2024-03-05 20:13:24 -06:00
Aaron Kimbrell
9116317834
fix: improve our docker config ( #1373 )
...
* greatly simplify docker
* back to gcc since I can't the libs to load properly
* fix typo
add set -e to entrypoint
better copy of entrypoint.sh and use proper entrypoint
* use debian instead of gcc for runtime
comment and organize it a bit
drop gcc to 12 since we are using debian 12 as well
* explicitly include mariadb libs
* Make the server not crash in the case we are using only env-vars
make the dockerfile have configs in the expected location incase of bypassing entrypoint.sh
* remove unneede var from example, since it's in the container now
* coments to dockerfile
* Revert master server changes
* Resolve conflicting port options between chat, master, and world
move chat_server_port to shared since it's used by world and chat
* Don't error if file does not exists when updating a config option
move update before and use bin dir var
2024-01-03 02:36:17 -06:00
David Markowitz
b1134b340f
Add config update function ( #1379 )
...
Update CMakeLists.txt
FINALLY
dont ignore cmake module directory
move to separate file
very cool feature
tested that this still works
Co-authored-by: Aaron Kimbrell <aronwk.aaron@gmail.com>
2024-01-02 18:25:57 -06:00
jadebenn