Commit Graph

728 Commits

Author SHA1 Message Date
aronwk a8fcb4c153 make the hydrant match the lua script 2022-04-17 16:44:46 -05:00
aronwk 1e85ae2035 tabs and log 2022-04-17 15:58:26 -05:00
aronwk 67615d5688 fix volumen physics name 2022-04-17 12:46:41 -05:00
aronwk 23677b4bd3 Simplify some stuff
Remove render component in startup
2022-04-17 12:38:12 -05:00
aronwk 5b0f917485 update script path for fans 2022-04-17 00:05:04 -05:00
aronwk b3695c42b2 fix copy past error 2022-04-16 23:35:22 -05:00
aronwk 0e5a1c9721 fix comparator 2022-04-16 23:33:44 -05:00
aronwk b4acf329b4 implement some missing scripts 2022-04-16 23:32:15 -05:00
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
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
aronwk 959c90985c missed a semicolon 2022-04-12 18:32:52 -05:00
aronwk 4a98c46fb9 fix tabs/spaces 2022-04-12 18:30:46 -05:00
aronwk 40d396c7e2 simplify 2022-04-12 18:05:22 -05:00
aronwk 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