nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-27 08:50:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,025 Commits 6 Branches 30 Tags 9.6 MiB
e24b2afa31
Commit Graph

785 Commits

Author SHA1 Message Date
Mike
29c3dfbb49 Merge branch 'patch-34' into 'dev' 
@override added

See merge request morningstar/Arcturus-Community!216
 2020-06-01 08:51:12 -04:00
Harmonic
3386fc5763 Merge branch 'marketplace-search' into 'dev' 
Enhancement: Marketplace search

See merge request morningstar/Arcturus-Community!202
 2020-05-31 14:13:44 -04:00
harmonic
41f1bf465e Start 2.4.0 rc-2 2020-05-31 19:10:49 +01:00
xjoao
f45844ef65 updated exception 2020-05-29 22:29:14 -04:00
xjoao
bb2c3a270d updated exception 2020-05-29 22:28:00 -04:00
xjoao
3feea72105 @override added 2020-05-29 22:25:23 -04:00
Swirny
5157e12d27 Resolve "Public Room Sorting" 2020-05-29 19:43:30 -04:00
Mike
9e1177cb07 Fixes MachineID sometimes not unique #620. 2020-05-28 22:21:31 +02:00
xjoao
b0aa1996e3 Apply suggestion to src/main/java/com/eu/habbo/networking/Server.java 2020-05-24 16:33:48 -04:00
xjoao
c9d2f46535 updated exception 2020-05-24 15:44:43 -04:00
xjoao
6ebfc66cda optimized statement 2020-05-24 12:50:42 -04:00
Swirny
f9a76c8fc6 Adjusted marketplace search 2020-05-24 11:27:56 +02:00
xjoao
f3042b6b45 Update close for try witch resources 2020-05-22 13:58:45 -04:00
xjoao
d766818ef2 Update exception 2020-05-22 13:38:33 -04:00
xjoao
c46d12f87c Update exception 2020-05-22 13:34:01 -04:00
xjoao
04e2e7847d Update exception 2020-05-22 13:23:35 -04:00
Harmonic
40a1c34e19 Merge branch 'marketplace' into 'dev' 
Set marketplace limit like Habbo

See merge request morningstar/Arcturus-Community!164
 2020-05-15 07:59:47 -04:00
Mike
492c8f6142 Revert ServerMessage release/retain. 2020-05-13 20:55:07 +02:00
Mike
40818513aa Fix packet length. 2020-05-13 00:31:30 +02:00
Mike
ec3a7d8f58 Fix crash when bot message is empty, increase max packet length. 2020-05-13 00:31:30 +02:00
Mike
46ff22f720 Fix all last edge cases. 2020-05-13 00:31:30 +02:00
Mike
463fb82654 Fix more issues. 2020-05-13 00:31:30 +02:00
Mike
4c140d9402 Fix more edge cases. 2020-05-13 00:31:30 +02:00
Mike
a93ffbbbac Added debug. 2020-05-13 00:31:30 +02:00
Mike
ee5a97bbae Add reliability to packets and actually clear the message buffer. 2020-05-13 00:31:30 +02:00
Mike
f9d81ea198 Fix reference counting and repeated composer() calls. 2020-05-13 00:31:30 +02:00
Swirny
6345244ff3 Set marketplace limit like Habbo 2020-05-12 18:14:27 +02:00
KrewsOrg
ea27e419bb revert timestamp commit by zGrav 2020-05-09 17:31:09 +01:00
KrewsOrg
59fad6fa63 2.3.2. Fixed exploits. 2020-05-09 13:32:08 +01:00
Harmonic
e96c9492a4 Merge branch 'feature/rework-logging' into 'new-logging' 
Rework logging, upgrade dependencies and remove unused dependencies

See merge request morningstar/Arcturus-Community!139
 2020-05-08 17:19:14 -04:00
skeletor
d0b673952a Merge branch 'chatlog-timestamp' into 'dev' 
Fixed !146 Chatlog should be orderer by timestamp

See merge request morningstar/Arcturus-Community!151
 2020-05-08 06:31:17 -04:00
Swirny
2e40f295df Chatlog ordered by timestamp 2020-05-08 06:23:37 -04:00
Harmonic
b3d3240e26 Merge branch 'fix-water-cpu-issues' into 'dev' 
Fix water cpu issues

See merge request morningstar/Arcturus-Community!150
 2020-05-08 05:30:44 -04:00
Harmonic
7f987c7446 Merge branch '600-cme' into 'dev' 
fix(Room): pets CME

