Commit Graph

1580 Commits

Author SHA1 Message Date
7aed5f0500 Update dGame/Character.h
Co-authored-by: Xiphoseer <Xiphoseer@users.noreply.github.com>
2022-01-03 22:37:49 -08:00
a92e05c640 Update dGame/dGameMessages/GameMessages.cpp
Co-authored-by: Xiphoseer <Xiphoseer@users.noreply.github.com>
2022-01-03 22:37:40 -08:00
f1525028da Merge pull request #289 from Verathian/portal-fixes
Portal Stun Time Reductions
2022-01-04 07:31:35 +01:00
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
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
a9da275673 removed extra tab
removed extra tab
2022-01-03 16:01:54 -08:00
f74cc9cb10 Updated variable assignment
Changed the variable assignment to be a ternary operator.
2022-01-03 16:01:28 -08:00
975654f8e2 Merge branch 'main' into Log-Line-Cleaning 2022-01-03 17:51:13 +00:00
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
a06fa39a5d Add newline at EOF; re-merge cmake steps 2022-01-03 16:36:15 +01:00
03d4d84eeb Update CI pipeline 2022-01-03 16:28:16 +01:00
eb18115c99 Update CMakePresets 2022-01-03 16:25:47 +01:00
1100c57e2d Run tests with CI 2022-01-03 16:00:32 +01:00
a591dbfe9c Basic tests infrastructure 2022-01-03 16:00:21 +01:00
74013e07a8 Encapsulated variable properly
lootSource was not encapsulated properly so this is now fixed.
2022-01-03 03:11:04 -08:00
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
9f895205d4 Fix formatting and add comments 2022-01-02 14:00:01 -07:00
1ddf7d1f94 Fix for Area of Affect Behaviors targeting incorrect entities 2022-01-02 20:37:03 +00:00
4d6991ea4b Merge branch 'DarkflameUniverse:main' into main 2022-01-02 16:08:18 +01:00
15e8343e75 Merge pull request #8 from VBMCBoy/readme-improvements
Readme improvements as suggested by Marcono1234
2022-01-02 16:08:05 +01:00
4198379aa8 Removed unnecessary note about slashes 2022-01-02 10:24:01 +01:00
df369612be Add XML attribute spaces consistently 2022-01-01 18:23:14 +01:00
f02165b912 Update UserManager.cpp
fix function call
2022-01-01 14:31:13 +01:00
203e75ef3d Fix resurrecting in BONS (#334) 2022-01-01 02:10:12 -08:00
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
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
a15f9f38d8 Update script value to that in the lua file (#331) 2022-01-01 00:02:28 -08:00
00e841587d Merge pull request #332 from OogwayUniverse/spooky-fixes 2021-12-31 16:59:28 +01:00
2d5d5b273a remove unneeded log 2021-12-31 15:07:20 +00:00
84b3386eab Merge branch 'DarkflameUniverse:main' into main 2021-12-31 14:14:04 +01:00
824ab7c0c2 Update Docker_Windows.md
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
2021-12-31 14:13:41 +01:00
d501a85c51 Improve order of execution for start_server.sh
Suggested by @Marcono1234
2021-12-31 14:12:09 +01:00
f53a43631c Use LF for *.sh files
Suggested by @Marcono1234
2021-12-31 14:07:40 +01:00
9c10a7adef More meaningful error messages
Suggested by @Marcono1234
2021-12-31 14:04:51 +01:00
bb1c7095d7 Update Docker_Windows.md
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
2021-12-31 13:58:09 +01:00
0bf03cb66e Update Docker_Windows.md
Co-authored-by: Marcono1234 <Marcono1234@users.noreply.github.com>
2021-12-31 13:57:53 +01:00
f15b716ea7 Implement master server fix 2021-12-31 02:52:35 +00:00
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
0a737eaa0d Add note about client files and linux performance 2021-12-30 19:35:06 +01:00
64edb88d36 Changed docker-compose to docker compose 2021-12-30 19:21:53 +01:00
1e7a2febea Fix Docker Desktop download link 2021-12-30 19:19:27 +01:00
da0be9f226 Clarify alt-text of step 7 2021-12-30 17:13:37 +01:00
8af1c92eff Fix typo in step 7 2021-12-30 17:13:07 +01:00
be008ca439 Indent all images 2021-12-30 17:11:25 +01:00
6e6eee71b3 Added more missing newline characters 2021-12-28 19:27:46 +00:00
2ac2dbd650 Update UserManager.cpp
Style fix (CamelCase and space)
2021-12-28 19:56:49 +01:00
ff8d68f45c Merge branch 'main' into Log-Line-Cleaning 2021-12-28 18:46:44 +00:00
0a7d9c46eb Merge pull request #304 from OogwayUniverse/team_loot_repairs
Team loot fixes
2021-12-26 16:18:23 +01:00
b6fc49f057 simplify shirt code in character creation 2021-12-26 14:45:21 +01:00
57e28d4619 Merge branch 'DarkflameUniverse:main' into main 2021-12-26 14:42:16 +01:00