Commit Graph

1207 Commits

Author SHA1 Message Date
ArpyAge
e1be700dfd Merge remote-tracking branch 'origin/dev' into dev 2021-10-09 00:22:44 +02:00
ArpyAge
3ab32b6850 Debug mode for the non existent SSO message 2021-10-09 00:22:16 +02:00
Mike
8da35220e3 Fix room lay rotation with beds from FurniBuilder 2021-10-08 22:50:24 +02:00
ArpyAge
7b1e94cf17 Correct amount of max rooms 2021-10-07 19:08:03 +02:00
ArpyAge
d327f8cbe6 Accept friend request of offline user 2021-09-07 22:47:00 +02:00
ArpyAge
3ffee0aa4c Ability to change guild settings while not in a room 2021-09-05 13:43:19 +02:00
Kitt Mustang
8f24dd48d0 Fix ticks in crackable furni interaction. 2021-09-05 02:53:10 +00:00
ArpyAge
7cbc8cc162 Battle Banzai nullpointers and disconnect fix 2021-09-04 03:12:37 +02:00
ArpyAge
1b82658bd3 Fix trap interaction (Kitt Mustang) 2021-09-03 16:25:27 +02:00
ArpyAge
9386ad4663 Custom Wired small fix 2021-09-02 14:59:33 +02:00
ArpyAge
cd335ed316 Merge branch 'fix/navigatorOrderNum' into 'dev'
update navigator

See merge request morningstar/Arcturus-Community!420
2021-09-02 12:19:59 +00:00
ArpyAge
b2f5c5fe71 Merge branch 'master' into 'dev'
COUNT() always return something, statement found would be always true.

See merge request morningstar/Arcturus-Community!440
2021-09-02 00:32:33 +00:00
Raizer
e76c2de94a COUNT() always return something, statement found would be always true. 2021-09-02 00:32:33 +00:00
ArpyAge
a2781e3a52 Merge branch 'patch/infinite-recursion' into 'dev'
fixed inifnite recursion

See merge request morningstar/Arcturus-Community!442
2021-09-01 23:57:15 +00:00
skeletor
423211bc70 fixed inifnite recursion 2021-09-01 23:57:15 +00:00
ArpyAge
6049c195d6 Reverted Wired Condition inner workings because it seemed to only give problems and nullpointers 2021-09-02 01:41:33 +02:00
ArpyAge
da5fa49766 Merge branch 'feature/fix-marketplace-search' into 'dev'
Fix SQL query upon searching in Marketplace

See merge request morningstar/Arcturus-Community!428
2021-09-01 22:44:15 +00:00
Thijmen
ba5a0976e3 Tile error, possible scripting 2021-09-01 22:43:04 +00:00
Thijmen Stavenuiter
ff92e4471c Fix SQL query upon searching in Marketplace 2021-09-01 15:39:35 +00:00
ArpyAge
9acc3f9359 Fix text on Stalk Command (by Snaiker)
And some emulator_settings for the previous commit
2021-09-01 17:36:32 +02:00
ArpyAge
f7ee2ddf72 Merge branch 'feature/friendrequest-fixes' into 'dev'
Fix offline friendrequests

See merge request morningstar/Arcturus-Community!306
2021-09-01 14:39:03 +00:00
Remco
f77693d2e5 Fix offline friendrequests 2021-09-01 14:39:03 +00:00
ArpyAge
40793258b6 Custom configs added for wired (multiple users teleporting at the same time)
Custom place/rotate under user setting
Custom walk on furni if placed/rotated under user setting
2021-08-30 15:46:15 +02:00
SenpaiDipper
4ab008f3c6 Consistency... 2021-05-26 06:29:52 +00:00
Remco
8d8b9c175c Fixed conflict in readme 2021-04-06 22:34:58 +02:00
Remco
6247133643 Now we are really getting ready for 3.0.0-stable 2021-04-06 22:11:26 +02:00
Layne
abd395d8bd update navigator 2021-03-08 12:40:41 -05:00
Thijmen Stavenuiter
0ca39a0bbe merge dev 2021-03-08 15:14:45 +01:00
Thijmen Stavenuiter
5398a04b47 Don't send the page if HC condition is not met. 2021-03-08 15:06:19 +01:00
Remco
f186420abe Mannequin save look event now checks for acc_anyroomowner 2021-03-08 15:06:14 +01:00
Remco
e62973f5d1 Mannequin save look event now checks for acc_anyroomowner 2021-03-08 15:06:14 +01:00
Beny
b02beb8ce3 Fix monster plant duplication glitch 2021-03-07 18:05:39 +00:00
Remco
113103492e Merge branch 'fix-issue-956' into 'dev'
Fix issue #956