See merge request morningstar/Arcturus-Community!142
 2020-05-08 05:22:00 -04:00
Harmonic
980cf66815 Merge branch '595-npe' into 'dev' 
fix(WiredEffectMoveFurniTowards): npe

See merge request morningstar/Arcturus-Community!141
 2020-05-08 05:21:49 -04:00
David Silva
31c7ff7b6d fix(Room): pets CME 2020-05-05 13:59:12 +02:00
David Silva
145c02681f fix(WiredEffectMoveFurniTowards): npe 2020-05-05 12:57:18 +02:00
Mike
401af627ff Fix exception spam on busy hotels. 2020-05-05 04:00:02 +02:00
Mike
2bc4bc3473 Added stub for old logger so plugins don't break. 2020-05-05 03:56:21 +02:00
Mike
ca5ca73a9d Try to improve build size by reducing dependencies used for logging. 2020-05-05 02:24:33 +02:00
Mike
fd2293342f Add rolling files. 2020-05-05 01:59:28 +02:00
Mike
5fc6bc4002 Add packet names to logger. 2020-05-05 01:31:50 +02:00
Mike
14a1c56877 Remove unused packet ids and fix duplicate composer. 2020-05-05 01:27:39 +02:00
Mike
a7946b4adc Replace remainder sout with logger. 2020-05-05 00:28:25 +02:00
Mike
1bd9db75a6 Added logback xml because it was ignored somehow. 2020-05-05 00:22:54 +02:00
Mike
a0582c09ee Re-added Jansi, moved ClientMessage logging. 2020-05-05 00:20:07 +02:00
Mike
89ff26f21b More logging progress 2020-05-04 22:24:09 +02:00
Mike
4748c033ad Dependencies and logging progress 2020-05-04 19:54:07 +02:00
Mike
9a9b986948 Improve corner clipping and remove picked up furni from mask calculation 2020-05-04 06:18:12 +02:00
Mike
87fdba280a Optimize water item update. 2020-05-04 05:53:28 +02:00
Mike
196c1ef23d Optimize water mask recalculations. 2020-05-04 05:41:28 +02:00
Mike
81ff35fe6e Fixes issue #588, netty IllegalReferenceCount 2020-05-03 16:07:27 +02:00
Beny
755c589ba6 Fix Issue #575 related to pathfinder changes 2020-05-03 03:01:49 +02:00
Mike
605dd000a6 Fix MessageComposer race condition caused by #133. 2020-05-03 02:08:12 +02:00
Beny
c590e49ff1 Fix sometimes incorrect Habbo height on item pickup 2020-05-03 00:33:02 +02:00
Beny
1b97707bc7 Fix rotating monster plants 2020-05-02 23:53:59 +02:00
Harmonic
616b25f159 Merge branch 'dev' into 'dev' 
Fix InteractionBattleBanzaiPuck cannot be moved when in a corner

See merge request morningstar/Arcturus-Community!132
 2020-05-02 10:26:57 -04:00
Mike
57f66a1514 Force encryption to be used when it is enabled. 
Not doing this check would make it possible to skip encryption when it is enabled.
 2020-05-02 04:36:26 +02:00
Mike
208be6210c Null check for when encryption is disabled. 2020-05-02 03:38:22 +02:00
Mike
90061e8d7d Clean up netty pipeline and actually use it. 2020-05-02 03:17:59 +02:00
narzo
a206a28164 Fix InteractionBattleBanzaiPuck cannot be moved when in a corner 2020-05-01 20:52:46 -04:00
Mike
74772b04ed Added DiffieHellman / RSA and RC4. 2020-05-02 02:18:09 +02:00
Harmonic
ad86aeadf0 Fix group forum exploit 2020-05-01 12:21:47 -04:00
Harmonic
034e3d0767 Merge branch 'fix-pet-exploit' into 'dev' 
Fix pet name exploit.

See merge request morningstar/Arcturus-Community!127
 2020-05-01 12:18:06 -04:00
KrewsOrg
649005cb90 Cleanup part 2. 2020-04-30 14:37:42 +01:00
KrewsOrg
a71853d0c2 Cleanup pet exploit fix. 2020-04-30 14:36:51 +01:00
Harmonic
7d7ac20ff2 Merge branch '487-modtool' into 'dev' 
fix(ModToolRoomInfoComposer): fix disconnect in pub rooms

See merge request morningstar/Arcturus-Community!128
 2020-04-29 21:39:35 -04:00
