nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-06-30 12:45:34 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,444 Commits 6 Branches 30 Tags 9.5 MiB
287af8aba4
Commit Graph

802 Commits

Author SHA1 Message Date
brenoepics
287af8aba4 Fix calendar timestamp 2022-03-21 19:16:31 -03: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
ddef2543fe Fix issue NPE 2022-03-18 02:46:18 +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
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
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
brenoepics
f022c31f3d Update ModToolManager.java 2022-02-21 17:49:03 -03: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
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
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
Mike
8da35220e3 Fix room lay rotation with beds from FurniBuilder 2021-10-08 22:50:24 +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
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
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
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
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