Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-11-04 06:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
313 Commits 225 Branches 11 Tags
a9389fcabf206f7f54fc5291fb23e85c2c4159b7
Commit Graph

313 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
EmosewaMC
a9389fcabf Merge branch 'passportflagnotbeingset' of https://github.com/EmosewaMC/DarkflameServer into passportflagnotbeingset 2022-01-19 03:37:52 -08:00
EmosewaMC
7cf458cff2 Removed redundant comparison 2022-01-19 03:36:18 -08:00
Jett
2bfff2933a Remove equal checks 2022-01-19 11:35:46 +00:00
EmosewaMC
d69a4ffaf0 Added retroactive check for player faction flags 
Added a retroactive check for player flag when loading into a world.
 2022-01-18 17:51:12 -08:00
EmosewaMC
3ede7006f9 Added Joined a faction flag 
Added logic to set the player flag for joining a faction.  Tested on Ubuntu and had zero issues.
 2022-01-17 19:43:37 -08:00
Gie "Max" Vanommeslaeghe
789c0890ca Merge pull request #383 from EmosewaMC/bananaFixes 
Changed banana drop spawn Y height to prevent them from getting stuck on the trees
 2022-01-17 00:51:42 +01:00
EmosewaMC
d883536ebd Reverted change and simply lowered the spawn height to 8 2022-01-15 19:12:07 -08:00
EmosewaMC
fa714aa843 Changed Banana spawn Y height 
Changed the Bananas Y spawn height to be 10 Y units lower to prevent bananas from getting stuck on the tree.
 2022-01-15 17:55:44 -08:00
