Commit Graph

1338 Commits

Author SHA1 Message Date
Harmonic
e8db4ce104 Revert "Merge branch 'patch-photo-extradata' into 'dev'"
This reverts merge request !82
2020-01-23 14:24:53 -05:00
Harmonic
f14bd9dbc8 Merge branch 'patch-photo-extradata' into 'dev'
added additonal parameters to photo extra data json string

See merge request morningstar/Arcturus-Community!82
2020-01-23 08:20:43 -05:00
skeletor
cf422a574c added additonal parameters to photo extra data json string 2020-01-23 08:20:42 -05:00
Harmonic
d799550128 Merge branch '301-flood' into 'dev'
fix(flooding): do not show mute icon if mute is due to flooding

See merge request morningstar/Arcturus-Community!81
2020-01-22 15:05:16 -05:00
David Silva
db32682fbc fix(flooding): do not show mute icon if mute is due to flooding 2020-01-22 20:56:56 +01:00
Harmonic
bd9b3b41f3 Merge branch '299-sanctionlevelzero' into 'dev'
fix(sanctions): check if sanctions are active/ignore level 0's

See merge request morningstar/Arcturus-Community!80
2020-01-22 11:14:59 -05:00
David Silva
8be461354c fix(sanctions): check if sanctions are active/ignore level 0's 2020-01-22 17:07:24 +01:00
Harmonic
67f4e27904 Merge branch 'patch-wired-move-rotate' into 'dev'
[patch] wired effect move rotate should allow rotation of furniture occupied by users/bots/pets

See merge request morningstar/Arcturus-Community!77
2020-01-22 10:22:05 -05:00
skeletor
66f047bb53 [patch] wired effect move rotate should allow rotation of furniture occupied by users/bots/pets 2020-01-22 10:22:05 -05:00
Harmonic
b0446cebc4 Merge branch '297-userinfosanction' into 'dev'
feat(ModToolUserInfoComposer): display last sanction + small improv.

See merge request morningstar/Arcturus-Community!79
2020-01-22 10:20:31 -05:00
David Silva
4360507fa8 feat(ModToolUserInfoComposer): display last sanction + small improv. 2020-01-22 16:15:44 +01:00
Alejandro
060a5a6bc6 Merge remote-tracking branch 'origin/dev' into dev 2020-01-22 11:56:48 +02:00
Alejandro
944745e7d8 Tweak roller glitch to fix #107 2020-01-22 11:56:27 +02:00
Alejandro
a460b1e1a6 Merge branch 'patch-wired-reset-null-exception' into 'dev'
fixed null pointer exception in timer reset wired

See merge request morningstar/Arcturus-Community!78
2020-01-22 04:32:12 -05:00
skeletor
30490af9d2 fixed null pointer exception in timer reset wired 2020-01-22 04:32:11 -05:00
Alejandro
d6a21ed131 Do not pick up postit notes with pickall 2020-01-22 11:24:29 +02:00
Alejandro
b80ebad61b Fix unidles trigger 2020-01-22 11:17:04 +02:00
KrewsOrg
b854849539 Fixed typo in ModToolSanctions.java 2020-01-22 00:03:24 +00:00
KrewsOrg
e108796ad1 Fixed colors on Windows using Jansi. New Loading sequence. 2020-01-21 23:35:33 +00:00
Harmonic
89ded239bc Merge branch 'patch-wired-cnd-snapshot' into 'dev'
fixed WIRED Condition: Furni States and Positions Match bug

See merge request morningstar/Arcturus-Community!68
2020-01-21 15:50:13 -05:00
Harmonic
d32aec4d52 Merge branch 'patch-wired-effect-move-rotate' into 'dev'
[patch] Fixed move-and-rotate wired should not allow movement into allow-sit furni

See merge request morningstar/Arcturus-Community!69
2020-01-21 15:22:53 -05:00
skeletor
f7957a82d0 [patch] Fixed move-and-rotate wired should not allow movement into allow-sit furni 2020-01-21 15:22:53 -05:00
Harmonic
b35e27ea8e Merge branch 'patch-timer-reset' into 'dev'
Wired Reset Timers Effect should also reset Wired Trigger Periodically and Wired Trigger Periodically Long

