Commit Graph

1133 Commits

Author SHA1 Message Date
Snaiker
32a788476c Setting to enable/disable Easter Eggs 2020-12-20 14:07:31 +00:00
skeletor
1bb8719cab Merge branch 'patch-netty-memory-leak' into 'dev'
Fix #915 : netty memory leak

See merge request morningstar/Arcturus-Community!338
2020-11-29 16:03:50 -05:00
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
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
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
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
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
Beny
4f5b6deb77 Fixed teleport wired 2020-10-19 02:03:24 +02:00
Beny
d1f18a2154 Update 2_4_0 to 2_5_0-RC-1.sql 2020-10-16 03:22:12 -04:00
Beny
16d2ba85ae Added next step height checking in RoomUnit cycle - Closes #858 2020-10-16 06:04:31 +02:00
Beny
90918309b7 Rollers and teleporting to seats fixed 2020-10-16 05:50:57 +02:00
Beny
0dee065524 Fix banzai teleport link with others of different type #825 2020-10-15 13:54:54 +02:00
Beny
a034d5938a Merge branch 'dev' into beny-wired-fixes 2020-10-15 13:41:22 +02:00
Beny
0d0f0d3373 Figuredata parses correctly with whitespace now 2020-10-15 13:40:43 +02:00
Beny
62ffa14c40 Football fixes 2020-10-15 13:40:01 +02:00
Beny
67c1a3dea7 Fix unable to purchase bundle 2020-10-15 11:55:24 +02:00
Beny
6d54a957f5 InteractionWaterItem now extends InteractionMultiHeight 2020-10-15 11:33:15 +02:00
Beny
b49a0e652a Effect now apply correctly on pressureplate - Closes #752 2020-10-15 11:22:45 +02:00
Beny
bf704b4e23 Effect now apply correctly on pressureplate - Closes #752 2020-10-15 11:15:07 +02:00