See merge request morningstar/Arcturus-Community!415
2021-03-07 13:37:13 +00:00
Remco
3873c0deb4 Merge branch 'fix-issue-957' into 'dev'
Fix issue #957

See merge request morningstar/Arcturus-Community!414
2021-03-07 12:37:05 +00:00
Snaiker
968e980129 Fix 2021-03-05 23:06:40 +00:00
Snaiker
db25a6d8ee Fix 2021-03-05 23:05:09 +00:00
Snaiker
7106026b73 Hide mail 2021-03-05 22:33:12 +00:00
Remco
9f2449ec36 Renamed incoming packet variable 2021-03-02 20:48:13 +01:00
Remco
1685065b32 Fixed BuyRoomPromotion exploit 2021-03-02 12:46:17 +01:00
Remco
b971ce1f83 Fixed exploit that made it possible to trade untradable items 2021-03-02 12:21:15 +01:00
Thijmen
234392a269 When creating a new item for the wardrobe, save it in the Set so it can be retreived later 2021-02-28 13:26:56 +01:00
Remco
a1af30b8e3 Merge branch 'fix/EnableNotificationsComposer' into 'dev'
Bubble Alerts now work without debugging mode on

See merge request morningstar/Arcturus-Community!406
2021-02-15 22:24:57 +00:00
Remco
5d6e239c70 Renamed packet 2021-02-15 23:20:22 +01:00
skeletor
517ac9a0b6 Revert "Update UpdateNavigatorCommand.java"
This reverts commit b7f5864758
2021-02-13 21:32:28 -05:00
Harmonic
ecd1bf30c1 Add club only check functionality to CatalogManager 2021-02-11 23:35:57 +00:00
Harmonic
3c18b060cc Updated HC Badge Achievement so it no longer requires payday to be enabled. 2021-02-10 19:03:52 +00:00
Thijmen
e9e96a0c11 Don't do calculation server side - client relies on the amount of days the offer needs to have. 2021-02-09 17:03:25 -05:00
Remco
926e817e4f Revert "Merge branch 'Snaiker/Arcturus-Community-patch-fix-issue-934' into dev"
This reverts merge request !362
2021-02-09 10:42:09 -05:00
skeletor
d11d3546a8 Merge branch 'fix-ping' into 'dev'
fixed pinging to send every 30 seconds, regardless of idle state

See merge request morningstar/Arcturus-Community!401
2021-02-09 08:24:58 +00:00
Dank074
0bbe249cee fixed pinging to send every 30 seconds, regardless of idle state 2021-02-09 01:35:43 -06:00
Remco
a93aad2b66 Merge branch 'dev' into Snaiker/Arcturus-Community-patch-fix-issue-934 2021-02-07 22:19:43 +01:00
Remco
5531c20644 Merge branch 'fix/timer-threading' into 'dev'
#949 Fixed game timer threading issue

See merge request morningstar/Arcturus-Community!399
2021-02-04 20:53:58 +00:00
Harmony
e03a76f30c Merge branch 'fix-ban-empty-machine-id' into 'dev'
fix ban behavior for empty machine id/ip address

