Commit Graph

1203 Commits

Author SHA1 Message Date
skeletor
a08a5e035b Merge branch 'tent-sql-replace' into 'dev'
Moved SQL's for ability to see tentchat to the 2.5.0 RC-1 SQL

See merge request morningstar/Arcturus-Community!340
2020-11-29 15:46:14 -05:00
Remco
894aa39e74 Moved SQL's for ability to see tentchat to the 2.5.0 RC-1 SQL 2020-11-29 15:46:14 -05:00
Remco
224c9fb42d Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2020-11-29 19:49:15 +01:00
skeletor
7c05abb226 Merge branch 'feature/permissions-see-tent-chat' into 'dev'
Added permission to view the chat of users in the tent

See merge request morningstar/Arcturus-Community!298
2020-11-29 00:07:20 -05:00
Remco
186c7d1933 Revert "Merge branch 'dev' into feature/permissions-see-tent-chat"
This reverts commit 3097a5583d8f1e2ba01899f60b14870e72492131, reversing
changes made to 523bc9c8610670cb6932a1d69c4681a28ac56235.
2020-11-29 00:07:20 -05:00
skeletor
0760a3fd3e Merge branch 'patch-2' into 'dev'
Add moto length verify (configurable from database)

See merge request morningstar/Arcturus-Community!321
2020-11-28 23:52:21 -05:00
nttzx
aabfaba657 Add moto length verify (configurable from database) 2020-11-28 23:52:21 -05:00
Dank074
366f7ebb87 fixed memory leak in encryption codec 2020-11-28 20:34:36 -06:00
Remco
fd0eb0c2a5 Refactored todo guildRightLevel method 2020-11-24 14:40:42 +01:00
Remco
f952ac15d2 Changed CostumeHopper to EffectHopper and made effect configurable with customparams 2020-11-23 15:10:27 +01:00
Remco
771f386b56 Fixed onclick method 2020-11-23 14:00:43 +01:00
Remco
f4719ee042 Costume gates doesnt send a custom message when not allowed to get through 2020-11-23 13:42:50 +01:00
Remco
afb6e02800 Made costumegate allow costumes (enables) 2020-11-23 13:29:50 +01:00
Remco
097edff638 Removed unnecessary usings 2020-11-23 11:57:13 +01:00
Remco
3353b822e4 Added costumegate interaction and refactored other conditional gates 2020-11-23 11:53:12 +01:00
Remco
81d49cc4c4 Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2020-11-23 10:04:07 +01:00
Harmonic
46c8e9fc62 Merge branch 'beny-wired-fixes' into 'dev'
Beny wired fixes

See merge request morningstar/Arcturus-Community!334
2020-11-20 16:11:26 -05:00
Harmonic
e10e5da7b5 Merge branch 'user-catalog-purchased-item-event' into 'dev'
Fixed UserCatalogItemPurchasedEvent when user already has the badge

See merge request morningstar/Arcturus-Community!330
2020-11-20 16:09:26 -05:00
Harmonic
68c1042ab4 Merge branch 'trade-event-plugin' into 'dev'
Trade Confirm Plugin Event

See merge request morningstar/Arcturus-Community!329
2020-11-20 16:09:17 -05:00
Harmonic
331fefa2f1 Merge branch 'redeem-item-points-type' into 'dev'
Furniture Redeemed Event point type fix

See merge request morningstar/Arcturus-Community!327
2020-11-20 16:09:07 -05:00
Remco
c7a0af4387 Fixed wired effect bot walk to furni 2020-11-20 21:22:39 +01:00
Remco
703a2e8659 Fixed a leftover bug 2020-11-19 14:04:38 +01:00
Remco
b01426646a Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2020-11-19 13:26:00 +01:00
Remco
a4beae1e7d Fixed wired condition trigger on furni issue #907 2020-11-18 18:47:26 +01:00
ArpyAge
645e79e41f Fixed UserCatalogItemPurchasedEvent when user already has the badge 2020-11-18 01:55:49 +01:00
ArpyAge
cea97ac558 Trade Confirm Plugin Event 2020-11-18 01:41:14 +01:00
ArpyAge
a72ebee603 Furniture Redeemed Event point type fix 2020-11-17 21:15:37 +01:00
Beny
703954e984 Merge branch 'vendingmachine-wired-fix' into 'beny-wired-fixes'
Fixed vendingmachine issue #910

See merge request morningstar/Arcturus-Community!326
2020-11-17 09:01:12 -05:00
Remco
6d93b0d7b1 Fixed vendingmachine issue 910 2020-11-17 14:20:34 +01:00
Beny
20dc312a25 Merge remote-tracking branch 'origin/beny-wired-fixes' into beny-wired-fixes 2020-11-16 12:12:46 +01:00
Beny
31e069938c Some wired saves as JSON now 2020-11-16 12:12:24 +01:00
harmonic
c9f3afaf07 Fixed Typo. Thanks Arpy... 2020-11-16 00:05:02 +00:00
harmonic
f81b56b63b Added Beta prompt. 2020-11-16 00:03:26 +00:00
Beny
8fb1aabc55 Fixed not walking to vending machine if seat infront 2020-11-15 22:44:20 +01:00
Beny
840dd426d3 Fix trophies breaking wired 2020-11-15 22:43:32 +01:00
Beny
912d06b44b Fixed wired state changed trigger on vending machines 2020-11-15 22:30:34 +01:00
Harmonic
f6dcf3a7b3 Merge branch 'patch-freeze-lives' into 'dev'
freeze lives packet should use virtual id

See merge request morningstar/Arcturus-Community!325
2020-11-15 15:38:31 -05:00
Dank074
e42f42d08d freeze lives packet should use virtual id 2020-11-13 02:28:30 -06:00
ArpyAge
08ba0de482 Merge branch 'command-cancel-event' into 'dev'
Command Cancel Event

See merge request morningstar/Arcturus-Community!324
2020-11-10 18:58:50 -05:00
ArpyAge
d867160e08 Command Cancel Event 2020-11-10 22:13:06 +01:00
Harmonic
accf00d93b Merge branch 'subscription-patch' into 'beny-wired-fixes'
fixed HC subscription client rights

See merge request morningstar/Arcturus-Community!322
2020-11-06 18:16:00 -05:00
skeletor
3d29797f7b fixed HC subscription client rights 2020-11-06 18:16:00 -05:00
Remco
9ae0e26de0 Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2020-11-03 00:37:55 +01:00
Beny
c76b1b994f Fixed ConcurrentModificationException in Game.saveScores Closes #882 2020-11-02 03:39:15 +01:00
Beny
44b7b25b43 Fixed NPE in Room.getItemsAt Closes #881 #883 2020-11-02 03:10:13 +01:00
Beny
4992b759e4 You can now only open highscores with rights or wired. Closes #885 2020-11-02 02:49:15 +01:00
Beny
854333a145 Walk on/off now triggers on a wired furni (why was this even disabled?) Closes #886 2020-11-02 02:32:27 +01:00
Beny
acef46e004 WiredEffectGiveScoreToTeam now executes without a player 2020-10-31 13:32:56 +01:00
Beny
01d1fefdff Wired fixes 2020-10-31 03:11:33 +01:00
Beny
abc1c6905f Fixed rotating items goes above height limit. Made height limit variable. 2020-10-22 02:09:35 +02:00