David Silva
a3f9d66fa5 fix(ModToolRoomInfoComposer): fix disconnect in pub rooms 2020-04-30 03:28:09 +02:00
KrewsOrg
1765e337a2 Fix pet name exploit. 2020-04-29 23:46:00 +01:00
Harmonic
4a84258f3e Revert "Temp patch to CatalogBuyItemEvent" 
This reverts commit 4c16c25508
 2020-04-29 18:34:21 -04:00
Harmonic
f9642879e2 Revert "Updated patch to CatalogBuyItemEvent." 
This reverts commit 958c6a6c15
 2020-04-29 18:34:11 -04:00
KrewsOrg
958c6a6c15 Updated patch to CatalogBuyItemEvent. 2020-04-29 23:22:43 +01:00
KrewsOrg
4c16c25508 Temp patch to CatalogBuyItemEvent 2020-04-29 22:57:26 +01:00
KrewsOrg
3695f4e701 Add homeroom config to make it work like how retros are used to. 2020-04-29 20:40:56 +01:00
KrewsOrg
41a1d2ceaa Merge remote-tracking branch 'origin/dev' into dev222 2020-04-29 10:53:47 +01:00
KrewsOrg
7503275af7 NPE and Typo Fix for WiredEffectTriggerStacks. 2020-04-29 10:53:30 +01:00
skeletor
87afd6d58c Merge branch '565-homeroom' into 'dev' 
fix(RequestUserDataEvent): patch auto redirect when nux is done

See merge request morningstar/Arcturus-Community!117
 2020-04-29 05:23:55 -04:00
skeletor
d00c436930 Merge branch '559-timestamp' into 'dev' 
feat(HabboStats): update last catalogue purchase

See merge request morningstar/Arcturus-Community!118
 2020-04-29 05:22:26 -04:00
David Silva
8f5b55c9d7 fix(ChannelReadHandler): patch vuln 2020-04-29 05:18:11 -04:00
David Silva
f7539f0aae feat(HabboStats): update last catalogue purchase 2020-04-28 01:16:56 +02:00
David Silva
0f16d9aa42 fix(RequestUserDataEvent): patch auto redirect when nux is done 2020-04-28 00:35:13 +02:00
Harmonic
295b545b8b Merge branch '464-raremonsterplantseedrarity' into 'dev' 
fix(MonsterplantPet): rare seed should be rare

See merge request morningstar/Arcturus-Community!115
 2020-04-27 07:49:41 -04:00
David Silva
fed9d2a614 fix(MonsterplantPet): rare seed should be rare 2020-04-27 03:34:57 +02:00
David Silva
6120285d9b fix(Room): allow magictile to be moved under user/pets/bots 2020-04-27 01:53:59 +02:00
KrewsOrg
78905c2a05 Added Sticky Limits to rooms (default 200 like habbo) 2020-04-23 22:17:04 +01:00
KrewsOrg
df2641f215 Replace all Runnables with lambda . 2020-04-23 18:08:37 +01:00
KrewsOrg
4b278a2109 Merge remote-tracking branch 'origin/dev' into dev222 2020-04-23 16:06:41 +01:00
KrewsOrg
fc6dd9790d Fix WiredEffectTriggerStacks NPE. 2020-04-23 16:06:17 +01:00
Harmonic
5617e4164d Revert "Fixed List Mode setting itself to thumbnails. Now uses the default." 
This reverts commit f261e8c10c
 2020-04-21 11:36:17 -04:00
KrewsOrg
f261e8c10c Fixed List Mode setting itself to thumbnails. Now uses the default. 2020-04-21 16:28:24 +01:00
KrewsOrg
4056e48643 Made OpenSearches use the default value instead of setting it to 1. 2020-04-21 15:48:53 +01:00
KrewsOrg
3fabefee76 Remove more custom wired. 2020-04-21 15:21:26 +01:00
KrewsOrg
3c2054c3d7 Fixes Room Idling for custom wired. 2020-04-21 00:08:39 +01:00
Harmonic
84ed2b4fce Merge branch 'master' into 'dobby-integration' 
Allow settings via ENV-variables

See merge request morningstar/Arcturus-Community!111
 2020-04-20 10:18:41 -04:00