See merge request morningstar/Arcturus-Community!398
2021-02-04 20:09:14 +00:00
Remco
f527527787 Gifting yourself won't progress achievements anymore 2021-02-04 21:05:38 +01:00
Remco
8ad3aeb6b2 Fixed game timer threading issue 2021-02-04 19:59:16 +01:00
Dank074
35f81f96c4 fix ban behavior for empty machine id/ip address 2021-02-03 19:16:50 -06:00
Remco
1949ed4c66 Merge branch 'fix/mannequin-save-name-event' into 'dev'
MannequinSaveNameEvent now checks for acc_anyroomowner

See merge request morningstar/Arcturus-Community!397
2021-02-03 16:54:54 +00:00
Remco
2bb55a8e38 MannequinSaveNameEvent now checks for acc_anyroomowner 2021-02-03 17:53:00 +01:00
Remco
4c096ae8d1 Mannequin save look event now checks for acc_anyroomowner 2021-02-02 18:21:02 +01:00
Remco
d7e96d9475 Mannequin save look event now checks for acc_anyroomowner 2021-02-02 18:18:08 +01:00
Remco
64b75a0be6 Fixed wired Condition: Trigger is NOT on furni 2021-02-01 19:09:11 +01:00
Dank074
610144851a fixed availabilitystatus packet 2021-01-29 19:31:26 -06:00
Remco
b20411c37d Merge branch 'feature/secure-login-event-logging' into 'dev'
Added logging for SecureLoginEvent

See merge request morningstar/Arcturus-Community!392
2021-01-29 23:03:07 +00:00
Remco
e4f2a792e8 Added logging for SecureLoginEvent 2021-01-29 23:53:55 +01:00
Remco
fe31b37aa1 Bot now only serves once when the distance is more than reach distance 2021-01-29 19:28:18 +01:00
Remco
5851162a63 Bot now only serves once when the distance is more than reach distance 2021-01-29 19:08:41 +01:00
Dank074
c14746a05f add option to force encryption 2021-01-28 01:34:59 -06:00
Remco
eee24c9830 Merge branch 'dev' into refactor/WiredConditionNotMatchStatePosition 2021-01-23 23:33:29 +01:00
Remco
ba145e6113 Fixed daily respects 2021-01-23 19:51:56 +01:00
Remco
433e02497c Refactored WiredConditionNotMatchStatePosition 2021-01-23 18:56:04 +01:00
Remco
ca26e7cf37 Merge branch 'dev' into fix/wired-bot-talk 2021-01-23 15:27:22 +01:00
Dank074
48cef2ed70 added plugin event for getting user ip 2021-01-17 01:50:17 -06:00
Remco
a0cfe07ca3 Readded packet 2021-01-11 22:20:06 +01:00
Harmonic
5b1ffa5bee Fixed sql update. Added debug mode check for TooLongFrameException Error. 2021-01-10 15:30:21 -08:00
Harmonic
934741ea16 Merge branch 'dev' into 'wired-to-json'
# Conflicts:
#   sqlupdates/2_4_0 to 3_0_BETA_1.sql
2021-01-10 18:06:29 -05:00
Harmonic
f4869a6305 Revert "Merge branch 'feature/packet-1094' into 'dev'"
This reverts merge request !366
2021-01-10 18:04:47 -05:00
Harmonic
7e78994d69 Merge branch 'feature/roombadge' into 'dev'
Added roombadge command

See merge request morningstar/Arcturus-Community!364
2021-01-10 17:55:02 -05:00
Harmonic
fc93da68ea Merge branch 'fix/fireworks' into 'dev'
Fireworks working like Habbo

See merge request morningstar/Arcturus-Community!360
2021-01-10 17:54:35 -05:00
Harmonic
ebd79e4b79 Merge branch 'patch-fix-issue-936' into 'dev'
Fix issue #936

See merge request morningstar/Arcturus-Community!365
2021-01-10 17:52:56 -05:00
Harmonic
351dfe1371 Merge branch 'fix/#876-effect-tile-keep-effect' into 'dev'
Effect tile interaction now keeps the effect after walkoff. Fixes #876 and #931

