Commit Graph

1073 Commits

Author SHA1 Message Date
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
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
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
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