David Markowitz
8f50e4ff56
Merge pull request #503 from aronwk-aaron/testmap-enhancements
...
Dynamically check if zone is viable from existence of file
2022-04-14 16:46:37 -07:00
David Markowitz
a3e2aa2a97
Merge pull request #505 from EmosewaMC/Vault-fixes
...
Addressed vault size issues
2022-04-14 16:30:55 -07:00
NinjaOfLU
3d6d5e58a7
Update GameMessages.cpp
...
I promise I'm not farming changes. I woke up at like 4AM and realised that I'd screwed up in an obvious way. Note to self: You are ALLOWED to change variables.
Wasn't caught in testing because, well, it turns out it's actually impossible to test the edge case this covers, due to the script for the brick console.
2022-04-14 10:09:40 +01:00
NinjaOfLU
cdbb42badf
Added a bracket... -_-
...
Maybe I should write and test code on my computer rather than using Git as an IDE and commits as the save button...
2022-04-14 00:15:45 +01:00
NinjaOfLU
1d1f479387
Ensure items correctly removed from missions
...
Doubt it would have affected anyone, but technically if you had a mission to collect something interactable, and you deleted the items at the same time as interacting with something, this would have counted incorrectly. I'm being defensive because I was an idiot who couldn't read, but in my defence, it was late when I made the first edit, and I'm also a blundering idiot!
2022-04-14 00:11:35 +01:00
wincent
e8f9ea9cf1
Merge remote-tracking branch 'origin/main' into scripting-lua
2022-04-13 19:51:28 +02:00
wincent
5f689104af
Initial work on LUA scripting.
...
This LUA scripting implementation uses the sol header only C++ wrapper for the native LUA libraries.
The API does not follow the original LU scripting. Each instance of a script is in its own LUA-State, and has 'self' as a global. There are hooks to all the implemented CppScript methods, as well as a subset of the entity functionallity. Has to be expanded upon.
This is local work which has been sitting for awhile; thought someone might like to take a look at it.
2022-04-13 19:51:14 +02:00
EmosewaMC
a32c5a2f3c
Vault corrections
2022-04-13 01:50:06 -07:00
NinjaOfLU
59ec28a5a4
Prevent integer underflow in item removal
...
Previously, the only check that the user wasn't trashing more items than they had was clientsided, and this could be bypassed by contacting the server to remove items via a console or the like, and then trashing them before the server could respond, resulting in the count for the items being less than iStackCount. This check prevents that underflow.
2022-04-13 01:58:00 +01:00
Aaron Kimbre
959c90985c
missed a semicolon
2022-04-12 18:32:52 -05:00
Aaron Kimbre
4a98c46fb9
fix tabs/spaces
2022-04-12 18:30:46 -05:00
Aaron Kimbre
40d396c7e2
simplify
2022-04-12 18:05:22 -05:00
Aaron Kimbre
6b44936c68
check if map exists for testmap
2022-04-12 14:06:03 -05:00
David Markowitz
e92cdc4f14
Merge pull request #493 from EmosewaMC/ugh
...
Pets no longer cause client hitches in Nimbus Station and Forbidden Valley
2022-04-11 14:35:57 -07:00
David Markowitz
0f738c8d9c
Merge pull request #419 from Marcono1234/issue-template-improvements
...
Improve GitHub issue templates
2022-04-11 02:25:54 -07:00
David Markowitz
7a354b3545
Merge pull request #456 from Marcono1234/marcono1234/zlib-https
...
Fetch zlib library over HTTPS
2022-04-10 20:04:23 -07:00
David Markowitz
f45cb380e0
Merge pull request #499 from EmosewaMC/master-server-shutdown
...
Dramatically speed up server shutdown and specify database destruction source in logging message
2022-04-10 17:25:04 -07:00
EmosewaMC
f01c2e1bd3
Updated logging
2022-04-10 17:08:29 -07:00
EmosewaMC
30c7b65150
incorrecly named variable
2022-04-10 17:00:03 -07:00
EmosewaMC
1e514a8b61
more specific logging
2022-04-09 18:48:13 -07:00
EmosewaMC
c08557f37d
separated world server to more functions
2022-04-09 18:35:41 -07:00
EmosewaMC
6927bc614e
Spacing
2022-04-09 18:33:38 -07:00
EmosewaMC
ae61b23896
Chat log no longer needed
2022-04-09 16:02:27 -07:00
EmosewaMC
aee3290248
Update MasterServer.cpp
2022-04-09 16:02:12 -07:00
EmosewaMC
1efbe2d2c0
added returns
2022-04-09 15:57:18 -07:00
EmosewaMC
d085c0cf10
correct exit
2022-04-09 15:35:40 -07:00
EmosewaMC
3e60b9db4a
Destroying database specifier
2022-04-09 15:35:01 -07:00
EmosewaMC
fd13770e87
Sped up server shutdown
2022-04-09 14:17:31 -07:00
David Markowitz
5ef1848474
Merge pull request #498 from EmosewaMC/plunger_gun_migration
...
Changed 0_initial.sql so it wont accidentally wipe a database if run again
2022-04-09 00:52:07 -07:00
EmosewaMC
77c6350f03
updated initial migration
...
Made it so people wont accidentally wipe their database if 0_initial.sql is ever run again
2022-04-09 00:48:14 -07:00
David Markowitz
f17e6d6a4a
Merge pull request #496 from EmosewaMC/fix-skill-proxies
...
Addressed proxy items removing skills
2022-04-09 00:37:40 -07:00
David Markowitz
53823a0be5
Added plunger gun CDServer migration
...
A new migration has been added with this merge to address the plunger gun in the CDServer. Please run the 3_plunger_gun_fix.sql migration to update your database.
2022-04-09 00:32:34 -07:00
EmosewaMC
3900267fed
added comment
2022-04-09 00:31:18 -07:00
EmosewaMC
0a494422b7
Added migration for plunger gun
2022-04-09 00:22:02 -07:00
EmosewaMC
96f1c0a709
Fixed skills proxies
2022-04-08 20:20:42 -07:00
David Markowitz
39089284ff
Merge pull request #495 from EmosewaMC/hello-there-obiwan
...
fixed out of context log for launching to properties
2022-04-08 19:37:36 -07:00
EmosewaMC
5a76cb3b44
fixed erronous log
2022-04-08 19:36:43 -07:00
David Markowitz
92d36496df
Merge pull request #490 from EmosewaMC/macos_compilation_warnings
...
Resolved MacOS (and possibly ARM?) compilation warnings
2022-04-07 12:09:37 -07:00
David Markowitz
9b6caef6b5
Merge pull request #487 from EmosewaMC/quickbuild-fixes
...
Added a GM send after QB complete
2022-04-07 09:48:40 -07:00
EmosewaMC
7030d937b1
dirty bit
2022-04-06 22:24:50 -07:00
EmosewaMC
e73793c1a3
removed unnccessary work
2022-04-06 22:21:54 -07:00
EmosewaMC
5eb801eb12
uses number of bricks now
2022-04-06 22:21:29 -07:00
EmosewaMC
4b0ab2380c
Client does calcs
2022-04-06 22:21:17 -07:00
EmosewaMC
bd0926e0a5
special case for pets
2022-04-06 22:21:08 -07:00
EmosewaMC
9d79fc3d2e
resolved MacOS compilation warnings
2022-04-05 05:11:06 -07:00
Gie "Max" Vanommeslaeghe
a0a9936e47
Merge pull request #415 from Marcono1234/UserManager-name-logging
...
Fix UserManager not logging chosen name properly
2022-04-03 11:33:59 +02:00
Gie "Max" Vanommeslaeghe
5e5fefb501
Merge pull request #416 from Marcono1234/MasterServer-closing-db
...
Fix MasterServer not always closing database connection on exit
2022-04-03 11:31:53 +02:00
David Markowitz
395d607632
Merge pull request #484 from EmosewaMC/property-fixes
...
Reputation now saved in charxml. This is not a retroactive fix for reputation earned before this merge.
2022-04-01 15:25:30 -07:00
David Markowitz
db0f363967
Merge pull request #476 from EmosewaMC/bugReportFixing
...
Added more specific bug reporting. There is a new migration called migrations/dlu/2_reporter_id.sql to run on the database.
2022-04-01 15:12:58 -07:00
EmosewaMC
ec463dd4c8
Added a GM send after QB complete
2022-04-01 04:14:28 -07:00
