Commit Graph

1498 Commits

Author SHA1 Message Date
Remco
e4f2a792e8 Added logging for SecureLoginEvent 2021-01-29 23:53:55 +01:00
Harmonic
4a8a714172 Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2021-01-29 10:41:23 -08:00
Remco
2dfd110ad3 Merge branch 'fix/butlerbot-serving' into 'dev'
ButlerBot behaviour fixes

See merge request morningstar/Arcturus-Community!391
2021-01-29 18:39:44 +00:00
Remco
fe31b37aa1 Bot now only serves once when the distance is more than reach distance 2021-01-29 19:28:18 +01:00
Remco
5851162a63 Bot now only serves once when the distance is more than reach distance 2021-01-29 19:08:41 +01:00
Harmonic
cd2fbcf169 Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2021-01-28 14:54:41 -08:00
skeletor
9c0cb00628 Merge branch 'enc-force-option' into 'dev'
add option to force encryption

See merge request morningstar/Arcturus-Community!390
2021-01-28 07:47:19 +00:00
Dank074
c14746a05f add option to force encryption 2021-01-28 01:34:59 -06:00
Harmonic
b0683f524a Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2021-01-27 05:39:13 -08:00
Remco
6715e48aa5 Merge branch 'refactor/WiredConditionNotMatchStatePosition' into 'dev'
Refactored WiredConditionNotMatchStatePosition

See merge request morningstar/Arcturus-Community!381
2021-01-23 17:46:43 -05:00
Remco
eee24c9830 Merge branch 'dev' into refactor/WiredConditionNotMatchStatePosition 2021-01-23 23:33:29 +01:00
Harmony
6da8d316c5 Merge branch 'fix/respectpoints' into 'dev'
Fixed respect points cleaner

See merge request morningstar/Arcturus-Community!382
2021-01-23 14:04:22 -05:00
Remco
ba145e6113 Fixed daily respects 2021-01-23 19:51:56 +01:00
Remco
433e02497c Refactored WiredConditionNotMatchStatePosition 2021-01-23 18:56:04 +01:00
Remco
3efbaadad6 Merge branch 'fix/wired-bot-talk' into 'dev'
Bot variables can now be used in wireds

See merge request morningstar/Arcturus-Community!356
2021-01-23 11:20:42 -05:00
Remco
ca26e7cf37 Merge branch 'dev' into fix/wired-bot-talk 2021-01-23 15:27:22 +01:00
Remco
80d58364a5 Moved bot SQLs to another sql file 2021-01-23 15:25:46 +01:00
Remco
fa6d81ef53 Merge branch 'TheOleg-dev-patch-57406' into 'dev'
Update Dockerfile - run emulator in UTF-8 mode

See merge request morningstar/Arcturus-Community!377
2021-01-21 06:11:35 -05:00
TheOleg
a9b73d23d0 Update Dockerfile - run emulator in UTF-8 mode 2021-01-20 18:11:16 -05:00
Harmonic
55aa890268 Merge branch 'beta-branch' into 'dev'
Add Docker support

See merge request morningstar/Arcturus-Community!368
2021-01-19 06:12:51 -05:00
Thijmen
4cf11336cf Add Docker support 2021-01-19 06:12:51 -05:00
skeletor
d8fbc3d0c3 Merge branch 'add-userip-event' into 'dev'
Added plugin event for getting user ip

See merge request morningstar/Arcturus-Community!373
2021-01-17 18:45:34 -05:00
Dank074
48cef2ed70 added plugin event for getting user ip 2021-01-17 01:50:17 -06:00
skeletor
dfc3b4cace Merge branch 'path-fix-error-query-3_0_0' into 'dev'
Fix char ; is missing

See merge request morningstar/Arcturus-Community!372
2021-01-13 21:58:34 -05:00
Snaiker
3371308395 Fix char ; is missing 2021-01-14 02:56:01 +00:00
Beny
73f9d0ab2d Merge branch 'feature/packet-3373' into 'dev'
#928 Added packet 3373: WiredApplySetConditionsEvent

See merge request morningstar/Arcturus-Community!370
2021-01-11 16:25:46 -05:00
Remco
a0cfe07ca3 Readded packet 2021-01-11 22:20:06 +01:00
Harmonic
5ef04f76df Missing sql update key. 2021-01-10 15:41:40 -08:00
Harmonic
5b1ffa5bee Fixed sql update. Added debug mode check for TooLongFrameException Error. 2021-01-10 15:30:21 -08:00
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