Commit Graph

1569 Commits

Author SHA1 Message Date
Harmonic
3485e888ab Merge branch 'wired-to-json' into 'dev'
Big WiredData to JSON overhaul

See merge request morningstar/Arcturus-Community!363
2021-01-10 18:06:36 -05:00
Harmonic
934741ea16 Merge branch 'dev' into 'wired-to-json'
# Conflicts:
#   sqlupdates/2_4_0 to 3_0_BETA_1.sql
2021-01-10 18:06:29 -05:00
Harmonic
282f8b6bba Merge branch 'revert-b8a69990' into 'dev'
Revert "Merge branch 'feature/packet-1094' into 'dev'"

See merge request morningstar/Arcturus-Community!367
2021-01-10 18:05:02 -05:00
Harmonic
f4869a6305 Revert "Merge branch 'feature/packet-1094' into 'dev'"
This reverts merge request !366
2021-01-10 18:04:47 -05:00
Harmonic
47c16d8dfe Merge branch 'TenShie-master-patch-18404' into 'master'
Adding Comments after debugging the Source SWF

See merge request morningstar/Arcturus-Community!346
2021-01-10 18:00:24 -05:00
Harmonic
7e78994d69 Merge branch 'feature/roombadge' into 'dev'
Added roombadge command

See merge request morningstar/Arcturus-Community!364
2021-01-10 17:55:02 -05:00
Harmonic
fc93da68ea Merge branch 'fix/fireworks' into 'dev'
Fireworks working like Habbo

See merge request morningstar/Arcturus-Community!360
2021-01-10 17:54:35 -05:00
Harmonic
ebd79e4b79 Merge branch 'patch-fix-issue-936' into 'dev'
Fix issue #936

See merge request morningstar/Arcturus-Community!365
2021-01-10 17:52:56 -05:00
Harmonic
351dfe1371 Merge branch 'fix/#876-effect-tile-keep-effect' into 'dev'
Effect tile interaction now keeps the effect after walkoff. Fixes #876 and #931

See merge request morningstar/Arcturus-Community!357
2021-01-10 17:51:41 -05:00
Harmonic
b8a69990c4 Merge branch 'feature/packet-1094' into 'dev'
#928 Added packet 3373: WiredApplySetConditionsEvent

See merge request morningstar/Arcturus-Community!366
2021-01-10 17:50:19 -05:00
Remco
40914b5050 Renamed incoming event 2021-01-10 23:10:15 +01:00
Remco
de7c51d78a Added ratelimit 2021-01-10 22:15:20 +01:00
Remco
53fc7ece4a Renamed event since it applies to both conditions and effects 2021-01-10 20:55:09 +01:00
Remco
2313276df0 Removed debugging code 2021-01-10 20:50:03 +01:00
Remco
32e7c29f84 Removed commented code 2021-01-10 20:47:26 +01:00
Remco
35ac99b2c6 Added Apply furni to set conditions feature 2021-01-10 20:45:44 +01:00
Snaiker
5981046523 Fix issue 936 2021-01-10 02:49:15 +00:00
Remco
8a89f7ce4d Actually added the RoomBadgeCommand 2021-01-06 20:39:30 +01:00
Remco
22efb1c925 Oop.. 2021-01-06 20:34:22 +01:00
Remco
4937ac298d Added roombadge command 2021-01-06 20:24:04 +01:00
Remco
d6ecdbeeec Added SQL to expand items.wired_data column 2021-01-05 21:55:23 +01:00
Remco
ad84ef423e WiredConditionTriggerOnFurni now saves as JSON 2021-01-04 23:15:01 +01:00
Remco
ac1c6a3d9b WiredConditionNotTriggerOnFurni now saves as JSON 2021-01-04 23:13:21 +01:00
Remco
190a5cf860 WiredConditionNotMatchStatePosition now saves as JSON 2021-01-04 23:10:50 +01:00
Remco
5617cd3da2 WiredConditionTeamMember now saves as JSON 2021-01-04 23:07:36 +01:00
Remco
bea21b715e WiredConditionNotInTeam now saves as JSON 2021-01-04 23:05:45 +01:00
Remco
a1bf9d7aa7 WiredConditionNotHabboWearsBadge now saves as JSON 2021-01-04 22:49:45 +01:00
Remco
218cb2f3fb WiredConditionNotHabboHasEffect now saves as JSON 2021-01-04 22:48:08 +01:00
Remco
ecfeaa9a5f WiredConditionNotHabboCount now saves as JSON 2021-01-04 22:45:49 +01:00
Remco
b6b4ac936e WiredConditionNotFurniTypeMatch now saves as JSON 2021-01-04 22:42:13 +01:00
Remco
87ff24e409 WiredConditionNotFurniHaveHabbo now saves as JSON 2021-01-04 22:38:20 +01:00
Remco
3488c8ad36 WiredConditionNotFurniHaveFurni now saves as JSON 2021-01-04 22:33:33 +01:00
Remco
277464b365 WiredConditionMoreTimeElapsed now saves as JSON 2021-01-04 22:30:17 +01:00
Remco
e6a5aaa279 WiredConditionMatchStatePosition now saves as JSON 2021-01-04 22:28:17 +01:00
Remco
fe52ad3458 WiredConditionLessTimeElapsed now saves as JSON 2021-01-04 22:12:45 +01:00
Remco
7797e7f7cd WiredConditionHabboWearsBadge now saves as JSON 2021-01-04 22:09:29 +01:00
Remco
b9029cf1f3 WiredConditionHabboHasHandItem now saves as JSON 2021-01-04 22:06:19 +01:00
Remco
52650abfad WiredConditionHabboHasEffect now saves as JSON 2021-01-04 22:03:05 +01:00
Remco
4d10af2b41 WiredConditionHabboCount now saves as JSON 2021-01-04 22:00:18 +01:00
Remco
da751cca42 WiredConditionFurniTypeMatch now saves as JSON 2021-01-04 21:52:45 +01:00
Remco
f8520919ba WiredConditionFurniHaveHabbo now saves as JSON 2021-01-04 21:47:13 +01:00
Remco
8fe9cadb76 Fixed wireddata incompatibility issue 2021-01-04 21:43:14 +01:00
Remco
3960ee53f5 WiredConditionFurniHaveFurni now saves as JSON 2021-01-04 21:36:42 +01:00
Remco
0769e85a27 WiredConditionDateRangeActive now saves as JSON 2021-01-04 21:29:12 +01:00
Remco
069bffb907 WiredTriggerHabboWalkOnFurni now saves as JSON 2021-01-04 21:23:59 +01:00
Remco
c6af5baa70 WiredTriggerHabboWalkOffFurni now saves as JSON 2021-01-04 21:18:02 +01:00
Remco
19b1b187a5 Removed delay since its not used 2021-01-04 21:07:17 +01:00
Remco
b8ea8fcd1b WiredTriggerFurniStateToggled now saves as JSON 2021-01-04 20:59:52 +01:00
Remco
75b61b1809 WiredData now saves as JSON import fixes 2021-01-04 19:03:42 +01:00
Remco
5720adf61c WiredEffectMoveFurniTowards now saves as json import fix 2021-01-04 18:54:59 +01:00