Commit Graph

1597 Commits

Author SHA1 Message Date
c845055e6b Merge pull request #1 from NinjaOfLU/fix-item-removal-underflow
Fix item removal underflow
2022-04-19 11:56:57 -05:00
a3331d009d Fix solo_racing for Frostburgh's Space Blizzard Racetrack 2022-04-19 12:33:57 +02:00
80a09881c0 Merge pull request #508 from aronwk-aaron/Frostburgh
Frostburgh Server fixes
2022-04-18 22:58:02 -07:00
263b019262 Merge branch 'main' into Frostburgh 2022-04-18 23:35:40 -05:00
6933b2c301 case for putting you back into FB when leavign space blizzard 2022-04-18 23:33:09 -05:00
8db7dfef75 also apply overrides to AG fans 2022-04-18 21:09:27 -05:00
f3dd71ccb1 cleanup logs, fix overrides, define LOTs in header 2022-04-18 21:02:04 -05:00
8fe5c00984 remove dereference
(I think that's what it is called)
2022-04-18 08:36:11 -05:00
d05601ce64 Fixes 2022-04-18 08:27:37 -05:00
1defc22caf Merge pull request #509 from EmosewaMC/racing-achievement-fixes
Fixed Racing Missions Try, Try again and Race Series 1
2022-04-18 04:03:32 -07:00
5691df9009 Fixed Racing Mission
* Try, Try Again achievement now progresses when the player gets last place in a race of 3 or more players, or when solo racing is enabled.
* Race Series 1 mission from Velocity Lane now progresses correctly.
2022-04-18 01:04:29 -07:00
2122448284 cleaning up some stuff 2022-04-17 21:30:25 -05:00
263eaf03b0 ugh, another semicolon 2022-04-17 20:24:49 -05:00
6cef7a437a scope 2022-04-17 20:24:19 -05:00
0778b4f81c missed semicolon 2022-04-17 20:17:36 -05:00
235934714f honor the logic in the lua script 2022-04-17 20:16:27 -05:00
a343ed9493 rock hydrants work 2022-04-17 19:43:17 -05:00
cc68b0768b remove log 2022-04-17 17:43:25 -05:00
e696d26941 update the Effect ID 2022-04-17 17:41:10 -05:00
a8fcb4c153 make the hydrant match the lua script 2022-04-17 16:44:46 -05:00
1e85ae2035 tabs and log 2022-04-17 15:58:26 -05:00
67615d5688 fix volumen physics name 2022-04-17 12:46:41 -05:00
23677b4bd3 Simplify some stuff
Remove render component in startup
2022-04-17 12:38:12 -05:00
5b0f917485 update script path for fans 2022-04-17 00:05:04 -05:00
b3695c42b2 fix copy past error 2022-04-16 23:35:22 -05:00
0e5a1c9721 fix comparator 2022-04-16 23:33:44 -05:00
b4acf329b4 implement some missing scripts 2022-04-16 23:32:15 -05:00
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
a3e2aa2a97 Merge pull request #505 from EmosewaMC/Vault-fixes
Addressed vault size issues
2022-04-14 16:30:55 -07:00
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
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
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
a32c5a2f3c Vault corrections 2022-04-13 01:50:06 -07:00
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
959c90985c missed a semicolon 2022-04-12 18:32:52 -05:00
4a98c46fb9 fix tabs/spaces 2022-04-12 18:30:46 -05:00
40d396c7e2 simplify 2022-04-12 18:05:22 -05:00
6b44936c68 check if map exists for testmap 2022-04-12 14:06:03 -05:00
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
0f738c8d9c Merge pull request #419 from Marcono1234/issue-template-improvements
Improve GitHub issue templates
2022-04-11 02:25:54 -07:00
7a354b3545 Merge pull request #456 from Marcono1234/marcono1234/zlib-https
Fetch zlib library over HTTPS
2022-04-10 20:04:23 -07:00
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
f01c2e1bd3 Updated logging 2022-04-10 17:08:29 -07:00
30c7b65150 incorrecly named variable 2022-04-10 17:00:03 -07:00
1e514a8b61 more specific logging 2022-04-09 18:48:13 -07:00
c08557f37d separated world server to more functions 2022-04-09 18:35:41 -07:00
6927bc614e Spacing 2022-04-09 18:33:38 -07:00
ae61b23896 Chat log no longer needed 2022-04-09 16:02:27 -07:00
aee3290248 Update MasterServer.cpp 2022-04-09 16:02:12 -07:00
1efbe2d2c0 added returns 2022-04-09 15:57:18 -07:00