Commit Graph

1283 Commits

Author SHA1 Message Date
Alejandro
34d8d0f8c5 Adjust vending machine timing 2020-02-05 20:17:54 +02:00
Harmonic
19f00ee040 Merge branch 'revert-913f84ac' into 'dev'
Revert "Small refactoring of Wired Effect: Move Rotate"

See merge request morningstar/Arcturus-Community!98
2020-02-05 13:06:37 -05: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
Harmonic
aab96e59dd Merge branch 'refactor-move-rotate-wired' into 'dev'
Small refactoring of Wired Effect: Move Rotate

See merge request morningstar/Arcturus-Community!96
2020-02-05 12:39:16 -05: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
Alejandro
1eb6270ae2 Merge branch 'patch-concurrent-exception-highscore' into 'dev'
fix concurrentException in wired highscores

See merge request morningstar/Arcturus-Community!97
2020-02-05 07:17:47 -05: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
Alejandro
1b5954f019 Merge branch 'patch-game-mode' into 'dev'
set client to game mode when in a game

See merge request morningstar/Arcturus-Community!95
2020-02-02 04:06:44 -05:00
skeletor
fa3755341e set client to game mode when in a game 2020-02-02 04:06:44 -05:00
Harmonic
ed49bd3336 Update README.md 2020-02-01 15:37:23 -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
ffe900a07e Revert "Merge branch 'fixed-delays-value' into 'master'"
This reverts merge request !93
2020-02-01 13:27:02 -05:00
Alejandro
95d41203cb Merge branch 'fixed-delays-value' into 'master'
Fixed the default value of the repeat effects

See merge request morningstar/Arcturus-Community!93
2020-02-01 13:24:54 -05:00
Kitt Mustang
98858dd194 Fixed the default value of the repeat effects 2020-02-01 09:54:27 -05: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
Alejandro
e244bc20cf Merge branch 'patch-roller-trigger-wired' into 'dev'
fixed wired trigger: User step on furni when on roller

See merge request morningstar/Arcturus-Community!92
2020-01-31 11:52:37 -05:00
skeletor
b89e6726b1 fixed wired trigger: User step on furni when on roller 2020-01-31 11:52:37 -05:00
Harmonic
d9bebe2c9e Merge branch '361-hotelviewinventory' into 'dev'
feat(PacketManager): enable 3500

See merge request morningstar/Arcturus-Community!91
2020-01-30 11:00:38 -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
Alejandro
f32d6bbb73 Merge branch 'patch-totem-effect' into 'dev'
Totem planet should only give effect to planet owner

See merge request morningstar/Arcturus-Community!89
2020-01-30 03:29:38 -05:00
skeletor
733620b9b0 Totem planet should only give effect to planet owner 2020-01-30 03:29:38 -05:00
Alejandro
2f6ec01518 Merge branch 'patch-tent-interaction' into 'dev'
tent should not change state when clicked

See merge request morningstar/Arcturus-Community!90
2020-01-30 03:29:01 -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