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
TheMatt2
f7b3a1ef10
Merge branch 'DarkflameUniverse:main' into main
2022-01-04 12:53:41 -08:00
CodeAX2
a19454f7ae
Change destroyable component validator to properly check friends
2022-01-04 11:11:23 -07: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
CodeAX2
d78b2404e2
Refactor CheckValidity
...
- Change variables names to make it clear they are referring to the target
- Change how the target is decided to be an enemy of friend to use the built-in method
2022-01-02 14:01:29 -07:00
CodeAX2
9f895205d4
Fix formatting and add comments
2022-01-02 14:00:01 -07:00
Jacob Hofer
1ddf7d1f94
Fix for Area of Affect Behaviors targeting incorrect entities
2022-01-02 20:37:03 +00:00
Nils Bergmann
4d6991ea4b
Merge branch 'DarkflameUniverse:main' into main
2022-01-02 16:08:18 +01:00
Nils Bergmann
15e8343e75
Merge pull request #8 from VBMCBoy/readme-improvements
...
Readme improvements as suggested by Marcono1234
2022-01-02 16:08:05 +01:00
Kay Kaprolat
4198379aa8
Removed unnecessary note about slashes
2022-01-02 10:24:01 +01:00
Marcono1234
df369612be
Add XML attribute spaces consistently
2022-01-01 18:23:14 +01:00
Raphaël Dunant
f02165b912
Update UserManager.cpp
...
fix function call
2022-01-01 14:31:13 +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
Nils Bergmann
84b3386eab
Merge branch 'DarkflameUniverse:main' into main
2021-12-31 14:14:04 +01:00
Nils Bergmann
824ab7c0c2
Update Docker_Windows.md
...
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
2021-12-31 14:13:41 +01:00
Nils Bergmann
d501a85c51
Improve order of execution for start_server.sh
...
Suggested by @Marcono1234
2021-12-31 14:12:09 +01:00
Nils Bergmann
f53a43631c
Use LF for *.sh files
...
Suggested by @Marcono1234
2021-12-31 14:07:40 +01:00
Nils Bergmann
9c10a7adef
More meaningful error messages
...
Suggested by @Marcono1234
2021-12-31 14:04:51 +01:00
Nils Bergmann
bb1c7095d7
Update Docker_Windows.md
...
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
2021-12-31 13:58:09 +01:00