Thijmen Stavenuiter
ea92573dc8 Allow settings via ENV-variables 2020-04-19 14:46:17 +02:00
KrewsOrg
629a2d2abe Removed Custom Wired. See Custom Wired Plugin to re-add these. 2020-04-07 13:43:59 +01:00
KrewsOrg
1ea86cb528 Changes to RoomLayout, makes more sense. 2020-04-03 16:58:02 +01:00
KrewsOrg
357f735d5a Start 2.4.0 rc-1 2020-04-03 16:40:48 +01:00
KrewsOrg
702c76a73b Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev222 2020-04-03 16:39:18 +01:00
KrewsOrg
4be2f0a8ba Fix Room Blocking. Thanks #TheJava for helping. 2020-04-03 16:38:23 +01:00
Harmonic
d4d6da7506 Merge branch 'master' into 'dev' 
# Conflicts:
#   src/main/java/com/eu/habbo/Emulator.java
 2020-04-01 06:21:03 -04:00
KrewsOrg
344bed8b3d 2.3.1 2020-04-01 11:20:13 +01:00
Harmonic
e47a48eb3d Merge branch 'dev' into 'master' 
2.3.1

See merge request morningstar/Arcturus-Community!109
 2020-04-01 06:19:01 -04:00
skeletor
87ae8e8125 fixed nullpointer in traxmanager 2020-04-01 06:06:23 -04:00
KrewsOrg
1070283284 Fix NPE in TraxManager Disposal in Room.java 2020-03-26 19:29:13 +00:00
KrewsOrg
68e55c5a09 Fix WiredEffectChangeFurniDirection Delay. 2020-03-26 19:04:52 +00:00
Harmonic
4a6721ca9a Update Emulator.java 2020-03-13 18:23:38 -04:00
KrewsOrg
b1bda73af3 Re-add configurable key for plugins. 2020-03-13 19:07:34 +00:00
KrewsOrg
490a1f4bde Fixed stand command working on beds. 2020-03-13 17:03:30 +00:00
KrewsOrg
b11923452f Added stand command from habbo. 2020-03-13 17:00:48 +00:00
KrewsOrg
ce9aae174f Made plugins command no longer use a perm, always turned on. 2020-03-13 16:11:06 +00:00
KrewsOrg
4c7ec55c60 Cleanup for last commit. 2020-03-13 15:51:32 +00:00
KrewsOrg
0dc6ebda10 Fix npe #515 2020-03-13 15:45:06 +00:00
KrewsOrg
6111ce6be2 Fixed Teleports crashing. Credits to ArpyAge for helping. 2020-03-13 15:41:51 +00:00
KrewsOrg
e6c5339439 Added text to emulator_texts. fixes #480 2020-03-13 15:01:26 +00:00
skeletor
7ab78798b6 fixed nullpointer exception in RoomUnit.java 2020-03-13 10:47:20 -04:00
Alejandro
47e9d1a64b Modify HabboAddedToRoomEvent 2020-03-04 20:28:12 +02:00
Alejandro
ef5e3a7c32 Fix trophies not allowing walking on them 2020-03-04 18:57:04 +02:00
Alejandro
8d6cd27b85 Fix rotating furniture with a stack helper 2020-03-04 18:45:33 +02:00
Alejandro
a8f3829216 Fix placing bots 2020-02-27 23:59:27 +02:00
Alejandro
8adb814f66 Fix bot placing on chairs and beds 2020-02-27 23:52:40 +02:00
Alejandro
ae51fa88a5 Fix stackable furni not working with WIRED Effect: Match Furni Direction 2020-02-27 23:29:23 +02:00
Alejandro
706577f220 Fix vending machines without sides 2020-02-27 23:16:36 +02:00
Alejandro
8c9faa56e6 Fix NPE in TraxManager.fromItemId 2020-02-27 22:55:09 +02:00
Alejandro
09114ba977 Allow placing stack helpers on users, bots and pets 2020-02-27 22:53:06 +02:00
Alejandro
b8d52b08d3 Do not activate wired conditions unless double-clicked 2020-02-27 22:39:31 +02:00
Alejandro
ece55786d8 Fix NPE caused by Room.removeHabbo 2020-02-27 22:35:03 +02:00
Alejandro
166d8e8f40 Fix NullPointerException in RoomManager.openRoom 2020-02-27 22:33:08 +02:00
Alejandro
4c77c76bdc Add message-specific ratelimiting 2020-02-27 21:06:36 +02:00
Alejandro
70d20ff2dd Remove onWalk and onWalkOff object data 2020-02-27 20:24:37 +02:00
Alejandro
518e12c6ad Run YTTV manager initialization in a separate thread 2020-02-27 19:48:17 +02:00
Alejandro
202c1b655d Merge remote-tracking branch 'origin/dev' into dev 2020-02-27 19:38:23 +02:00
Alejandro
36ce06b226 Fix pathfinder 2020-02-27 19:38:02 +02:00
Alejandro
285fe97075 Fix NPE in freeze tile 2020-02-23 00:42:29 +02:00
Alejandro
6a992dbda9 Fix NPE in GameTeam 2020-02-23 00:41:13 +02:00
skeletor
800b008b55 Don't activate match furni effect if settings are not configured 2020-02-22 17:40:12 -05:00
Alejandro
1c5e180447 Ensure monsterplants don't get rarity 0 2020-02-23 00:39:07 +02:00
Alejandro
47825978cb Fix StringIndexOutOfBoundsException in floorplan saving 2020-02-23 00:35:39 +02:00
Alejandro
0d9afb933e Add extra error logging if there are no YT playlists for item 2020-02-23 00:33:14 +02:00
Alejandro
eb7c7a5498 Fix moodlight saving false-positive scripter detection 2020-02-23 00:32:26 +02:00
Alejandro
b3a88c7d10 Fix moodlight saving scripting detection 2020-02-11 11:44:44 +02:00
Alejandro
e596b1231d Fix NPE in Room 2020-02-08 18:25:44 +02:00
Alejandro
952fd8bd10 Add tile data to onWalkOn and onWalkOff events and fix NPE in RoomUnit 2020-02-08 18:23:46 +02:00
Alejandro
359a980c67 Fix imports and add overriding tiles 2020-02-08 18:22:06 +02:00
Alejandro
0cb98867ee Fix NPE in Game 2020-02-08 18:17:02 +02:00
Alejandro
a3a906095c Merge remote-tracking branch 'origin/dev' into dev 2020-02-08 18:15:01 +02:00
Alejandro
d645465da8 Remove time from creation date in profile composer 2020-02-08 18:14:47 +02:00
Harmonic
5c78088726 WiredEffectTeleport Vulnerability Fix 2020-02-08 07:02:34 -05:00
KrewsOrg
eb07ed91b2 Merge remote-tracking branch 'origin/dev' into dev222 2020-02-06 16:50:40 +00:00
KrewsOrg
37b51db2b6 Pushed version as RC-3, requires testing before pushing to stable. 2020-02-06 16:50:22 +00:00
Alejandro
867e5cf7e6 Organize pet-related item interactions 2020-02-06 14:01:21 +02:00
Alejandro
df8f80f9cb Add vending machines without sides 2020-02-06 01:16:51 +02:00
Alejandro
b87cbd398b Do not cancel navigation if overriding path is non-existent 2020-02-06 01:06:49 +02:00
Alejandro
4389d7e18f Remove unnecessary console log 2020-02-06 01:01:39 +02:00
Alejandro
ab1e1a1aed Merge remote-tracking branch 'origin/dev' into dev 2020-02-06 00:58:39 +02:00
Alejandro
0e53d703b3 Fix vending machine behaviour 2020-02-06 00:56:40 +02:00
KrewsOrg
8321a60efc Merge remote-tracking branch 'origin/dev' into dev222 2020-02-05 21:24:30 +00:00
KrewsOrg
653f611323 Fix for height in MoveRotateFurni - Credits to Skeletor for the overhaul. 2020-02-05 21:23:27 +00:00
KrewsOrg
ed13fa9567 Re-added changes to MoveRotateFurni wired, credits to Skeletor. Tested on habbo and works as intended. 2020-02-05 20:52:39 +00:00
Alejandro
fe6679c109 Retry with walkthrough if non-walkthrough path not found 2020-02-05 22:25:54 +02:00
Alejandro
e993a0e95e Fix wf_blob 2020-02-05 21:30:11 +02:00
Alejandro
34d8d0f8c5 Adjust vending machine timing 2020-02-05 20:17:54 +02:00
Harmonic
f0ed16d46d Revert "Small refactoring of Wired Effect: Move Rotate" 
This reverts commit 913f84ac46
 2020-02-05 13:06:30 -05:00