See merge request morningstar/Arcturus-Community!357
2021-01-10 17:51:41 -05:00
Remco
40914b5050 Renamed incoming event 2021-01-10 23:10:15 +01:00
Remco
de7c51d78a Added ratelimit 2021-01-10 22:15:20 +01:00
Remco
53fc7ece4a Renamed event since it applies to both conditions and effects 2021-01-10 20:55:09 +01:00
Remco
2313276df0 Removed debugging code 2021-01-10 20:50:03 +01:00
Remco
32e7c29f84 Removed commented code 2021-01-10 20:47:26 +01:00
Remco
35ac99b2c6 Added Apply furni to set conditions feature 2021-01-10 20:45:44 +01:00
Snaiker
5981046523 Fix issue 936 2021-01-10 02:49:15 +00:00
Remco
8a89f7ce4d Actually added the RoomBadgeCommand 2021-01-06 20:39:30 +01:00
Remco
4937ac298d Added roombadge command 2021-01-06 20:24:04 +01:00
Remco
ad84ef423e WiredConditionTriggerOnFurni now saves as JSON 2021-01-04 23:15:01 +01:00
Remco
ac1c6a3d9b WiredConditionNotTriggerOnFurni now saves as JSON 2021-01-04 23:13:21 +01:00
Remco
190a5cf860 WiredConditionNotMatchStatePosition now saves as JSON 2021-01-04 23:10:50 +01:00
Remco
5617cd3da2 WiredConditionTeamMember now saves as JSON 2021-01-04 23:07:36 +01:00
Remco
bea21b715e WiredConditionNotInTeam now saves as JSON 2021-01-04 23:05:45 +01:00
Remco
a1bf9d7aa7 WiredConditionNotHabboWearsBadge now saves as JSON 2021-01-04 22:49:45 +01:00
Remco
218cb2f3fb WiredConditionNotHabboHasEffect now saves as JSON 2021-01-04 22:48:08 +01:00
Remco
ecfeaa9a5f WiredConditionNotHabboCount now saves as JSON 2021-01-04 22:45:49 +01:00
Remco
b6b4ac936e WiredConditionNotFurniTypeMatch now saves as JSON 2021-01-04 22:42:13 +01:00
Remco
87ff24e409 WiredConditionNotFurniHaveHabbo now saves as JSON 2021-01-04 22:38:20 +01:00
Remco
3488c8ad36 WiredConditionNotFurniHaveFurni now saves as JSON 2021-01-04 22:33:33 +01:00
Remco
277464b365 WiredConditionMoreTimeElapsed now saves as JSON 2021-01-04 22:30:17 +01:00
Remco
e6a5aaa279 WiredConditionMatchStatePosition now saves as JSON 2021-01-04 22:28:17 +01:00
Remco
fe52ad3458 WiredConditionLessTimeElapsed now saves as JSON 2021-01-04 22:12:45 +01:00
Remco
7797e7f7cd WiredConditionHabboWearsBadge now saves as JSON 2021-01-04 22:09:29 +01:00
Remco
b9029cf1f3 WiredConditionHabboHasHandItem now saves as JSON 2021-01-04 22:06:19 +01:00
Remco
52650abfad WiredConditionHabboHasEffect now saves as JSON 2021-01-04 22:03:05 +01:00
Remco
4d10af2b41 WiredConditionHabboCount now saves as JSON 2021-01-04 22:00:18 +01:00
Remco
da751cca42 WiredConditionFurniTypeMatch now saves as JSON 2021-01-04 21:52:45 +01:00
Remco
f8520919ba WiredConditionFurniHaveHabbo now saves as JSON 2021-01-04 21:47:13 +01:00
Remco
8fe9cadb76 Fixed wireddata incompatibility issue 2021-01-04 21:43:14 +01:00
Remco
3960ee53f5 WiredConditionFurniHaveFurni now saves as JSON 2021-01-04 21:36:42 +01:00
Remco
0769e85a27 WiredConditionDateRangeActive now saves as JSON 2021-01-04 21:29:12 +01:00
Remco
069bffb907 WiredTriggerHabboWalkOnFurni now saves as JSON 2021-01-04 21:23:59 +01:00
Remco
c6af5baa70 WiredTriggerHabboWalkOffFurni now saves as JSON 2021-01-04 21:18:02 +01:00
Remco
19b1b187a5 Removed delay since its not used 2021-01-04 21:07:17 +01:00
Remco
b8ea8fcd1b WiredTriggerFurniStateToggled now saves as JSON 2021-01-04 20:59:52 +01:00
Remco
75b61b1809 WiredData now saves as JSON import fixes 2021-01-04 19:03:42 +01:00
Remco
5720adf61c WiredEffectMoveFurniTowards now saves as json import fix 2021-01-04 18:54:59 +01:00
Remco
09e2916310 WiredTriggerScoreAchieved now saves as json 2021-01-04 10:30:19 -05:00
Remco
eaeafd21ad WiredTriggerRepeaterLong now saves as json 2021-01-04 10:27:26 -05:00
Remco
9b62b43907 WiredTriggerRepeater now saves as json 2021-01-04 10:25:46 -05:00
Remco
4fcf750763 WiredTriggerHabboSaysKeyword now saves as json 2021-01-04 09:40:53 -05:00
Remco
4123593308 WiredTriggerHabboEntersRoom now saves as json 2021-01-04 09:31:11 -05:00
Remco
0cdadfab8b WiredTriggerBotReachedFurni now saves as json 2021-01-04 08:20:37 -05:00
Remco
b781f1d731 WiredTriggerBotReachedHabbo now saves as json 2021-01-04 08:19:56 -05:00
Remco
fd90c23a3a WiredTriggerBotReachedFurni now saves as json 2021-01-04 08:14:51 -05:00
Remco
abe70991a0 WiredTriggerAtTimeLong now saves as json 2021-01-04 07:57:18 -05:00
Remco
7c8789a124 WiredTriggerAtSetTime now saves as json 2021-01-04 07:53:32 -05:00
Remco
a849328412 WiredEffectTriggerStacks now saves as json 2021-01-04 07:09:37 -05:00
Remco
eb00da28ef WiredEffectToggleRandom now saves as json 2021-01-04 06:55:33 -05:00
Remco
39d20520cb WiredEffectToggleFurni now saves as json 2021-01-04 06:44:08 -05:00
Remco
e73625806f WiredEffectTeleport now saves as json 2021-01-04 06:35:58 -05:00
Remco
9b6ae05ac3 WiredEffectResetTimers now saves as json 2021-01-04 06:20:28 -05:00
Remco
b1e9276940 WiredEffectMuteHabbo now saves as json 2021-01-04 06:12:20 -05:00
Remco
9341d164a9 WiredEffectMoveRotateFurni now saves as json 2021-01-04 06:03:19 -05:00
Remco
8a3361ec5e WiredEffectMoveFurniTowards now saves as json 2021-01-04 05:30:29 -05:00
Remco
a17dd00fcb WiredEffectMoveFurniTo now saves as json 2021-01-03 23:47:59 +01:00
Remco
4afdf1b4b0 WiredEffectMoveFurniAway now saves as json 2021-01-03 23:32:52 +01:00
Remco
74e631f00a WiredEffectGiveHotelviewBonusRarePoints now saves as json 2021-01-03 23:32:10 +01:00
Snaiker
dc8c0e0bcb Fix issue #934 2021-01-03 21:58:43 +00:00
Remco
c7bfcf76e5 Fix typo 2021-01-03 17:38:49 +01:00
Remco
9090470100 Fireworks working like Habbo 2021-01-03 17:33:27 +01:00
Remco
82d456a630 Fixed trading untradable items 2020-12-30 19:07:56 +01:00
Remco
02cb78f710 Effect_tile interaction now keeps the effect after walkoff 2020-12-29 21:54:03 +01:00
Harmonic
e54b4e69c2 Merge branch 'patch-furniture-toggle-event' into 'dev'
Furniture Toggle Event

