mirror/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-04-24 21:58:57 -05:00
Code Issues Packages Projects Releases Wiki Activity
55 Commits 235 Branches 11 Tags
a1f003edd9c1866d1445c8bf162aa43e13466eae
Commit Graph

55 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nils Bergmann a1f003edd9 WIP: ignore docker-compose.override.yml 2021-12-07 22:44:21 +01:00
Nils Bergmann 0780824e31 WIP: change the example thread size to 1 2021-12-07 22:44:08 +01:00
Nils Bergmann 4cf2f4e7c7 WIP: error if the client path is missing 2021-12-07 22:43:53 +01:00
Nils Bergmann 53c9467bec WIP: use fixed mariadb version 2021-12-07 22:30:08 +01:00
Nils Bergmann 157977e267 Merge pull request #1 from VBMCBoy/main 
Add Brick-Building-Fix and AccountManager
 2021-12-07 22:28:37 +01:00
Nils Bergmann e714cacc58 WIP: produce valid MasterServer binary 2021-12-07 22:25:58 +01:00
Kay Kaprolat ac20be8744 moved healthchecks from Dockerfiles to docker-compose.yml 2021-12-07 22:17:18 +01:00
Kay Kaprolat 2681ab3828 removed AccountManager secret generation from Dockerfile 2021-12-07 22:09:54 +01:00
Kay Kaprolat 7a55db3f21 moved AccountManager secret to environment 2021-12-07 22:08:53 +01:00
Kay Kaprolat b46f833e23 added darkflame network to brickbuildfix 2021-12-07 21:34:06 +01:00
Kay Kaprolat e01a7be08e added AccountManager 2021-12-07 21:30:08 +01:00
Kay Kaprolat b35a367ed1 added brick-building fix 2021-12-07 21:25:15 +01:00
Nils Bergmann 9387e88dc0 WIP: still no working MasterServer binary 2021-12-07 20:58:18 +01:00
Nils Bergmann 50221fbd65 WIP: do more post build steps 2021-12-07 16:29:26 +01:00
Nils Bergmann 6f2e306c7e Merge branch 'main' of github.com:TheNoim/DarkflameServer 2021-12-07 14:51:54 +01:00
Nils Bergmann a59ea5e245 Merge branch 'main' of github.com:TheNoim/DarkflameServer 2021-12-07 14:51:40 +01:00
Nils Bergmann 0add6853bf WIP: completely automated docker setup 2021-12-07 14:50:05 +01:00
Mick b580f19825 Merge pull request #2 from StefanH-AT/readme-cmake-version 
Add note to readme about cmake version to build
 2021-12-07 10:22:26 +01:00
averysumner 17e4f2536b Merge pull request #85 from DarkflameUniverse/revert-44-patch/zone_path_casing 
Revert "Try to load from original zone path before a lowercased one"
 2021-12-07 00:25:33 -08:00
averysumner 595afc4a93 Revert "Try to load from original zone path before a lowercased one" 2021-12-07 00:25:19 -08:00
Gie "Max" Vanommeslaeghe 994382b801 Merge pull request #43 from TheLongestRose/patch-1 
Important note for WSL2 users
 2021-12-06 23:08:41 +01:00
Wincent Holm d9348054f1 Merge pull request #15 from Arkannex/patch-1 
Update NPC.xml
 2021-12-06 15:06:34 +01:00
Arkannex 713cb6c6e5 Update NPC.xml 2021-12-06 08:04:19 -06:00
Wincent Holm d7b443d51b Merge pull request #13 from JoachimFlottorp/main 
Modified README specifying CMakeVariables outside the Python box
 2021-12-06 15:01:22 +01:00
Wincent Holm af05371c09 Merge pull request #44 from yuwui/patch/zone_path_casing 
Try to load from original zone path before a lowercased one
 2021-12-06 14:58:34 +01:00
Wincent Holm 9dc38e87cd Merge pull request #11 from yuwui/patch/default_net_version 
change default network version to unmodded client
 2021-12-06 14:53:23 +01:00
yuwui 932bf7ca60 update readme 2021-12-06 12:29:42 +01:00
yuwui 2dd96198af try original zone path before lowercasing 2021-12-06 10:31:09 +01:00
TheLongestRose 7dadc4ce77 Important note for WSL2 users 
The server and client cannot connect when the server is running on a WSL2 distro and the server is set to localhost, due to differences between WSL1 and 2. This won't affect most people, but would have saved me a few hours.
 2021-12-06 00:04:52 -08:00
Wincent Holm 34f1d4002b Merge pull request #38 from yuwui/patch/strip_cr 2021-12-06 07:46:14 +01:00
yuwui 3845dc77f9 strip carriage return from txt files 2021-12-06 07:07:17 +01:00
Wincent Holm 3163c91a4a Merge pull request #34 from aronwk-aaron/patch-1 2021-12-06 06:39:28 +01:00
averysumner 7e4be6fdb6 Update README.md 2021-12-06 00:39:13 -05:00
averysumner 4b8712b0f5 Update README.md 2021-12-06 00:37:30 -05:00
aronwk 2f064f0145 change repo url in worldconfig.ini to be correct 2021-12-05 22:37:32 -06:00
averysumner 0a9d4d0d66 Update 0_nt_footrace.sql 2021-12-05 19:28:06 -08:00
averysumner bcfa1fb906 Update 1_fix_overbuild_mission.sql 2021-12-05 19:27:45 -08:00
averysumner 3c3a3dba8f Merge pull request #17 from m888r/clangfix 
Small fixes for windows clang compile
 2021-12-05 19:09:47 -05:00
Manas Shah f760ef456c Small fixes for windows clang compile 2021-12-05 15:59:50 -08:00
Arkannex 1ba48ecd64 Update NPC.xml 
Addition of an NPC to Gnarled Forest near Bucky Urchin.
 2021-12-05 17:43:38 -06:00
JoachimF 0c006b4007 Update README.md 2021-12-05 23:50:30 +01:00
Gie "Max" Vanommeslaeghe 498a9c0be4 Merge pull request #3 from luxaritas/patch-1 
Note that the zlib -dev package is needed
 2021-12-05 23:25:14 +01:00
yuwui 26dd78fff7 change default network version to 171022 2021-12-05 23:16:12 +01:00
Wincent Holm 54810fd5ef Added names to folder to copy over to build/res 2021-12-05 22:11:09 +01:00
Gie "Max" Vanommeslaeghe 27dace206b Merge pull request #6 from XenoTrixx/main 
Corrected apt install command for ubuntu
 2021-12-05 22:01:39 +01:00
XenoTrixx a54687671a Correctet apt install command for ubuntu 2021-12-05 21:48:43 +01:00
Jonathan Romano e0ef02bfdb Note that the zlib -dev package is needed 2021-12-05 15:31:42 -05:00
Stefan Heinz 18d33933d4 Add note to readme about cmake version to build 2021-12-05 21:26:58 +01:00
Gie "Max" Vanommeslaeghe a9860388b2 Rename CMakeVariables to CMakeVariables.txt v1.0 2021-12-05 19:18:00 +01:00
Gie "Max" Vanommeslaeghe 67a76dce2c Create CMakeVariables 2021-12-05 19:17:21 +01:00