Commit Graph

1174 Commits

Author SHA1 Message Date
Harmonic
b6b208a81b Merge branch 'fix-npe-wire-reward' into 'dev'
Fix SQL Exception on Wired Give Reward

See merge request morningstar/Arcturus-Community!503
2022-03-21 18:49:36 +00:00
Snaiker
797b887a98 Fix 2022-03-21 18:37:24 +00:00
ArpyAge
b8b5b4b576 Merge branch '@fix/inventory-fragment' into 'dev'
Inventory Fragments

See merge request morningstar/Arcturus-Community!504
2022-03-21 16:36:18 +00:00
Bill
66397c8d98 Fix the busted inventory fragments 2022-03-21 12:31:05 -04:00
Snaiker
5b24a73297 Fix NPE 2022-03-21 12:30:42 +00:00
Remco
c8f787bf32 Merge branch 'fix-packet-integer-room-score' into 'dev'
Fixed RoomDataComposer to send correct room score

See merge request morningstar/Arcturus-Community!496
2022-03-20 20:34:44 +00:00
Snaiker
e7bde3cbee Fixed RoomDataComposer to send correct room score 2022-03-20 20:34:44 +00:00
Remco
ce766fa381 Merge branch 'builder-area' into 'dev'
Feature: InteractionBuildArea

See merge request morningstar/Arcturus-Community!501
2022-03-20 20:29:48 +00:00
brenoepics
21647c8a35 Merge branch 'dev' into 'fix-trophies'
# Conflicts:
#   sqlupdates/3_0_0 to 3_0_1.sql
2022-03-20 19:13:17 +00:00
brenoepics
2cf32fb131 Feature: InteractionBuildArea 2022-03-20 00:14:23 -03:00
Remco
19c1768902 Merge branch 'Update-Loop' into 'dev'
Loop Fix

See merge request morningstar/Arcturus-Community!493
2022-03-19 19:37:16 +00:00
xjoao
84aa16b50e Loop Fix 2022-03-19 19:37:16 +00:00
Remco
d2a867949c Merge branch 'Update-Navigator' into 'dev'
Update Navigator Manager

See merge request morningstar/Arcturus-Community!494
2022-03-19 19:37:00 +00:00
Remco
7efe8bd618 Merge branch 'fix-issue-marketplace-sql' into 'dev'
Fix issue when try cancel the item on marketplace

See merge request morningstar/Arcturus-Community!499
2022-03-19 19:35:57 +00:00
brenoepics
5a66c30e8d Feature Friendlist Categories 2022-03-19 19:34:21 +00:00
brenoepics
b2e0cc6347 Merge branch 'dev' into 'fix-trophies'
# Conflicts:
#   sqlupdates/3_0_0 to 3_0_1.sql
2022-03-19 18:30:32 +00:00
brenoepics
52cf3a388b Merge branch 'dev' into 'calendar-fix'
# Conflicts:
#   sqlupdates/3_0_0 to 3_0_1.sql
2022-03-19 18:26:10 +00:00
Snaiker
5e9b9c7f30 Fix issue when try cancel the item on marketplace 2022-03-19 17:08:15 +00:00
dank074
929e6a1584 oops 2022-03-18 18:47:47 -05:00
dank074
42ca879d61 fix retro style option for forwarding 2022-03-18 18:42:09 -05:00
dank074
1e32abe426 fix homeroom packet 2022-03-18 18:30:14 -05:00
dank074
53fb788fd0 fix packet name 2022-03-18 18:15:39 -05:00
dank074
c63dee00e0 remove inventory refresh on login 2022-03-18 17:49:52 -05:00
dank074
5093d6c745 remove some packets from being sent at login 2022-03-18 17:27:44 -05:00
dank074
5d82a6e426 remove forced room forwarding to home room 2022-03-18 17:26:43 -05:00
Snaiker
ddef2543fe Fix issue NPE 2022-03-18 02:46:18 +00:00
brenoepics
b2fb96fde7 Add gift message max lenght and npe fixes 2022-03-17 11:51:43 +00:00
SenpaiDipper
0a5c4dd57e Receiving Habbo of Hand Item, should Turn Towards Sender. 2022-03-13 16:34:22 +00:00
Harmonic
b587f865d8 Merge branch 'fix-polls' into 'dev'
Fix exception on answering polls without an answer

See merge request morningstar/Arcturus-Community!482
2022-03-07 01:46:12 +00:00
brenoepics
aff5566451 Fix exception on answering polls without an answer 2022-03-07 01:46:12 +00:00
Harmonic
8d525ff60b Merge branch 'fix-remove-rights' into 'dev'
ejectUserFurni on remove room rights

See merge request morningstar/Arcturus-Community!491
2022-03-06 21:48:41 +00:00
brenoepic
b28bf5f4ef Update Room.java 2022-03-06 02:22:05 +00:00
brenoepics
c7ed4a88c2 ejectUserFurni on remove rights 2022-03-05 23:17:27 -03:00
brenoepics
a08f1d1b8a Update RoomPickupItemEvent.java 2022-03-04 21:40:13 -03:00
Remco
f3b0a9d170 Merge branch 'master' into 'dev'
Fix issue #980 - People with rights should be able to edit sticky notes

