Commit Graph

  • d7294bda55 Merge pull request #187 from Nordegraf/fix-nstokenconsole-exchangerate Wincent Holm 2021-12-12 08:44:15 +01:00
  • 49c1cb3aff Implement FDB Checksum Jett 2021-12-12 03:41:11 +00:00
  • 834b87f4b2 increased the exchange rate of the nimbus station console to 5 faction tokens for 25 maelstrom infected bricks Niklas Conen 2021-12-12 03:45:25 +01:00
  • 180db5dea5 Merge pull request #151 from OogwayUniverse/trigger_fixes Gie "Max" Vanommeslaeghe 2021-12-11 19:39:24 +01:00
  • 95d1c65011 Merge pull request #180 from OogwayUniverse/coin_exploit Wincent Holm 2021-12-11 17:40:59 +01:00
  • bb508e91c1 Update the code style When applied this commit updates the code style used when validating coin pickups. wincent 2021-12-11 17:33:54 +01:00
  • 94e32a5773 replace the other double cast Jett 2021-12-11 14:24:25 +00:00
  • 6427b097ab Replace two casts with one Jett 2021-12-11 14:22:39 +00:00
  • 22de531ab3 Changes asked for by Wincent Jett 2021-12-11 13:57:15 +00:00
  • b6453376e4 patched coin exploit Jett 2021-12-11 13:21:00 +00:00
  • 74742771c4 Added a LogDebug Jett 2021-12-11 12:29:34 +00:00
  • 833ed8a40d Implement Buccaneer Valiant special ability Mick Vermeulen 2021-12-11 11:59:29 +01:00
  • c8991666d2 Potential solution Jett 2021-12-11 10:46:45 +00:00
  • e31dc35733 Merge pull request #170 from OogwayUniverse/minifig_editing Mick 2021-12-11 10:50:44 +01:00
  • 5767ebea38 Merge pull request #132 from StefanH-AT/readme-note-delete-script-pak Mick 2021-12-11 10:48:26 +01:00
  • 6500b62c52 Minifig editing Jett 2021-12-11 02:02:02 +00:00
  • 4a1928ba92 removed forgotten TODO from Docker_Windows.md Kay Kaprolat 2021-12-10 22:00:00 +01:00
  • 6350d8e135 placed images on their own line in Docker_Windows.md Kay Kaprolat 2021-12-10 21:59:20 +01:00
  • 1dd5ac0ecb resolved merge - removed leading slashes from image paths Kay Kaprolat 2021-12-10 21:54:11 +01:00
  • b42c4db400 removed spaces from image names Kay Kaprolat 2021-12-10 21:51:49 +01:00
  • dca1361bac Added slashes to image paths Kay Kaprolat 2021-12-10 21:29:42 +01:00
  • f7cf0010db clarified CLIENT_PATH Kay Kaprolat 2021-12-10 21:21:22 +01:00
  • 1073a2e2d1 added all images to Docker_Windows.md Kay Kaprolat 2021-12-10 21:21:06 +01:00
  • b6648ff596 cropped images and added highlights Kay Kaprolat 2021-12-10 21:19:47 +01:00
  • 3a7db82004 added currently used images Kay Kaprolat 2021-12-10 21:03:52 +01:00
  • cd3540b085 first draft for Docker usage under Windows Kay Kaprolat 2021-12-10 20:38:51 +01:00
  • c7c1500c5e resolved merge conflict Kay Kaprolat 2021-12-10 20:36:05 +01:00
  • 0316b2189d removed . after command and added link for MacOS Kay Kaprolat 2021-12-10 20:34:21 +01:00
  • 67ca452993 Make docker-compose consistently docker compose Kay Kaprolat 2021-12-09 22:43:18 +01:00
  • 0bad9d7186 Move utils to submodule Nils Bergmann 2021-12-09 22:39:54 +01:00
  • 960b090702 Move utils to submodule Nils Bergmann 2021-12-09 22:39:43 +01:00
  • ecbf886e52 Merge TheNoim's current changes. Kay Kaprolat 2021-12-09 22:32:47 +01:00
  • da5b290809 Merge branch 'DarkflameUniverse:main' into main Nils Bergmann 2021-12-09 22:29:10 +01:00
  • d1e0a73f36 Simplify run steps Nils Bergmann 2021-12-09 22:28:16 +01:00
  • a9dc0e0dac to improve (broken) Jett 2021-12-09 21:06:01 +00:00
  • 22e6caa0e6 added link to Docker Desktop and details on stopping the server Kay Kaprolat 2021-12-09 20:38:15 +01:00
  • 11ade05510 style: fix whitespace Nils Bergmann 2021-12-09 18:49:46 +01:00
  • ef7dd0f069 Merge pull request #3 from jgkawell/pr-improvements Nils Bergmann 2021-12-09 18:46:44 +01:00
  • 417ff818d3 Merge pull request #3 from TheNoim/pr-improvements Jack Kawell 2021-12-09 10:44:02 -07:00
  • 82a1c8a765 Merge pull request #147 from Daystar1998/main Mick 2021-12-09 18:20:41 +01:00
  • 1f083cb168 Merge pull request #136 from MickVermeulen/main Mick 2021-12-09 18:18:24 +01:00
  • 51600a5329 Merge pull request #134 from DarkflameUniverse/fix-sentry-faction Mick 2021-12-09 18:17:55 +01:00
  • 140c736bef Merge pull request #130 from DarkflameUniverse/contributing-commit-guidelines Mick 2021-12-09 18:17:41 +01:00
  • 9b085faf07 Add issue templates Mick Vermeulen 2021-12-08 18:45:27 +01:00
  • 619eec8335 Merge branch 'pr-improvements' into pr-improvements Nils Bergmann 2021-12-09 17:43:52 +01:00
  • e4de42659e Update Entity.cpp Jett 2021-12-09 13:56:07 +00:00
  • bd609dfc90 Add ship shake to not log about being missing Jett 2021-12-09 13:09:12 +00:00
  • 50512cdef8 Fix spelling Matthew Day 2021-12-09 03:17:08 -06:00
  • 56f860676d Added admin setup command to docs Jack Kawell 2021-12-09 00:37:14 -07:00
  • 3b90669d03 Added a link to keygen for flask secret Jack Kawell 2021-12-09 00:34:14 -07:00
  • ecd717702d Added client setup check to start_server.sh Jack Kawell 2021-12-09 00:20:10 -07:00
  • 18d797150e PR comments Jack Kawell 2021-12-09 00:10:29 -07:00
  • 8c16127115 Fix spelling Matthew Day 2021-12-08 23:31:58 -06:00
  • f22bf24663 Update BaseEnemyMech script to change the default faction Mick Vermeulen 2021-12-08 20:00:00 +01:00
  • fdd4e3cc80 Add note to readme for troubleshooting tips with script editing Stefan Heinz 2021-12-08 18:22:05 +01:00
  • e91222b504 Update CONTRIBUTING.md to include commit guidelines Mick Vermeulen 2021-12-08 18:04:21 +01:00
  • 72ffe50ca6 Merge branch 'DarkflameUniverse:main' into pr-improvements Nils Bergmann 2021-12-08 15:10:17 +01:00
  • 7f1e392be2 WIP: add master_ip option Nils Bergmann 2021-12-08 14:57:16 +01:00
  • 51a9f61e88 WIP: make this work independent of the repo directory Nils Bergmann 2021-12-08 14:39:19 +01:00
  • 293aaff2a5 A few more improvements Jack Kawell 2021-12-08 01:54:44 -07:00
  • f185c8b5db Moved all the setup of client files into a single use Docker image Jack Kawell 2021-12-08 00:50:15 -07:00
  • a38765d02d fixing my mistakes (aka TheNoim is smarter than me) Jack Kawell 2021-12-07 23:44:37 -07:00
  • 59f053433c External IP configuration as well as other small improvements Jack Kawell 2021-12-07 23:33:34 -07:00
  • a923a2baa7 Merge pull request #116 from DarkflameUniverse/revert-83-main Avery 2021-12-07 18:14:26 -08:00
  • f68f683e22 Revert "separate AgSpaceStuff and AgShipShake" Avery 2021-12-07 18:14:15 -08:00
  • 0dfc962df5 WIP: connection issue Nils Bergmann 2021-12-08 02:40:27 +01:00
  • cf6f69ba93 WIP: try to fix navmesh load Nils Bergmann 2021-12-08 00:40:15 +01:00
  • 4a3d341c9a WIP: default to BUILD_VERSION=171022 Nils Bergmann 2021-12-07 23:18:20 +01:00
  • 78a04c90e6 WIP: fix migration volume and add ports Nils Bergmann 2021-12-07 23:17:26 +01:00
  • 9b0ba22ef9 Merge pull request #2 from jgkawell/db-with-volume Nils Bergmann 2021-12-07 23:09:13 +01:00
  • 0d910e3307 Merge branch 'DarkflameUniverse:main' into main Nils Bergmann 2021-12-07 23:03:30 +01:00
  • b1e700e2a2 Removed db migrations from script Jack Kawell 2021-12-07 14:56:56 -07:00
  • a6190fe29d Add init volume to database Jack Kawell 2021-12-07 14:55:19 -07:00
  • cf79175500 WIP: add basic docker setup instructions Nils Bergmann 2021-12-07 22:46:02 +01:00
  • a1f003edd9 WIP: ignore docker-compose.override.yml Nils Bergmann 2021-12-07 22:44:21 +01:00
  • 0780824e31 WIP: change the example thread size to 1 Nils Bergmann 2021-12-07 22:44:08 +01:00
  • 4cf2f4e7c7 WIP: error if the client path is missing Nils Bergmann 2021-12-07 22:43:53 +01:00
  • 53c9467bec WIP: use fixed mariadb version Nils Bergmann 2021-12-07 22:30:08 +01:00
  • 157977e267 Merge pull request #1 from VBMCBoy/main Nils Bergmann 2021-12-07 22:28:37 +01:00
  • e714cacc58 WIP: produce valid MasterServer binary Nils Bergmann 2021-12-07 22:25:58 +01:00
  • ac20be8744 moved healthchecks from Dockerfiles to docker-compose.yml Kay Kaprolat 2021-12-07 22:17:18 +01:00
  • 2681ab3828 removed AccountManager secret generation from Dockerfile Kay Kaprolat 2021-12-07 22:09:54 +01:00
  • 7a55db3f21 moved AccountManager secret to environment Kay Kaprolat 2021-12-07 22:08:53 +01:00
  • 5281253f66 Merge pull request #83 from red031000/main Mick 2021-12-07 21:53:42 +01:00
  • 7bead89e39 fix a bug with timer erasing red031000 2021-12-07 20:43:22 +00:00
  • 002f3b6c0e separate AgSpaceStuff and AgShipShake red031000 2021-12-07 08:03:15 +00:00
  • a873de5e9e Merge pull request #68 from Ramen2X/main Mick 2021-12-07 21:48:44 +01:00
  • 73ef2e6c59 Merge pull request #91 from JoachimFlottorp/FixChat Wincent Holm 2021-12-07 21:35:55 +01:00
  • b46f833e23 added darkflame network to brickbuildfix Kay Kaprolat 2021-12-07 21:34:06 +01:00
  • e01a7be08e added AccountManager Kay Kaprolat 2021-12-07 21:30:08 +01:00
  • b35a367ed1 added brick-building fix Kay Kaprolat 2021-12-07 21:25:15 +01:00
  • e967bf2398 Updated solution wincent 2021-12-07 21:03:55 +01:00
  • 9387e88dc0 WIP: still no working MasterServer binary Nils Bergmann 2021-12-07 20:58:18 +01:00
  • eede772b53 Nice Commit! :) TomNordesen 2021-12-07 20:43:42 +01:00
  • bcb0454916 fixed TomNordesen 2021-12-07 20:38:05 +01:00
  • d2fe15679c Nice Commit! :) TomNordesen 2021-12-07 20:35:12 +01:00
  • c48f4b08a2 Nice Commit! :) TomNordesen 2021-12-07 20:19:47 +01:00
  • bfcce19649 Nice Commit! :) TomNordesen 2021-12-07 19:58:24 +01:00
  • 0db954fa72 Update README.md Avery 2021-12-07 12:15:57 -05:00
  • 6e33f5e545 Merge pull request #88 from OogwayUniverse/windows Gie "Max" Vanommeslaeghe 2021-12-07 17:30:37 +01:00