Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-24 06:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,636 Commits 141 Branches 5 Tags 385 MiB
ec501831e6
Commit Graph

1636 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jett
c8991666d2 Potential solution 2021-12-11 10:46:45 +00:00
Mick
e31dc35733
Merge pull request #170 from OogwayUniverse/minifig_editing 2021-12-11 10:50:44 +01:00
Mick
5767ebea38
Merge pull request #132 from StefanH-AT/readme-note-delete-script-pak 2021-12-11 10:48:26 +01:00
Jett
6500b62c52 Minifig editing 2021-12-11 02:02:02 +00:00
Kay Kaprolat
4a1928ba92 removed forgotten TODO from Docker_Windows.md 2021-12-10 22:00:00 +01:00
Kay Kaprolat
6350d8e135 placed images on their own line in Docker_Windows.md 2021-12-10 21:59:20 +01:00
Kay Kaprolat
1dd5ac0ecb resolved merge - removed leading slashes from image paths 2021-12-10 21:54:11 +01:00
Kay Kaprolat
b42c4db400 removed spaces from image names 2021-12-10 21:51:49 +01:00
Kay Kaprolat
dca1361bac
Added slashes to image paths 2021-12-10 21:29:42 +01:00
Kay Kaprolat
f7cf0010db clarified CLIENT_PATH 2021-12-10 21:21:22 +01:00
Kay Kaprolat
1073a2e2d1 added all images to Docker_Windows.md 2021-12-10 21:21:06 +01:00
Kay Kaprolat
b6648ff596 cropped images and added highlights 2021-12-10 21:19:47 +01:00
Kay Kaprolat
3a7db82004 added currently used images 2021-12-10 21:03:52 +01:00
Kay Kaprolat
cd3540b085 first draft for Docker usage under Windows 2021-12-10 20:38:51 +01:00
Kay Kaprolat
c7c1500c5e resolved merge conflict 2021-12-10 20:36:05 +01:00
Kay Kaprolat
0316b2189d removed . after command and added link for MacOS 2021-12-10 20:34:21 +01:00
Kay Kaprolat
67ca452993
Make docker-compose consistently docker compose 2021-12-09 22:43:18 +01:00
Nils Bergmann
0bad9d7186
Move utils to submodule 2021-12-09 22:39:54 +01:00
Nils Bergmann
960b090702
Move utils to submodule 2021-12-09 22:39:43 +01:00
Kay Kaprolat
ecbf886e52 Merge TheNoim's current changes. 2021-12-09 22:32:47 +01:00
Nils Bergmann
da5b290809
Merge branch 'DarkflameUniverse:main' into main 2021-12-09 22:29:10 +01:00
Nils Bergmann
d1e0a73f36 Simplify run steps 2021-12-09 22:28:16 +01:00
Jett
a9dc0e0dac to improve (broken) 2021-12-09 21:06:01 +00:00
Kay Kaprolat
22e6caa0e6 added link to Docker Desktop and details on stopping the server 2021-12-09 20:38:15 +01:00
Nils Bergmann
11ade05510 style: fix whitespace 2021-12-09 18:49:46 +01:00
Nils Bergmann
ef7dd0f069
Merge pull request #3 from jgkawell/pr-improvements 
Dockerized improvements
 2021-12-09 18:46:44 +01:00
Jack Kawell
417ff818d3
Merge pull request #3 from TheNoim/pr-improvements 
WIP: make this work independent of the repo directory
 2021-12-09 10:44:02 -07:00
Mick
82a1c8a765
Merge pull request #147 from Daystar1998/main 
Fix spelling
 2021-12-09 18:20:41 +01:00
Mick
1f083cb168
Merge pull request #136 from MickVermeulen/main 
Add issue templates
 2021-12-09 18:18:24 +01:00
Mick
51600a5329
Merge pull request #134 from DarkflameUniverse/fix-sentry-faction 
Update BaseEnemyMech script to change the default faction
 2021-12-09 18:17:55 +01:00
Mick
140c736bef
Merge pull request #130 from DarkflameUniverse/contributing-commit-guidelines 
Update CONTRIBUTING.md to include commit guidelines
 2021-12-09 18:17:41 +01:00
Mick Vermeulen
9b085faf07 Add issue templates 
Added issue templates to aid with the structural submission of issues.
 2021-12-09 18:17:19 +01:00
Nils Bergmann
619eec8335
Merge branch 'pr-improvements' into pr-improvements 2021-12-09 17:43:52 +01:00
Jett
e4de42659e Update Entity.cpp 2021-12-09 13:56:07 +00:00
Jett
bd609dfc90 Add ship shake to not log about being missing 
This log was causing confusion and issues when in reality there was no problem present.
 2021-12-09 13:09:12 +00:00
Matthew Day
50512cdef8 Fix spelling 2021-12-09 03:17:08 -06:00
Jack Kawell
56f860676d Added admin setup command to docs 2021-12-09 00:37:14 -07:00
Jack Kawell
3b90669d03 Added a link to keygen for flask secret 2021-12-09 00:34:14 -07:00
Jack Kawell
ecd717702d Added client setup check to start_server.sh 2021-12-09 00:20:10 -07:00
Jack Kawell
18d797150e PR comments 2021-12-09 00:10:29 -07:00
Matthew Day
8c16127115 Fix spelling 2021-12-08 23:31:58 -06:00
Mick Vermeulen
f22bf24663 Update BaseEnemyMech script to change the default faction 
As part of the base enemy mech script its faction should be updated to 4
to make sure it's seen as an enemy by the client. The AgDarklingMech script
has been deleted as its functionality was essentially that of BaseEnemyMech
and thus no longer necessary.
 2021-12-08 20:00:08 +01:00
Stefan Heinz
fdd4e3cc80
Add note to readme for troubleshooting tips with script editing 2021-12-08 18:22:05 +01:00
Mick Vermeulen
e91222b504 Update CONTRIBUTING.md to include commit guidelines 
Added commit guidelines to CONTRIBUTING.md to aid people in writing proper
commits.
 2021-12-08 18:11:12 +01:00
Nils Bergmann
72ffe50ca6
Merge branch 'DarkflameUniverse:main' into pr-improvements 2021-12-08 15:10:17 +01:00
Nils Bergmann
7f1e392be2
WIP: add master_ip option 2021-12-08 14:57:16 +01:00
Nils Bergmann
51a9f61e88
WIP: make this work independent of the repo directory 2021-12-08 14:39:19 +01:00
Jack Kawell
293aaff2a5 A few more improvements 2021-12-08 01:54:44 -07:00
Jack Kawell
f185c8b5db Moved all the setup of client files into a single use Docker image 2021-12-08 00:50:15 -07:00
Jack Kawell
a38765d02d fixing my mistakes (aka TheNoim is smarter than me) 2021-12-07 23:44:37 -07:00