Commit Graph

1349 Commits

Author SHA1 Message Date
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
David Markowitz
acbd46afcb
Removed debug log 2022-03-31 20:55:47 -07:00
EmosewaMC
8379fba079 added initializer 2022-03-31 18:46:56 -07:00
EmosewaMC
4bc5c8194f Added reputation tracker in charxml 2022-03-31 18:18:13 -07:00
EmosewaMC
ba33c15b2d reputation rewards are now applied to character and not properties 2022-03-31 18:17:58 -07:00
EmosewaMC
0bf2d398ea moved initialization of entity 2022-03-31 18:17:43 -07:00
EmosewaMC
ece83db6ed World packets change
World packets now takes an entity so we can process reputation
2022-03-31 18:17:23 -07:00
EmosewaMC
8ae7bc0f92 Where to send reputation to client 2022-03-31 16:12:36 -07:00
David Markowitz
ccff6746ce
Merge pull request #483 from DarkflameUniverse/hot-fix-hard-coded-database
Fixed a hard coded database issue
2022-03-31 14:14:35 -07:00
EmosewaMC
450bebc8a2 i am a big dum 2022-03-31 14:11:43 -07:00
EmosewaMC
cf70881370 simplified conversion 2022-03-31 03:20:13 -07:00
David Markowitz
4724e0ebc1
Merge pull request #481 from EmosewaMC/buff-station-faction
Corrected faction for Buff Station
2022-03-31 02:50:32 -07:00
Gie "Max" Vanommeslaeghe
95010e791f
Merge pull request #479 from EmosewaMC/property-fixes
Property fixes
2022-03-31 11:21:37 +02:00
EmosewaMC
33b16a56e3 Added a save and fixed a crash
If am item were to be added to properties_contents and an item with that Primary Key already existed, the world would crash.  This addresses this.
2022-03-30 22:51:09 -07:00
EmosewaMC
cc9b6c05f6 removed include 2022-03-30 22:35:41 -07:00
EmosewaMC
9169acad47 changed to update 2022-03-30 22:14:51 -07:00
EmosewaMC
aed0ecc9fc removed newline 2022-03-30 22:05:09 -07:00
EmosewaMC
0561f60031 Added negative checks 2022-03-30 21:58:59 -07:00
EmosewaMC
e66421d34f clarified variable name 2022-03-30 21:58:43 -07:00
EmosewaMC
8462068a05 clarified variable names, used encapsulation 2022-03-30 21:33:25 -07:00
EmosewaMC
8a8b5b4f44 removed new line 2022-03-30 21:18:29 -07:00
EmosewaMC
bc7c543530 removed debug log 2022-03-30 21:15:50 -07:00
EmosewaMC
f22dab0f72 unapproved properties render correctly 2022-03-30 21:12:22 -07:00
EmosewaMC
002025231e Semantics 2022-03-30 20:33:50 -07:00