See merge request morningstar/Arcturus-Community!488
2022-03-03 22:41:48 +00:00
Remco
80bdfb1522 Merge branch 'fix-pressure-plates' into 'dev'
Fix pressure plates

See merge request morningstar/Arcturus-Community!485
2022-03-03 22:27:30 +00:00
brenoepic
e6c1766c2c Fix pressure plates 2022-03-03 22:27:30 +00:00
brenoepics
c4342e20af fix trophies 2022-03-03 16:05:43 -03:00
Remco
d1344c0610 Merge branch 'fix-crackable-issue' into 'dev'
Fix crackable reward wall item

See merge request morningstar/Arcturus-Community!475
2022-03-03 14:26:25 +00:00
Remco
42a65dc54b Merge branch 'crackable-fix' into 'dev'
Fix ticks in crackable furni interaction.

See merge request morningstar/Arcturus-Community!445
2022-03-03 10:03:17 +00:00
brenoepic
6a2b5a9618 Merge branch 'dev' into 'calendar-fix'
# Conflicts:
#   sqlupdates/3_0_0 to 3_0_1.sql
2022-03-02 23:39:34 +00:00
brenoepics
a778054241 calendar update 2022-03-02 20:05:02 -03:00
Remco
e195a108b1 Merge branch 'wordfilter-event-fix' into 'dev'
Fix SupportTicketEvent is fired twice

See merge request morningstar/Arcturus-Community!481
2022-03-02 22:34:21 +00:00
Snaiker
3b8caee5de Cleanup redeem voucher 2022-03-02 22:20:16 +00:00
brenoepic
662befaeb3 Fix YoutubeTV 2022-03-02 22:13:56 +00:00
Remco
9e05691ba6 Merge branch 'mysql-connector-update' into 'dev'
Addresses #889: update mysql connector

See merge request morningstar/Arcturus-Community!339
2022-03-02 21:44:54 +00:00
skeletor
c865bb2382 Addresses #889: update mysql connector 2022-03-02 21:44:53 +00:00
dap
fd8401d4fd Fix issue #980 2022-03-02 15:45:31 +01:00
brenoepics
f022c31f3d Update ModToolManager.java 2022-02-21 17:49:03 -03:00
Snaiker
7b882fd8e7 Fix crackable wall item issue 2022-01-27 12:08:51 +00:00
ArpyAge
4b207a3993 added this. 2022-01-22 02:55:14 +01:00
ArpyAge
d2fc1d6827 Offer ID fix for catalog page highlights 2022-01-22 02:51:57 +01:00
xjoao
ba6a849972 Update Navigator Manager 2022-01-20 12:06:04 +00:00
brenoepic
434db05ce3 Fix SubscriptionCommand NPE on not online user 2022-01-18 22:50:57 +00:00
ArpyAge
20120ea6bb Merge branch 'xjoao-master-patch-29021' into 'dev'
Update ModToolIssue.java removed semicolon

See merge request morningstar/Arcturus-Community!458
2022-01-18 22:22:19 +00:00
ArpyAge
fb30ca1100 Merge branch 'color-wheel' into 'dev'
Fix ColorWheel interaction

See merge request morningstar/Arcturus-Community!461
2022-01-18 22:21:44 +00:00
ArpyAge
cffa8af52e Merge branch 'dev' into 'dev'
Fix issue Buy furniture with a badge attached

See merge request morningstar/Arcturus-Community!462
2022-01-18 22:21:35 +00:00
brenoepic
afcffa96a3 Fix Buy furniture with a badge attatched already own 2022-01-18 21:54:36 +00:00
brenoepic
f126115c3d Fix ColorWheel interaction 2022-01-18 20:36:21 +00:00
xjoao
0abfc64acb Update ModToolIssue.java removed semicolon 2022-01-06 11:08:01 +00:00
ArpyAge
61e30ea920 Merge branch 'master' into 'dev'
Yikes Sorry.

See merge request morningstar/Arcturus-Community!456
2022-01-05 20:07:22 +00:00
SenpaiDipper
f99de2009c Yikes Sorry. 2022-01-05 19:42:04 +00:00
ArpyAge
3042a41c30 Merge branch 'dev' into 'dev'
Feature: Random Fixes that i find.

See merge request morningstar/Arcturus-Community!454
2022-01-04 19:47:22 +00:00
SenpaiDipper
da789fcc1e Added Check for Kick Permission. 2022-01-02 04:16:22 +00:00
SenpaiDipper
c78813a405 Fixed Possible NPE's with System.getProperty 2021-12-19 15:05:48 +00:00
duckietm
f167c6b6cd Adding TTY setting in the emulator 2021-12-09 07:41:10 +00:00
ArpyAge
86cf51ab05 New event to be able to edit floor items while loading room (to hide furniture for example) 2021-11-20 02:55:26 +01:00
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