Commit Graph

846 Commits

Author SHA1 Message Date
brenoepic
890cdd519a Fix PlaceBot stackheight 2022-04-12 14:55:30 -03:00
Harmonic
9c4b1df499 Merge branch 'refactor/wired-saving' into 'dev'
refactor wired save packet handling

See merge request morningstar/Arcturus-Community!507
2022-04-10 18:19:25 +00:00
Harmonic
ff34d89688 Merge branch 'dev' into 'dev'
Fix Issue #948

See merge request morningstar/Arcturus-Community!529
2022-04-10 16:32:07 +00:00
Harmonic
02eb59850c Merge branch 'fixed-worfilter' into 'dev'
Fixed WordFilter Code

See merge request morningstar/Arcturus-Community!517
2022-04-10 16:31:27 +00:00
AlfreviD
b1ea3dfd66 Fix Issue #948 2022-04-10 16:07:50 +00:00
Harmonic
f73cab18bb Merge branch 'dev' into 'dev'
Added effect_vendingmachine_no_sides

See merge request morningstar/Arcturus-Community!526
2022-04-10 14:57:45 +00:00
oshawott
d591c3f5f0 Update Voucher.java 2022-04-10 01:18:52 +00:00
Oliver
451422b328 Added effect_vendingmachine_no_sides 2022-04-09 01:21:19 +00:00
Oliver
eaa915e7f7 Upload New File 2022-04-09 01:18:38 +00:00
Harmonic
1096ff92a3 Merge branch 'fix-trophies' into 'dev'
fix trophies

See merge request morningstar/Arcturus-Community!487
2022-04-08 20:33:40 +00:00
Harmonic
5d7a81927a Merge branch 'fix-summon' into 'dev'
Fix duplicate avatar in summon commands

See merge request morningstar/Arcturus-Community!513
2022-04-08 20:31:52 +00:00
xjoaoppf
57897c14c0 Fixed WordFilter Code 2022-04-04 16:02:07 +00:00
Snaiker
745dbed6aa Fix SQL Exceptions on Market Place 2022-04-02 13:27:40 +01:00
ArpyAge
36f7004b91 Merge remote-tracking branch 'origin/dev' into dev 2022-03-27 16:06:25 +02:00
ArpyAge
06969df00a Redeem command fix for CF_diamond_ furniture 2022-03-27 16:06:07 +02:00
brenoepics
2cc8a195b4 remove unused imports 2022-03-23 21:31:45 -03:00
brenoepics
9db71ac972 Fix summon commands 2022-03-23 21:24:23 -03:00
Harmonic
5764afc5e7 Merge branch 'calendar-fix' into 'dev'
Update CalendarReward Logging

See merge request morningstar/Arcturus-Community!511
2022-03-23 22:00:46 +00:00
brenoepics
8eacb5b977 Update CalendarRewardClaimed.java 2022-03-23 17:50:32 -03:00
Bill
e304ba1ecb Revert change to EmptyInventoryCommand 2022-03-23 03:27:50 -04:00
dank074
e3b0c62d5b fix wired condition furni has avatars sending wrong data 2022-03-22 20:49:28 -05:00
Remco
e56d4eb791 Fixed interaction football valid moves 2022-03-22 12:47:06 +01:00
dank074
dbd40c195b refactor wired save packet handling 2022-03-21 21:30:09 -05:00
brenoepics
77ea291bb4 Merge branch 'dev' into 'calendar-fix'
# Conflicts:
#   sqlupdates/3_0_0 to 3_0_1.sql
#   src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarCampaign.java
#   src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarManager.java
#   src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java
#   src/main/java/com/eu/habbo/messages/incoming/handshake/UsernameEvent.java
2022-03-21 22:22:49 +00:00
brenoepics
287af8aba4 Fix calendar timestamp 2022-03-21 19:16:31 -03:00
Harmonic
46e6a8e7da Merge branch 'calendar-fix' into 'dev'
New campaign calendar system

