Commit Graph

1565 Commits

Author SHA1 Message Date
TheMatt2
59afc63a2f Merge DarkflameServer 2022-01-30 13:40:08 -05:00
Gie "Max" Vanommeslaeghe
344af924fe
Merge pull request #405 from EmosewaMC/FvGateCrasherFix
Added missing script for Gate Crasher mission
2022-01-25 15:49:19 +01:00
Marcono1234
676611ed6f Improve GitHub issue templates 2022-01-25 03:18:10 +01:00
Marcono1234
4cd38f1174 Use exit code macros 2022-01-25 01:30:06 +01:00
Marcono1234
910448b0e7 Fix MasterServer not always closing database connection on exit 2022-01-25 01:30:06 +01:00
Marcono1234
477b629faf Fix UserManager not logging chosen name properly 2022-01-25 00:14:21 +01:00
Avery
f6558aa31e
implement jetpack behavior and remove hardcoded jetpacks (#411) 2022-01-24 14:02:56 -08:00
Marcono1234
4f1df372a2 Make some Docker Compose volumes read-only 2022-01-24 21:52:11 +01:00
David Markowitz
1e01423a93
Added support for flags in macros (#410) 2022-01-24 14:57:50 +01:00
Xiphoseer
20037d12f7
Merge pull request #339 from CodeAX2/fix-aoe-targets
Fix Area of Effect Behavior Targets
2022-01-23 14:12:59 +01:00
EmosewaMC
f605451693 Added pragma once to header file 2022-01-22 17:48:09 -08:00
EmosewaMC
fa747a27db Added missing script for Gate Crasher mission 2022-01-22 17:40:08 -08:00
Gie "Max" Vanommeslaeghe
02bf5937dc
Merge pull request #397 from EmosewaMC/AvantGardensSurvivalBuffStation
Fixed an issue where the Avant Gardens Survival buff station was not spawning and implemented its' script
2022-01-22 15:53:58 +01:00
TheMatt2
ef194f8796
Remove <filesystem> dependency (#400) 2022-01-21 17:46:19 +01:00
EmosewaMC
20789bab7f Changed out Timer for CallBackTimer 2022-01-20 16:00:45 -08:00
Gie "Max" Vanommeslaeghe
e248b74ee6
Merge pull request #386 from EmosewaMC/passportflagnotbeingset
Added joined a faction flag
2022-01-20 15:15:50 +01:00
EmosewaMC
e11260a2fe Added comment 2022-01-20 03:54:58 -08:00
EmosewaMC
24f8ea21db Added redundancy for smashing buff station 2022-01-20 03:48:43 -08:00
EmosewaMC
6fc0683ce9 Added comments 2022-01-20 03:26:41 -08:00
EmosewaMC
15831e8d6c Added Script files for Avant Gardens Buff Station 2022-01-20 03:20:39 -08:00
EmosewaMC
2a5f3b8072 Added script for Avant Gardens Survival buff station 2022-01-20 03:20:24 -08:00
EmosewaMC
850ae40f05 Moved retroactive flag check to Character.cpp 2022-01-19 17:34:53 -08:00
Gie "Max" Vanommeslaeghe
3bb1491f09
Merge pull request #387 from EmosewaMC/BonsRepeatMissionTriggers
Fixed Battle of Nimbus Station achievements being repeatable
2022-01-19 21:08:25 +01:00
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
46f375a58e Added comments to header file 2022-01-19 02:31:22 -08:00
EmosewaMC
097af41392 Deleted unused variables 2022-01-19 02:28:50 -08:00
EmosewaMC
67d5061416 Implemented Dragon Smash Quick Build for Crux Prime Dragons
Implemented a script for the crux prime dragons to spawn the Golem Quick Build that insta kills the Entity if the player hits the dragon after the golem is built.  Tested on Local Ubuntu instance against 1 Crux Prime Maelstrom Dragon and 1 Butterscorch and had no issues building the quick build or with the enemy not smashing.  Enemies also correctly reset to their default behavior after the stun period has expired.
2022-01-19 02:10:04 -08: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
enteryournamehere
84a376b425
Add zone 1700 to list of accessible zones (#87)
* Add zone 1700 to list of accessible zones

also fix indentation

* Indent using tabs instead of spaces

* Add zone 1500

* Remove zone 1500

and add back 1700 which was accidentally deleted again
2022-01-18 11:48:56 -08:00
Gie "Max" Vanommeslaeghe
179d44fdd3
Merge pull request #385 from TheMatt2/error-handling
Clearer Error Message on Misconfiguration
2022-01-18 12:51:48 +01:00
Jett
2f2e670ef3
Merge pull request #388 from EmosewaMC/ApeQBFix
Changed Script Created for Apes on Crux Prime to allow for Anchor QuickBuilds
2022-01-18 11:19:13 +00:00
EmosewaMC
01ed5106b9 Changed Script Created for Apes on Crux Prime 2022-01-18 02:28:17 -08:00
EmosewaMC
60ba78d639 Fixed BoNS achievements being repeatable 2022-01-17 21:55:01 -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
TheMatt2
df77997b0b Clearer Error Message on Misconfiguration
Checks if CDServer.sqlite exists before attempting to open it. Otherwise 
Sqlite will create an empty file only cause a crash when CDClientManager 
tries to Initialize.

Also catches error if CDClientManager tries to initialize, in case an 
empty CDServer.sqlite file already exists.
2022-01-17 15:13:30 -05:00
Nico Mexis
7dd7fdaf71
Update CMake minimum requirement (#380) 2022-01-17 12:46:33 +01: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
TheMatt2
9dfa401b27 Fix whitespace
Convert to tabs and remove trailing whitespace
2022-01-15 14:02:14 -05:00
TheMatt2
4ff84e0730 Fix whitespace 2022-01-15 13:37:43 -05: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
TheMatt2
3de3932503 Comply with Xiphoseer required changes.
Remove the CDClientDatabase::ExecuteQueryWithArgs() function and replace 
it with CDClientDatabase::CreatePreppedStmt().

This prevents a developer from accidently using %s, or incorrectly 
passing std::string, and causing a silent error.
2022-01-12 22:48:27 -05: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