David Markowitz
70af1f9314 Fixed an issue where repeatable missions were not rewarding the items they should be rewarding (#357) 
When applied this fixes issues with repeatable mission were not rewarding the correct items.
 2022-01-14 14:00:09 +01:00
David Markowitz
24aaa04954 Fixed an issue with shark missions (#372) 
Fixed an issue where getting eaten by a shark would accidentally progress the task for entering the Ravencloud gate's left hand side.
 2022-01-14 13:48:33 +01:00
David Markowitz
ae06188871 Added Bat Lord Full Set Bonus (#375) 
* Added Bat Lord Full Set Bonus
 2022-01-14 13:46:41 +01:00
Jett
3eb319af5b Merge pull request #370 from EmosewaMC/AdditionOfExtraMissionItem 
Fixed a bug where Chaos Cleaner would accidentally add a Maelstrom Dagger to your inventory
 2022-01-14 11:54:08 +00:00
Mick
470bc65239 Merge pull request #290 from Verathian/battle-of-nimbus-adjustments 2022-01-12 08:30:25 +01:00
EmosewaMC
304b03b1d1 Removed add item 2022-01-11 18:18:51 -08:00
Gie "Max" Vanommeslaeghe
d9d27a88fc Merge pull request #293 from Racater/main 
Fix issue #268 : wrong shirt colors in the character selection
 2022-01-11 23:48:58 +01:00
Gie "Max" Vanommeslaeghe
3fb61f068b Merge pull request #353 from OogwayUniverse/remove-ips-from-logging 
Remove IP Logging
 2022-01-11 23:45:44 +01:00
Gie "Max" Vanommeslaeghe
03fd073e76 Merge pull request #365 from OogwayUniverse/bons-fixes 
Change the win delay to increase time to get BONS loot
 2022-01-10 22:15:12 +01:00
Mick
0415ada289 Merge pull request #90 from TheNoim/main 
Completely automated docker setup
 2022-01-10 15:44:05 +01:00
Jett
b7b182c57c Change the win delay to increase time to get BONS loot 2022-01-10 11:59:56 +00:00
Xiphoseer
77826c8691 Merge pull request #352 from DarkflameUniverse/feature/windows-ci 
Add windows CI
 2022-01-09 00:54:24 +01:00
Jett
c1903ca12d Remove IP Logging 2022-01-06 21:54:48 +00:00
Nils Bergmann
eef2ed0b4c Add special character warning 2022-01-05 17:46:59 +01:00
Nils Bergmann
9a7654806f Rename build dir to cmake_build 2022-01-05 17:38:53 +01:00
Nils Bergmann
72e2d24c67 Move AccountManager to submodules 2022-01-05 17:32:30 +01:00
Nils Bergmann
dc39acaa75 Fix build for newest changes 2022-01-05 17:21:25 +01:00
Nils Bergmann
f914799b62 Use LUnpack instead of lcdr utils for unpacking the client 2022-01-05 17:21:11 +01:00
Nils Bergmann
0f3fafde4b Merge branch 'DarkflameUniverse:main' into main 2022-01-05 16:33:13 +01:00
Xiphoseer
852ec4d990 Update requested VS version 2022-01-05 14:29:24 +01:00
Xiphoseer
30fa4c2aa9 Rename CI workflow 2022-01-05 14:28:14 +01:00
Xiphoseer
b21a88d1b0 Pin ubuntu version 2022-01-05 14:23:28 +01:00
Xiphoseer
5e7566c89a Pin to windows-2022 2022-01-05 14:21:59 +01:00
Xiphoseer
adab6cf96f Add windows CI 2022-01-05 14:12:28 +01:00
Xiphoseer
8ed7690b96 Merge pull request #203 from cooltrain7/Log-Line-Cleaning 
Added Log content additions
 2022-01-04 13:15:24 +01:00
Xiphoseer
4d19459015 Merge pull request #291 from EmosewaMC/EmosewaMC 
Implemented sourceType for SendSetCurrency
 2022-01-04 12:01:32 +01:00
Xiphoseer
a9c0cfd9c8 Merge pull request #340 from DarkflameUniverse/feature/tests 
Add basic CTest infrastructure
 2022-01-04 09:27:24 +01:00
Xiphoseer
227b82c446 Add newline at EOF [skip ci] 2022-01-04 09:26:43 +01:00
EmosewaMC
cca5b79e91 Update Mission.cpp 2022-01-03 23:05:56 -08:00
David Markowitz
329d3d66b3 Update dGame/dGameMessages/GameMessages.h 
Co-authored-by: Xiphoseer <Xiphoseer@users.noreply.github.com>
 2022-01-03 22:37:58 -08:00
David Markowitz
cb9ce85bda Update dGame/Character.cpp 
Co-authored-by: Xiphoseer <Xiphoseer@users.noreply.github.com>
 2022-01-03 22:37:53 -08:00
David Markowitz
7aed5f0500 Update dGame/Character.h 
Co-authored-by: Xiphoseer <Xiphoseer@users.noreply.github.com>
 2022-01-03 22:37:49 -08:00
David Markowitz
a92e05c640 Update dGame/dGameMessages/GameMessages.cpp 
Co-authored-by: Xiphoseer <Xiphoseer@users.noreply.github.com>
 2022-01-03 22:37:40 -08:00
Xiphoseer
f1525028da Merge pull request #289 from Verathian/portal-fixes 
Portal Stun Time Reductions
 2022-01-04 07:31:35 +01:00
Xiphoseer
64a78532ed Merge pull request #325 from Marcono1234/marcono1234/malformed-character-xml 
Fix initial character XML being malformed
 2022-01-04 06:12:55 +01:00
EmosewaMC
a9da275673 removed extra tab 
removed extra tab
 2022-01-03 16:01:54 -08:00
EmosewaMC
f74cc9cb10 Updated variable assignment 
Changed the variable assignment to be a ternary operator.
 2022-01-03 16:01:28 -08:00
cooltrain7
975654f8e2 Merge branch 'main' into Log-Line-Cleaning 2022-01-03 17:51:13 +00:00
Mick
73718fe9af Merge pull request #14 from maxdelayer/main 
Set `build.sh` as executable & update `README.md` to acknowledge  `build.sh`'s existence
 2022-01-03 18:48:33 +01:00
Xiphoseer
a06fa39a5d Add newline at EOF; re-merge cmake steps 2022-01-03 16:36:15 +01:00
Xiphoseer
03d4d84eeb Update CI pipeline 2022-01-03 16:28:16 +01:00
Xiphoseer
eb18115c99 Update CMakePresets 2022-01-03 16:25:47 +01:00