See merge request morningstar/Arcturus-Community!347
2020-12-29 11:10:28 -05:00
Remco
8c161284f8 Added default values for wired variables 2020-12-28 21:49:39 +01:00
Remco
09294f9928 Bot variables are now available for use in wireds 2020-12-28 21:45:48 +01:00
Harmonic
e5a98d0330 Merge branch 'pet-stat-save-fix' into 'dev'
Pet stats save fix

See merge request morningstar/Arcturus-Community!351
2020-12-28 15:34:11 -05:00
Harmonic
28feb9e0b9 Missed Quadral from Credits. 2020-12-28 11:53:31 -08:00
Harmonic
a8c57394f4 Updated Credits for MS Contributors in a new about window. 2020-12-28 11:48:09 -08:00
skeletor
ea5d7e361f Merge branch 'patch-room-host' into 'dev'
Room host

See merge request morningstar/Arcturus-Community!352
2020-12-27 13:13:26 -05:00
Snaiker
4fc5a484ae Fix #923 room host achievement
Fixes issue #923
2020-12-27 13:13:26 -05:00
skeletor
d015adcf20 Merge branch 'patch-fix-ach-room-entry' into 'dev'
Fix achievement Room Entry

See merge request morningstar/Arcturus-Community!353
2020-12-27 13:07:16 -05:00
Snaiker
02752eb72e Fix update favorite group (users) #746 #488 2020-12-27 13:00:08 -05:00
Snaiker
3f07f3f546 Fix achievement RoomEntry 2020-12-26 04:25:54 +00:00
MartenM
4092b87cb1 Moved the .needsUpdate inside for better encapsulation. 2020-12-24 17:34:28 +01:00
MartenM
ed869c4ef9 Update 'respect' of pets to the database when scratched. 2020-12-24 17:25:53 +01:00
Harmonic
8edb5f00fa Merge branch 'patch-easter-eggs' into 'dev'
Setting to enable/disable Easter Eggs