See merge request morningstar/Arcturus-Community!72
2020-01-21 15:18:30 -05:00
skeletor
4a3e59557d Wired Reset Timers Effect should also reset Wired Trigger Periodically and Wired Trigger Periodically Long 2020-01-21 15:18:30 -05:00
Harmonic
018be4c3c8 Merge branch '156-sanctions_timefix' into 'dev'
fix(ModToolSanctionInfoComposer): small patch regarding time

See merge request morningstar/Arcturus-Community!75
2020-01-21 12:14:02 -05:00
David Silva
f1e3a3126a Update ModToolSanctionInfoComposer.java 2020-01-21 09:25:55 -05:00
David Silva
3bc3682771 fix(ModToolSanctionInfoComposer): small patch regarding time 2020-01-21 15:22:19 +01:00
Harmonic
c7edfc14ea Merge branch 'patch-heightmap-bug' into 'dev'
fixed byte-overflow in UpdateStackHeightComposer

See merge request morningstar/Arcturus-Community!74
2020-01-21 06:26:44 -05:00
skeletor
3fb3b200d2 fixed byte-overflow in UpdateStackHeightComposer 2020-01-21 06:26:44 -05:00
Harmonic
395cba2a5f Merge branch 'patch-totem-extradata' into 'dev'
added remaining NumberFormatExceptions in totem interactions to try/catch block

See merge request morningstar/Arcturus-Community!73
2020-01-19 20:42:51 -05:00
skeletor
8d6010fde3 added remaining NumberFormatExceptions in totem interactions to try/catch block 2020-01-19 20:42:51 -05:00
Harmonic
df2c7ee8a8 Merge branch '156-sanctions_sql' into 'dev'
feat(sqlupdates): push sanction sql

See merge request morningstar/Arcturus-Community!71
2020-01-19 18:36:51 -05:00
David Silva
ff22fe2c70 feat(sqlupdates): push sanction sql 2020-01-20 00:33:56 +01:00
Harmonic
5c3e911217 Merge branch '156-sanctions' into 'dev'
feat(sanctions): introduce rudimentary sanction behaviour

See merge request morningstar/Arcturus-Community!61
2020-01-19 18:18:15 -05:00
David Silva
ad96c6e74b Sanctions. Credits to zGrav (David Silva) 2020-01-19 18:18:15 -05:00
Harmonic
25f81e164f Update README.md 2020-01-19 17:44:57 -05:00
Harmonic
cc48e56efa Update README.md 2020-01-19 17:44:37 -05:00
Harmonic
78717fb175 Update README.md 2020-01-19 17:44:29 -05:00
Harmonic
a3e5bcfa9f Update README.md 2020-01-19 17:44:18 -05:00
KrewsOrg
7e67052cac Start 2.3.0 RC-1 2020-01-19 22:56:14 +00:00
Harmonic
33264fb43d Update README.md 2020-01-19 17:43:50 -05:00
Harmonic
951b4163b6 Merge branch 'patch-class-cast-exception' into 'dev'
fixed classCastException in UpdateSTackHeightComposer

See merge request morningstar/Arcturus-Community!70
2020-01-19 17:42:18 -05:00
Dank074
edff4dbb53 fixed classCastException in UpdateSTackHeightComposer 2020-01-18 12:17:05 -06:00
Dank074
d3aaca0300 fixed WIRED Condition: Furni States and Positions Match bug 2020-01-18 06:05:12 -06:00
Harmonic
cd2505ebf7 Merge branch 'dev' into 'master'
Final Patch to totems, resolves the NumberFormatException for all Totems....

See merge request morningstar/Arcturus-Community!67
2020-01-17 15:11:38 -05:00
KrewsOrg
6f0fcafb7b Final Patch to totems, resolves the NumberFormatException for all Totems. Added correct SQL for totems. 2020-01-17 20:10:19 +00:00
Harmonic
4839658d69 Update README.md 2020-01-16 18:26:50 -05:00
Harmonic
98cda8cc19 Merge branch 'dev' into 'master'
2.1.1

See merge request morningstar/Arcturus-Community!66
2020-01-16 18:15:31 -05:00
KrewsOrg
353bde440c 2.1.1 to signify a new minor build. 2020-01-16 23:15:01 +00:00
KrewsOrg
506886d794 Fixed effect boxes, credits to Beny and Skeletor. 2020-01-16 23:13:16 +00:00