Alejandro
1c4a6c080b Merge remote-tracking branch 'origin/dev' into dev 2020-02-05 19:53:04 +02:00
Alejandro
4ecba6723d Fix giving handitems with bots 2020-02-05 19:52:29 +02:00
skeletor
913f84ac46 Small refactoring of Wired Effect: Move Rotate 
-Fixed rotating and moving furniture at the same time
-Fixed random movement direction finding correct tile too fast
-Fixed movement of furniture larger than 2 tiles
 2020-02-05 12:39:16 -05:00
Alejandro
82ff5c0a08 Make bots walk to nearest adjacent tile when giving a handitem 2020-02-05 19:35:25 +02:00
Alejandro
95b0884a8c Merge remote-tracking branch 'origin/dev' into dev 2020-02-05 19:18:14 +02:00
Alejandro
f240580c1e Add bot placement message 2020-02-05 19:17:51 +02:00
Alejandro
5f5345c80c Ensure the user removing a saddle is the horse's owner 2020-02-05 14:26:02 +02:00
skeletor
e399304c1c fix concurrentException in wired highscores 2020-02-05 07:17:47 -05:00
Alejandro
a668cb9802 Add saddle removing 2020-02-04 23:04:41 +02:00
Alejandro
fbdf56f22f Fix glitchy freeze scoreboards (negative scores) 2020-02-04 22:17:08 +02:00
Alejandro
2cb33a5ec6 Make game timers end the game at 00:00 2020-02-04 20:52:17 +02:00
Alejandro
9ee11df10f Fix switching between moodlight presets 2020-02-04 18:20:31 +02:00
Alejandro
52da0df768 Merge remote-tracking branch 'origin/dev' into dev 2020-02-04 14:24:20 +02:00
Alejandro
1e3067f2ce Fix banzai puck not being able to move in empty rooms 2020-02-04 14:23:57 +02:00
Alejandro
8bfaeed69d Fix marketplace query ambiguity 2020-02-04 14:17:16 +02:00
Alejandro
ae412592b1 Make single-player banzai games not give achievements 2020-02-04 14:12:34 +02:00
Alejandro
304907ddf1 Reset banzai tile state on pickup 2020-02-04 14:09:48 +02:00
skeletor
fa3755341e set client to game mode when in a game 2020-02-02 04:06:44 -05:00
Alejandro
44de2a81ec Fix NPE in WiredHandler 2020-02-01 20:32:29 +02:00
Alejandro
add7156b9a Modify default repeater wired delays (credit: kittihab / Kitt Mustang) 2020-02-01 20:29:40 +02:00
Alejandro
9561c0b073 Fix NPE in SecureLoginEvent 2020-02-01 14:15:49 +02:00
Alejandro
99168d57a5 Fix jukebox disc adding/removing 2020-02-01 14:09:59 +02:00
Alejandro
8e54b357e1 Fix glitchy animation when moving a chair under a moving avatar 2020-02-01 13:22:35 +02:00
Alejandro
24f84a5b02 Fix snapshot wired updating position even if not enabled 2020-02-01 13:13:21 +02:00
Alejandro
ff2256f30a Fix furni not jumping on top if not on top already 2020-02-01 12:54:59 +02:00
Alejandro
899d6cd95a Add better error logging to catalog manager 2020-01-31 19:00:44 +02:00
skeletor
b89e6726b1 fixed wired trigger: User step on furni when on roller 2020-01-31 11:52:37 -05:00
David Silva
176e2121f9 feat(PacketManager): enable 3500 2020-01-30 16:54:30 +01:00
Harmonic
4ef1f4f104 Merge branch 'rank-inventory-effects' into 'dev' 
Add rank effects to inventory

See merge request morningstar/Arcturus-Community!88
 2020-01-30 10:01:39 -05:00
skeletor
733620b9b0 Totem planet should only give effect to planet owner 2020-01-30 03:29:38 -05:00
skeletor
fcccd70eb3 tent should not change state when clicked 2020-01-30 03:29:01 -05:00
Dank074
1527fe5593 rank effect should not be applied from RoomManager, apply it from EffectsComponent instead 2020-01-29 22:49:35 -06:00
Dank074
db71cd8406 rank effects added to EffectsComponent in inventory 2020-01-29 22:03:00 -06:00
Alejandro
ccf47ea139 Fix vending machine behaviour 2020-01-28 16:09:59 +02:00
Alejandro
d3b8ee6b76 Speed up vending machine animation (closes #351) 2020-01-28 15:24:03 +02:00
Alejandro
42ebfad128 Fix moving/rotatingg furniture in the same coordinates (closes #352) 2020-01-28 15:13:32 +02:00
Alejandro
b33979e702 Merge remote-tracking branch 'origin/dev' into dev 2020-01-28 13:55:20 +02:00