Commit Graph

1181 Commits

Author SHA1 Message Date
Harmonic
0fc9760894 Merge branch 'fix/#834-trade-untradable-items' into 'dev'
#834 Fixed ability to trade untradable items

See merge request morningstar/Arcturus-Community!359
2020-12-30 18:04:36 -05:00
Remco
82d456a630 Fixed trading untradable items 2020-12-30 19:07:56 +01:00
Remco
c3721a671c Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2020-12-29 21:19:45 +01:00
Harmonic
e54b4e69c2 Merge branch 'patch-furniture-toggle-event' into 'dev'
Furniture Toggle Event

See merge request morningstar/Arcturus-Community!347
2020-12-29 11:10:28 -05:00
Remco
bfeeae82b7 Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2020-12-28 22:09:02 +01:00
Harmonic
e5a98d0330 Merge branch 'pet-stat-save-fix' into 'dev'
Pet stats save fix

See merge request morningstar/Arcturus-Community!351
2020-12-28 15:34:11 -05:00
Harmonic
28feb9e0b9 Missed Quadral from Credits. 2020-12-28 11:53:31 -08:00
Harmonic
a8c57394f4 Updated Credits for MS Contributors in a new about window. 2020-12-28 11:48:09 -08:00
skeletor
ea5d7e361f Merge branch 'patch-room-host' into 'dev'
Room host

See merge request morningstar/Arcturus-Community!352
2020-12-27 13:13:26 -05:00
Snaiker
4fc5a484ae Fix #923 room host achievement
Fixes issue #923
2020-12-27 13:13:26 -05:00
skeletor
d015adcf20 Merge branch 'patch-fix-ach-room-entry' into 'dev'
Fix achievement Room Entry

See merge request morningstar/Arcturus-Community!353
2020-12-27 13:07:16 -05:00
skeletor
c7e4885df7 Merge branch 'patch-fix-favorite-group' into 'dev'
Fix update favorite group (users)

See merge request morningstar/Arcturus-Community!354
2020-12-27 13:00:08 -05:00
Snaiker
02752eb72e Fix update favorite group (users) #746 #488 2020-12-27 13:00:08 -05:00
Snaiker
3f07f3f546 Fix achievement RoomEntry 2020-12-26 04:25:54 +00:00
MartenM
4092b87cb1 Moved the .needsUpdate inside for better encapsulation. 2020-12-24 17:34:28 +01:00
MartenM
ed869c4ef9 Update 'respect' of pets to the database when scratched. 2020-12-24 17:25:53 +01:00
Remco
69f9abc1cc Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2020-12-24 09:19:05 +01:00
Harmonic
8edb5f00fa Merge branch 'patch-easter-eggs' into 'dev'
Setting to enable/disable Easter Eggs

See merge request morningstar/Arcturus-Community!349
2020-12-21 21:32:41 -05:00
Remco
af21a8fbd6 Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2020-12-21 20:13:01 +01:00
Harmonic
eda660c2a7 Merge branch 'guild-right-level-refactor' into 'dev'
Guild right level refactor

See merge request morningstar/Arcturus-Community!337
2020-12-21 08:53:32 -05:00
Harmonic
5bff4ddbb9 Merge branch 'feature/costumegate' into 'dev'
Added EffectGate interaction #901

See merge request morningstar/Arcturus-Community!336
2020-12-21 08:41:55 -05:00
Harmonic
2b3259072a Merge branch 'remco-wired-fixes' into 'dev'
Fixed wired effect bot walks to furni #909

See merge request morningstar/Arcturus-Community!333
2020-12-21 08:19:41 -05:00
Harmonic
d9c7795337 Merge branch 'wired-condition-fix-#907' into 'dev'
Fixed wired condition trigger on furni #907

See merge request morningstar/Arcturus-Community!331
2020-12-21 08:18:57 -05:00
Snaiker
32a788476c Setting to enable/disable Easter Eggs 2020-12-20 14:07:31 +00:00
Snaiker
a8bc9841f4 Furniture Toggle Event 2020-12-18 01:51:56 +00:00
Harmonic
ae137945f3 Updated Version Number. Scrap 2.5, start 3.0. 2020-12-10 09:44:51 -08:00
Remco
356fc3776c Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2020-12-05 13:47:29 +01: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
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