nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-24 23:40:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,820 Commits 6 Branches 30 Tags 9.6 MiB
3d0330742b
Commit Graph

1820 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ArpyAge
a6391a13f9 Merge branch 'feature/tile-error' into 'dev' 
Tile error, possible scripting

See merge request morningstar/Arcturus-Community!421
 2021-09-01 22:43:04 +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
Remco
be3207eca0 Merge branch 'dev' into 'dev' 
Consistency...

See merge request morningstar/Arcturus-Community!438
 2021-05-26 08:18:20 +00:00
SenpaiDipper
4ab008f3c6 Consistency... 2021-05-26 06:29:52 +00:00
Remco
211531afcd Merge branch 'dev' into 'master' 
Arcturus 3.0.0-stable

Closes #779, #741, #784, #780, #787, #788, #705, #721, #726, #727, #791, #802, #816, #804, #786, #772, #304, #841, #842, #390, #845, #844, #852, #853, #449, #789, #475, #474, #805, #496, #481, #478, #752, #858, #886, #885, #883, #881, #882, #915, #923, #934, #931, #876, #936, #957, and #956

See merge request morningstar/Arcturus-Community!425
 2021-04-06 20:36:25 +00:00
Remco
8d8b9c175c Fixed conflict in readme 2021-04-06 22:34:58 +02:00
Remco
2b1aee87f2 Merge branch 'arc-3-0-0' into 'dev' 
Getting ready for arc 3.0.0-stable

See merge request morningstar/Arcturus-Community!424
 2021-04-06 20:22:45 +00:00
Remco
6247133643 Now we are really getting ready for 3.0.0-stable 2021-04-06 22:11:26 +02:00
Remco
2801e07d5e Getting ready for 3.0.0-stable 2021-04-06 22:09:51 +02:00
Layne
abd395d8bd update navigator 2021-03-08 12:40:41 -05:00
Remco
ea730baa11 Merge branch 'feature/fix-hc-pages' into 'dev' 
Fix HC pages catalogue

See merge request morningstar/Arcturus-Community!418
 2021-03-08 14:39:38 +00: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
Remco
e4a10f5d60 Merge branch 'fix/exploit-fixes' into 'dev' 
Exploit fixes

See merge request morningstar/Arcturus-Community!413
 2021-03-07 12:24:56 +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
Remco
4cd0b8bf3f Merge branch 'Thijmen/Arcturus-Community-feature/fix-wardrobe' into dev 2021-02-28 13:38:35 +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
58d806d660 Merge branch 'revert-b7f58647' into 'dev' 
Revert "Update UpdateNavigatorCommand.java"

See merge request morningstar/Arcturus-Community!405
 2021-02-14 02:33:54 +00: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
Harmonic
ac83132b75 Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2021-02-10 03:33:46 +00:00
Remco
3f152c560c Merge branch 'Thijmen-dev-patch-77239' into 'dev' 
HC Gifts fix

See merge request morningstar/Arcturus-Community!403
 2021-02-09 22:21:53 +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
2806a37615 Merge branch 'revert-d256e653' into 'dev' 
Revert "Merge branch 'Snaiker/Arcturus-Community-patch-fix-issue-934' into dev"

See merge request morningstar/Arcturus-Community!402
 2021-02-09 15:43:24 +00: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