See merge request morningstar/Arcturus-Community!486
2022-03-21 18:51:52 +00:00
brenoepics
dfd12bd56a New campaign calendar system 2022-03-21 18:51:52 +00:00
Harmonic
31c63e81ae Merge branch 'fix-duplicated-badge' into 'dev'
Fix duplicated SQL entry for the badge & checks

See merge request morningstar/Arcturus-Community!505
2022-03-21 18:50:09 +00:00
Harmonic
b6b208a81b Merge branch 'fix-npe-wire-reward' into 'dev'
Fix SQL Exception on Wired Give Reward

See merge request morningstar/Arcturus-Community!503
2022-03-21 18:49:36 +00:00
Snaiker
797b887a98 Fix 2022-03-21 18:37:24 +00:00
ArpyAge
b8b5b4b576 Merge branch '@fix/inventory-fragment' into 'dev'
Inventory Fragments

See merge request morningstar/Arcturus-Community!504
2022-03-21 16:36:18 +00:00
Bill
66397c8d98 Fix the busted inventory fragments 2022-03-21 12:31:05 -04:00
Snaiker
5b24a73297 Fix NPE 2022-03-21 12:30:42 +00:00
Remco
ce766fa381 Merge branch 'builder-area' into 'dev'
Feature: InteractionBuildArea

See merge request morningstar/Arcturus-Community!501
2022-03-20 20:29:48 +00:00
brenoepics
21647c8a35 Merge branch 'dev' into 'fix-trophies'
# Conflicts:
#   sqlupdates/3_0_0 to 3_0_1.sql
2022-03-20 19:13:17 +00:00
brenoepics
2cf32fb131 Feature: InteractionBuildArea 2022-03-20 00:14:23 -03:00
Remco
19c1768902 Merge branch 'Update-Loop' into 'dev'
Loop Fix

See merge request morningstar/Arcturus-Community!493
2022-03-19 19:37:16 +00:00
xjoao
84aa16b50e Loop Fix 2022-03-19 19:37:16 +00:00
Remco
d2a867949c Merge branch 'Update-Navigator' into 'dev'
Update Navigator Manager

See merge request morningstar/Arcturus-Community!494
2022-03-19 19:37:00 +00:00
Remco
7efe8bd618 Merge branch 'fix-issue-marketplace-sql' into 'dev'
Fix issue when try cancel the item on marketplace

See merge request morningstar/Arcturus-Community!499
2022-03-19 19:35:57 +00:00
brenoepics
5a66c30e8d Feature Friendlist Categories 2022-03-19 19:34:21 +00:00
brenoepics
b2e0cc6347 Merge branch 'dev' into 'fix-trophies'
# Conflicts:
#   sqlupdates/3_0_0 to 3_0_1.sql
2022-03-19 18:30:32 +00:00
brenoepics
52cf3a388b Merge branch 'dev' into 'calendar-fix'
# Conflicts:
#   sqlupdates/3_0_0 to 3_0_1.sql
2022-03-19 18:26:10 +00:00
Snaiker
5e9b9c7f30 Fix issue when try cancel the item on marketplace 2022-03-19 17:08:15 +00:00
Snaiker
ddef2543fe Fix issue NPE 2022-03-18 02:46:18 +00:00
Harmonic
8d525ff60b Merge branch 'fix-remove-rights' into 'dev'
ejectUserFurni on remove room rights

See merge request morningstar/Arcturus-Community!491
2022-03-06 21:48:41 +00:00
brenoepic
b28bf5f4ef Update Room.java 2022-03-06 02:22:05 +00:00
brenoepics
c7ed4a88c2 ejectUserFurni on remove rights 2022-03-05 23:17:27 -03:00
Remco
f3b0a9d170 Merge branch 'master' into 'dev'
Fix issue #980 - People with rights should be able to edit sticky notes

See merge request morningstar/Arcturus-Community!488
2022-03-03 22:41:48 +00:00
Remco
80bdfb1522 Merge branch 'fix-pressure-plates' into 'dev'
Fix pressure plates

See merge request morningstar/Arcturus-Community!485
2022-03-03 22:27:30 +00:00