Commit Graph

1627 Commits

Author SHA1 Message Date
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
4e1c240db4 Update 3_0_0 to 3_0_1.sql 2022-03-02 20:08:34 -03: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
Remco
b3ccc64a7e Merge branch 'fix-catalog-voucher' into 'dev'
Cleanup redeem voucher

See merge request morningstar/Arcturus-Community!480
2022-03-02 22:20:16 +00:00
Snaiker
3b8caee5de Cleanup redeem voucher 2022-03-02 22:20:16 +00:00
Remco
e1e18064b1 Merge branch 'youtube-fix' into 'dev'
Fix YoutubeTV

See merge request morningstar/Arcturus-Community!484
2022-03-02 22:13:56 +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
ArpyAge
5caf43ce1f Merge branch 'dev' into 'master'
Fix Issue SubscriptionCommand NPE

See merge request morningstar/Arcturus-Community!463
2022-01-18 23:05:13 +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
ArpyAge
0d5a01902c Merge branch 'dev' into 'dev'
Allow arcturus to run as sevice in linux

See merge request morningstar/Arcturus-Community!452
2021-12-20 20:26:15 +00:00
duckietm
8b7859e559 Console output enabled by default 2021-12-20 20:24:18 +00:00
duckietm
7d8c4747a7 Update 3_0_0 to 3_0_1.sql 2021-12-20 20:13:55 +00:00
duckietm
a5d11b98e2 Move the update 2021-12-20 20:13:31 +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
duckietm
92636bbdc5 Update database to enable or disable TTY in console 2021-12-09 07:39:16 +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
ArpyAge
e0a1b33e16 Merge branch 'fix/room-lay-rotation' into 'dev'
Fix lay rotation with beds from FurniBuilder

See merge request morningstar/Arcturus-Community!451
2021-10-08 21:09:53 +00:00
Mike
8da35220e3 Fix room lay rotation with beds from FurniBuilder 2021-10-08 22:50:24 +02:00