Commit Graph

144 Commits

Author SHA1 Message Date
cooltrain7
ff8d68f45c Merge branch 'main' into Log-Line-Cleaning 2021-12-28 18:46:44 +00: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
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
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
wincent
49aba62dbb Updated database check
When applied this commit updates the style of the database check, changes some logging statements, and makes developers able to skip the check.
2021-12-16 23:11:51 +01:00
Xiphoseer
630d34f51c Set CMakePresets.json min cmake to 3.12 2021-12-16 20:56:11 +01:00
Xiphoseer
8846524541
Add GitHub Actions Workflow
* Create build.yml
* Create CMakePresets.json
2021-12-16 20:29:48 +01:00
Wincent Holm
3cad0214d1
Merge pull request #233 from sersorrel/instanceinfo-is-one-word
Correct documentation for /instanceinfo
2021-12-16 11:30:33 +01:00
Christopher Kawell
9c570b8121
Merge pull request #1 from Nordegraf/add-its-truly-random-achievement
Add its truly random achievement
2021-12-15 20:37:58 -06:00
Niklas Conen
2a00d50672 fixed formatting 2021-12-16 00:36:10 +01:00
Niklas Conen
b05c41fe8f added tracking of the It's Truly Random achievement 2021-12-16 00:30:46 +01:00
Mick
52fa7aaeae
Merge pull request #239 from MickVermeulen/main
Fix issue templates
2021-12-15 22:36:16 +01:00
Mick Vermeulen
9f761a9ea5 Fix issue templates
GitHub updated their issue template format, checklists now also need a label attribute.
2021-12-15 22:34:26 +01:00
BuildTools
337383b6fd Changed Log statement to debug log 2021-12-15 14:44:10 -06:00
BuildTools
c4dd85be53 Added error log for die roll 2021-12-15 14:33:16 -06:00
BuildTools
de202ac6cc minor formatting fix 2021-12-15 13:27:57 -06:00
Christopher Kawell
34050f641d
Merge branch 'main' into die-roll-anims-ckawell 2021-12-15 13:27:11 -06:00
BuildTools
fb18225f46 Implemented die roll animations for the Lego Dice item 2021-12-15 13:23:49 -06:00
Jett
a5d527d0cf client fdb checksum bug 2021-12-15 18:45:42 +00:00
Avery
58229a922e
setminifig shirt -> setminifig shirtcolor 2021-12-14 18:55:05 -08:00
Avery
a2ed772417
setMinifig -> setminifig 2021-12-14 18:51:41 -08:00
ash
e58af90c8b Correct documentation for /instanceinfo 2021-12-14 21:45:35 +00:00
Jett
ff2f5cb2ce (untested) 2021-12-14 19:25:30 +00:00
Jett
543b231a80 Update WorldServer.cpp 2021-12-14 18:12:44 +00:00
Unknown
c060b01037 fix undeleted dpEntity after enemy smashed
could be the cause of long-soak (hours long) sessions having CPU issues
2021-12-14 16:24:48 +01:00
Nexus
ca8f0059a3 Add port recycling to instance creation
Made instance creation use previously used ports when available, to prevent
crashes caused by ports being used that are outside of the assigned range.
2021-12-14 11:05:33 +08:00
cooltrain7
995042f130 Added missing log newline character 2021-12-13 19:45:08 +00:00
wincent
259c236b72 Fixes dlogger PR
When applied this commit fixes the unix build of the previous dLogger PR.
This commit also fixes backwards compatability with config files.
2021-12-13 16:57:43 +01:00