See merge request morningstar/Arcturus-Community!349
2020-12-21 21:32:41 -05:00
Harmonic
eda660c2a7 Merge branch 'guild-right-level-refactor' into 'dev'
Guild right level refactor

See merge request morningstar/Arcturus-Community!337
2020-12-21 08:53:32 -05:00
Harmonic
5bff4ddbb9 Merge branch 'feature/costumegate' into 'dev'
Added EffectGate interaction #901

See merge request morningstar/Arcturus-Community!336
2020-12-21 08:41:55 -05:00
Harmonic
2b3259072a Merge branch 'remco-wired-fixes' into 'dev'
Fixed wired effect bot walks to furni #909

See merge request morningstar/Arcturus-Community!333
2020-12-21 08:19:41 -05:00
Harmonic
d9c7795337 Merge branch 'wired-condition-fix-#907' into 'dev'
Fixed wired condition trigger on furni #907

See merge request morningstar/Arcturus-Community!331
2020-12-21 08:18:57 -05:00
Snaiker
32a788476c Setting to enable/disable Easter Eggs 2020-12-20 14:07:31 +00:00
Snaiker
a8bc9841f4 Furniture Toggle Event 2020-12-18 01:51:56 +00:00
TenShie
b9e103e89b Adding Comments after debugging the Source SWF 2020-12-12 05:52:09 -05:00
Harmonic
ae137945f3 Updated Version Number. Scrap 2.5, start 3.0. 2020-12-10 09:44:51 -08:00
skeletor
1bb8719cab Merge branch 'patch-netty-memory-leak' into 'dev'
Fix #915 : netty memory leak

See merge request morningstar/Arcturus-Community!338
2020-11-29 16:03:50 -05:00
skeletor
7c05abb226 Merge branch 'feature/permissions-see-tent-chat' into 'dev'
Added permission to view the chat of users in the tent

