Commit Graph

919 Commits

Author SHA1 Message Date
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
Gie "Max" Vanommeslaeghe
d9d27a88fc
Merge pull request #293 from Racater/main
Fix issue #268 : wrong shirt colors in the character selection
2022-01-11 23:48:58 +01:00
Gie "Max" Vanommeslaeghe
3fb61f068b
Merge pull request #353 from OogwayUniverse/remove-ips-from-logging
Remove IP Logging
2022-01-11 23:45:44 +01:00
Felix Racz
2221945dc8 Add handling of SIGTERM 2022-01-11 22:47:29 +01:00
Gie "Max" Vanommeslaeghe
03fd073e76
Merge pull request #365 from OogwayUniverse/bons-fixes
Change the win delay to increase time to get BONS loot
2022-01-10 22:15:12 +01:00
Mick
0415ada289
Merge pull request #90 from TheNoim/main
Completely automated docker setup
2022-01-10 15:44:05 +01:00
Jett
b7b182c57c
Change the win delay to increase time to get BONS loot 2022-01-10 11:59:56 +00:00
EmosewaMC
150dec1cc2 Added file to run on table charinfo to allow for unique names only
Created a new file to run on the MySQL database to alter the MySQL table charinfo.names to only allow unique entries
2022-01-09 00:12:49 -08:00
EmosewaMC
01230e2575 Revert change in 0_initial.sql 2022-01-09 00:09:27 -08:00
Felix Racz
03e2a855b1 Add handling of SIGTERM 2022-01-09 01:25:45 +01:00
Xiphoseer
77826c8691
Merge pull request #352 from DarkflameUniverse/feature/windows-ci
Add windows CI
2022-01-09 00:54:24 +01:00
EmosewaMC
b529b7d3a0 Added UNIQUE for charInfo table
Added UNIQUE for charInfo table.
2022-01-08 00:00:27 -08:00
TheMatt2
e5f7d164cb Additional SQLite lookup sanitizing.
Using CDClientDatabase::ExecuteQueryWithArgs() across all known lookups.
2022-01-06 21:12:47 -05:00
Jett
c1903ca12d Remove IP Logging 2022-01-06 21:54:48 +00:00
TheMatt2
4796b551ad Additional SQLite lookup sanitizing with CDClientDatabase::ExecuteQueryWithArgs() 2022-01-06 16:05:03 -05:00
TheMatt2
590ccc78aa Add proper sanitizing for input to SQLite database.
Adds function `ExecuteQueryWithArgs(query, ...)` to allow for queries 
with user input.

There is a known issue, that the funciton does not work with 
std::string. All strings must be converted to c strings.
2022-01-05 21:52:33 -05:00
Nils Bergmann
eef2ed0b4c
Add special character warning 2022-01-05 17:46:59 +01:00
Nils Bergmann
9a7654806f
Rename build dir to cmake_build 2022-01-05 17:38:53 +01:00
Nils Bergmann
72e2d24c67
Move AccountManager to submodules 2022-01-05 17:32:30 +01:00
Nils Bergmann
dc39acaa75
Fix build for newest changes 2022-01-05 17:21:25 +01:00
Nils Bergmann
f914799b62
Use LUnpack instead of lcdr utils for unpacking the client 2022-01-05 17:21:11 +01:00
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