Commit Graph

232 Commits

Author SHA1 Message Date
Nils Bergmann
4d6991ea4b
Merge branch 'DarkflameUniverse:main' into main 2022-01-02 16:08:18 +01:00
Nils Bergmann
15e8343e75
Merge pull request #8 from VBMCBoy/readme-improvements
Readme improvements as suggested by Marcono1234
2022-01-02 16:08:05 +01:00
Kay Kaprolat
4198379aa8
Removed unnecessary note about slashes 2022-01-02 10:24:01 +01:00
Jett
203e75ef3d
Fix resurrecting in BONS (#334) 2022-01-01 02:10:12 -08:00
m888r
14fc049ea0
Damage Buff source fix - inventor beehive bug (#306)
* add HandleUnmanaged overload to account for skill source

* add source to buff damage skill call to credit players for kills

* use LWOOBJID_EMPTY default arg & behaviorcontext constructor
2022-01-01 01:46:05 -08:00
Jett
83107d413d
More windows fixes (#329)
- Added World, Chat and Auth servers as deps to Master
- Added "windows-default" CMake preset so that CMake didn't error out on Windows
- Added NOMINMAX define above cpplinq include
2022-01-01 01:38:45 -08:00
Jett
a15f9f38d8
Update script value to that in the lua file (#331) 2022-01-01 00:02:28 -08:00
Wincent Holm
00e841587d
Merge pull request #332 from OogwayUniverse/spooky-fixes 2021-12-31 16:59:28 +01:00
Jett
2d5d5b273a
remove unneeded log 2021-12-31 15:07:20 +00:00
Nils Bergmann
84b3386eab
Merge branch 'DarkflameUniverse:main' into main 2021-12-31 14:14:04 +01:00
Nils Bergmann
824ab7c0c2
Update Docker_Windows.md
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
2021-12-31 14:13:41 +01:00
Nils Bergmann
d501a85c51
Improve order of execution for start_server.sh
Suggested by @Marcono1234
2021-12-31 14:12:09 +01:00
Nils Bergmann
f53a43631c
Use LF for *.sh files
Suggested by @Marcono1234
2021-12-31 14:07:40 +01:00
Nils Bergmann
9c10a7adef
More meaningful error messages
Suggested by @Marcono1234
2021-12-31 14:04:51 +01:00
Nils Bergmann
bb1c7095d7
Update Docker_Windows.md
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
2021-12-31 13:58:09 +01:00
Nils Bergmann
0bf03cb66e
Update Docker_Windows.md
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
2021-12-31 13:57:53 +01:00
Jett
f15b716ea7 Implement master server fix 2021-12-31 02:52:35 +00:00
Kay Kaprolat
0a737eaa0d
Add note about client files and linux performance 2021-12-30 19:35:06 +01:00
Kay Kaprolat
64edb88d36
Changed docker-compose to docker compose 2021-12-30 19:21:53 +01:00
Kay Kaprolat
1e7a2febea
Fix Docker Desktop download link 2021-12-30 19:19:27 +01:00
Kay Kaprolat
da0be9f226
Clarify alt-text of step 7 2021-12-30 17:13:37 +01:00
Kay Kaprolat
8af1c92eff
Fix typo in step 7 2021-12-30 17:13:07 +01:00
Kay Kaprolat
be008ca439
Indent all images 2021-12-30 17:11:25 +01:00
Gie "Max" Vanommeslaeghe
0a7d9c46eb
Merge pull request #304 from OogwayUniverse/team_loot_repairs
Team loot fixes
2021-12-26 16:18:23 +01:00
Nils Bergmann
8ba3fe33f3
Merge branch 'DarkflameUniverse:main' into main 2021-12-25 17:05:37 +01:00
Jett
76c9d057cf Update ChatPacketHandler.cpp 2021-12-24 11:57:31 +00:00
Jett
7d40585211 Test frakjaw fix 2021-12-24 01:14:15 +00:00
Jett
9440af0d67 Repaired some bugs
- Fixed Team loot
- LMI dropping for team sizes
- No more > 4 player teams
2021-12-24 00:25:52 +00:00
Wincent Holm
0afba0d1d3
Merge pull request #294 from DarkflameUniverse/fix-loot-crash 2021-12-22 17:55:53 +01:00
Wincent Holm
271e14e2f1
Fix loot crash
When applied this commit fixes a crash with the loot system due to a missing nullptr check.
2021-12-22 17:16:31 +01:00
Wincent Holm
65b7f49c9b
Merge pull request #248 from Xiphoseer/main 2021-12-21 21:23:56 +01:00
Gie "Max" Vanommeslaeghe
1006bd17e3
Merge pull request #276 from cuzitsjonny/main
ChatServer respawn after crash
2021-12-21 20:09:16 +01:00
Wincent Holm
0700b9647b
Merge pull request #284 from saltshaker/main 2021-12-21 11:23:26 +01:00
saltshaker
aad4ed6a83 Added include <vector> to Loot.h to allow the server to build on GCP. Resolves #281. 2021-12-21 03:17:35 -07:00
Nils Bergmann
185bed2048
Merge pull request #7 from VBMCBoy/readme-improvements 2021-12-20 14:07:04 +01:00
Jonny
9d52ee7120 WorldServer now attempts to reconnect to ChatServer 2021-12-20 13:50:53 +01:00
Jett
0531365cb5
Make loot accurate to the loot drop rates during live. (#216)
* loot fix (broken)

* Fixed loot

* Update SlashCommandHandler.cpp

* Remove debug command

* Roll loot command

* Remove debug log

* Added const references
When this commit is applied it adds const references to the loot system avoid some unnecessary copies.

Co-authored-by: wincent <wincent.holm@gmail.com>
Co-authored-by: Avery <averysumner@gmail.com>
2021-12-20 02:25:45 -08:00
Avery
f7858ab183
Merge pull request #222 from anarcal/main
Add port recycling to instance creation
2021-12-20 01:47:23 -08:00
Jonny
dfb41c7c40 MasterServer now respawns ChatServer on crash 2021-12-20 10:08:57 +01:00
Wincent Holm
c8177563e9 Fix non-standard lambda.
When this commit is applied it fixes use of non-standard lambda.
2021-12-19 14:47:03 +01:00
Wincent Holm
6f6be5ec47 Remove utils module adde in PR by mistake 2021-12-19 13:48:31 +01:00
Wincent Holm
54501bce2a
Merge pull request #258 from Nordegraf/fix-wreckin-it 2021-12-19 12:49:14 +01:00
Wincent Holm
46149b19f1
Merge pull request #254 from EmosewaMC/Crux-Prime-Enemy-Fix 2021-12-19 08:43:24 +01:00
EmosewaMC
35e8a374df Required script functions added
Re-added the required script functions.
2021-12-18 00:22:49 -08:00
EmosewaMC
88af3c7681 Change of reset use
Instead of doing a hard reset on the spawner, we simply do a SoftReset.  I also removed some dead code that was doing nothing.
2021-12-17 18:07:52 -08:00
Wincent Holm
93ddd50f76
Merge pull request #236 from ckawell/die-roll-anims-ckawell
Implemented die roll animations for the Lego Dice item
2021-12-17 18:29:15 +01:00
Niklas Conen
3793b1f00b fixed bug where smashedTimes counter cont incremented at the beginning of a race 2021-12-17 17:37:03 +01:00
EmosewaMC
8dd376ae1e Crux Prime named enemy fix
Fixed an issue where named enemies on crux prime would no longer spawn by un-commenting a line that was commented out.
2021-12-17 00:31:19 -08:00
Wincent Holm
f816ce4beb
Merge pull request #189 from OogwayUniverse/fdb_checksum
Implement FDB Checksum
Checks the client database with a checksum. This is an optional check to prevent the use of modded or outdated clients.
2021-12-16 23:54:08 +01:00
Jett
6f932fe2cb Spelling and set filestream mode 2021-12-16 22:51:37 +00:00