Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-12-23 14:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
526 Commits 150 Branches 6 Tags 103 MiB
fd13770e87
Commit Graph

526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
EmosewaMC
5e605b30de Grammatical change in a comment 
Small grammatical change in a comment
 2021-12-23 19:50:17 -08:00
EmosewaMC
e95af79c8a Consolidated if statement 
Changed default variable to achievement and removed the else.
 2021-12-23 19:43:19 -08:00
EmosewaMC
e84811bdce Refactored if statement for coins 
Refactored the if statement for coins so there is only one SetCoins call for the function.
 2021-12-23 18:49:01 -08:00
EmosewaMC
6aad799f95 Updated variable names 
Updated the variable names to match the enum name update.
 2021-12-23 18:48:08 -08:00
EmosewaMC
6ff5ae78aa Corrected enum name 
Corrected the enum name and prefixes of the elements in the enum.
 2021-12-23 18:46:21 -08: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
Raphaël Dunant
ac01edd440
Fix wrong shirt colors in the character selection 2021-12-22 16:02:19 +01:00
EmosewaMC
f772fedf19 Updated description of SetCoins 
Updated the description of the Character::SetCoins function to more accurately describe how the function works.
 2021-12-22 00:43:42 -08:00
EmosewaMC
29cf7f8998 Changed ambiguous variables 
Changed ambiguous variables from int to int32_t to clarify what they are.
 2021-12-22 00:15:08 -08:00
EmosewaMC
97f8e9e9fc Added enum for coin sources 
Added an enum for coin sources as to avoid leaving a random number in the code.
 2021-12-22 00:01:55 -08:00
EmosewaMC
c575294587 Changed variable names 
Changed variable names to more accurately match what they are
 2021-12-21 23:32:39 -08:00
EmosewaMC
23e269940b Implemented sourceType for SendSetCurrency 
Implemented sourceType for the function SendSetCurrency.
 2021-12-21 23:26:54 -08:00
Verathian
7b18c81608 BoNS Time Smash Fix 2021-12-22 00:20:53 -05:00
Verathian
eae1a38705 Portal Stun Time Reductions 2021-12-21 22:51:38 -05: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
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
Nils Bergmann
279fa076d6
Merge branch 'DarkflameUniverse:main' into main 2021-12-16 14:51:16 +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