See merge request morningstar/Arcturus-Community!298
2020-11-29 00:07:20 -05:00
Remco
186c7d1933 Revert "Merge branch 'dev' into feature/permissions-see-tent-chat"
This reverts commit 3097a5583d8f1e2ba01899f60b14870e72492131, reversing
changes made to 523bc9c8610670cb6932a1d69c4681a28ac56235.
2020-11-29 00:07:20 -05:00
nttzx
aabfaba657 Add moto length verify (configurable from database) 2020-11-28 23:52:21 -05:00
Dank074
366f7ebb87 fixed memory leak in encryption codec 2020-11-28 20:34:36 -06:00
Remco
fd0eb0c2a5 Refactored todo guildRightLevel method 2020-11-24 14:40:42 +01:00
Remco
f952ac15d2 Changed CostumeHopper to EffectHopper and made effect configurable with customparams 2020-11-23 15:10:27 +01:00
Remco
771f386b56 Fixed onclick method 2020-11-23 14:00:43 +01:00
Remco
f4719ee042 Costume gates doesnt send a custom message when not allowed to get through 2020-11-23 13:42:50 +01:00
Remco
afb6e02800 Made costumegate allow costumes (enables) 2020-11-23 13:29:50 +01:00
Remco
097edff638 Removed unnecessary usings 2020-11-23 11:57:13 +01:00
Remco
3353b822e4 Added costumegate interaction and refactored other conditional gates 2020-11-23 11:53:12 +01:00
Harmonic
46c8e9fc62 Merge branch 'beny-wired-fixes' into 'dev'
Beny wired fixes

See merge request morningstar/Arcturus-Community!334
2020-11-20 16:11:26 -05:00
Harmonic
e10e5da7b5 Merge branch 'user-catalog-purchased-item-event' into 'dev'
Fixed UserCatalogItemPurchasedEvent when user already has the badge

See merge request morningstar/Arcturus-Community!330
2020-11-20 16:09:26 -05:00
Harmonic
68c1042ab4 Merge branch 'trade-event-plugin' into 'dev'
Trade Confirm Plugin Event

See merge request morningstar/Arcturus-Community!329
2020-11-20 16:09:17 -05:00
Harmonic
331fefa2f1 Merge branch 'redeem-item-points-type' into 'dev'
Furniture Redeemed Event point type fix

See merge request morningstar/Arcturus-Community!327
2020-11-20 16:09:07 -05:00
Remco
c7a0af4387 Fixed wired effect bot walk to furni 2020-11-20 21:22:39 +01:00
Remco
703a2e8659 Fixed a leftover bug 2020-11-19 14:04:38 +01:00
Remco
a4beae1e7d Fixed wired condition trigger on furni issue #907 2020-11-18 18:47:26 +01:00
ArpyAge
645e79e41f Fixed UserCatalogItemPurchasedEvent when user already has the badge 2020-11-18 01:55:49 +01:00
ArpyAge
cea97ac558 Trade Confirm Plugin Event 2020-11-18 01:41:14 +01:00
ArpyAge
a72ebee603 Furniture Redeemed Event point type fix 2020-11-17 21:15:37 +01:00
Remco
6d93b0d7b1 Fixed vendingmachine issue 910 2020-11-17 14:20:34 +01:00
Beny
20dc312a25 Merge remote-tracking branch 'origin/beny-wired-fixes' into beny-wired-fixes 2020-11-16 12:12:46 +01:00
Beny
31e069938c Some wired saves as JSON now 2020-11-16 12:12:24 +01:00
harmonic
c9f3afaf07 Fixed Typo. Thanks Arpy... 2020-11-16 00:05:02 +00:00
harmonic
f81b56b63b Added Beta prompt. 2020-11-16 00:03:26 +00:00
Beny
8fb1aabc55 Fixed not walking to vending machine if seat infront 2020-11-15 22:44:20 +01:00
Beny
840dd426d3 Fix trophies breaking wired 2020-11-15 22:43:32 +01:00
Beny
912d06b44b Fixed wired state changed trigger on vending machines 2020-11-15 22:30:34 +01:00
Dank074
e42f42d08d freeze lives packet should use virtual id 2020-11-13 02:28:30 -06:00
ArpyAge
d867160e08 Command Cancel Event 2020-11-10 22:13:06 +01:00
skeletor
3d29797f7b fixed HC subscription client rights 2020-11-06 18:16:00 -05:00
Beny
c76b1b994f Fixed ConcurrentModificationException in Game.saveScores Closes #882 2020-11-02 03:39:15 +01:00