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
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
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
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
Xiphoseer
1100c57e2d
Run tests with CI
2022-01-03 16:00:32 +01:00
Xiphoseer
a591dbfe9c
Basic tests infrastructure
2022-01-03 16:00:21 +01: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
Jett
83107d413d
More windows fixes ( #329 )
...
- Added World, Chat and Auth servers as deps to Master
- Added "windows-default" CMake preset so that CMake didn't error out on Windows
- Added NOMINMAX define above cpplinq include
2022-01-01 01:38:45 -08:00
Jett
a15f9f38d8
Update script value to that in the lua file ( #331 )
2022-01-01 00:02:28 -08:00
Wincent Holm
00e841587d
Merge pull request #332 from OogwayUniverse/spooky-fixes
2021-12-31 16:59:28 +01:00
Jett
2d5d5b273a
remove unneeded log
2021-12-31 15:07:20 +00:00
Jett
f15b716ea7
Implement master server fix
2021-12-31 02:52:35 +00: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
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
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
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
