TheMatt2
f7b3a1ef10
Merge branch 'DarkflameUniverse:main' into main
2022-01-04 12:53:41 -08: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
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
TheMatt2
f2b3b0bf66
Check user input for the "/runmacro" command
...
Presents users from specifying a file path, and looking up macros in the
expected folder.
2022-01-03 21:40:07 -08: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
EmosewaMC
74013e07a8
Encapsulated variable properly
...
lootSource was not encapsulated properly so this is now fixed.
2022-01-03 03:11:04 -08:00
Marcono1234
df369612be
Add XML attribute spaces consistently
2022-01-01 18:23:14 +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
Marcono1234
7c1f392fdf
Fix initial character XML being malformed
...
XML was missing a space between attributes `lzrw` and `stt`.
2021-12-30 19:42:59 +01:00
cooltrain7
6e6eee71b3
Added more missing newline characters
2021-12-28 19:27:46 +00:00
cooltrain7
ff8d68f45c
Merge branch 'main' into Log-Line-Cleaning
2021-12-28 18:46:44 +00:00
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
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
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
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
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
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
Niklas Conen
3793b1f00b
fixed bug where smashedTimes counter cont incremented at the beginning of a race
2021-12-17 17:37:03 +01: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
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
cooltrain7
995042f130
Added missing log newline character
2021-12-13 19:45:08 +00:00
Mick
ff3e10d076
Merge pull request #177 from DarkflameUniverse/implement-buccanneer-valiant
...
Fix #164 : Implement Buccaneer Valiant special ability
2021-12-13 14:31:36 +01:00
Gie "Max" Vanommeslaeghe
180db5dea5
Merge pull request #151 from OogwayUniverse/trigger_fixes
...
Moonbase fix
2021-12-11 19:39:24 +01:00
wincent
bb508e91c1
Update the code style
...
When applied this commit updates the code style used when validating coin pickups.
2021-12-11 17:33:54 +01:00
Jett
94e32a5773
replace the other double cast
2021-12-11 14:24:25 +00:00
Jett
6427b097ab
Replace two casts with one
2021-12-11 14:22:39 +00:00
Jett
22de531ab3
Changes asked for by Wincent
2021-12-11 13:57:15 +00:00
Jett
b6453376e4
patched coin exploit
2021-12-11 13:21:00 +00:00
Mick Vermeulen
833ed8a40d
Implement Buccaneer Valiant special ability
...
Adds the ability for the buccaneer valiant to spawn a ship that rams
enemies and smashes them. Next to a script that triggers the ship skill
a few other changes had to be made:
- Force movement behavior server side calculation and sync
- The ship has no physics volume so the FindValidTargets for behaviors
had to be altered to allow ControllablePhysics entities to find entities
within their area. The "target_self" AOE flag has been used to replicate
the old behavior.
2021-12-11 11:59:29 +01:00
Jett
c8991666d2
Potential solution
2021-12-11 10:46:45 +00:00
Jett
6500b62c52
Minifig editing
2021-12-11 02:02:02 +00:00
Jett
a9dc0e0dac
to improve (broken)
2021-12-09 21:06:01 +00:00
Jett
e4de42659e
Update Entity.cpp
2021-12-09 13:56:07 +00:00