Commit Graph

1564 Commits

Author SHA1 Message Date
brenoepic
bad061bfd1 Fix teleports on floorplaneditor 2022-04-11 23:46:05 -03:00
Harmonic
7275f9c456 Merge branch 'dev' into 'dev'
Fix #824 ups

See merge request morningstar/Arcturus-Community!533
2022-04-11 00:25:01 +00:00
Harmonic
df35e727bb Merge branch 'dev' into 'dev'
# Conflicts:
#   src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
2022-04-11 00:24:35 +00:00
Harmonic
375f6a0e42 Fixed Guilds so group admins can accept and remove group members. 2022-04-10 17:11:25 -07:00
AlfreviD
b892d688c4 Fix #824 ups 2022-04-10 23:57:13 +00:00
Harmonic
60ecf6226f Merge branch 'dev' into 'dev'
Fix Issue #824

See merge request morningstar/Arcturus-Community!530
2022-04-10 21:03:26 +00:00
AlfreviD
fa266af82d Fix Issue #824 2022-04-10 18:27:05 +00: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
37abd2aadb Added "Atcg" Achievement on crafting 2022-04-10 10:45:23 -07:00
Harmonic
52be0b45a0 Fixed daily respects and scratches not showing without reload. (nttzx) 2022-04-10 09:56:28 -07: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
Harmonic
dc73b8529b Merge branch 'vouchers-fix' into 'dev'
Update Voucher.java

See merge request morningstar/Arcturus-Community!473
2022-04-10 01:18:52 +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
Harmonic
469ec8a8f7 Merge branch 'fix-room-rights' into 'dev'
Users with rights must not remove items from the room owner

See merge request morningstar/Arcturus-Community!489
2022-04-08 20:30:26 +00:00
xjoaoppf
57897c14c0 Fixed WordFilter Code 2022-04-04 16:02:07 +00:00
Harmonic
6a599c32c7 Merge branch 'fix-marketplace-buy-item-sql' into 'dev'
Fix SQL Exceptions on Market Place

See merge request morningstar/Arcturus-Community!516
2022-04-02 12:41:42 +00:00
Snaiker
745dbed6aa Fix SQL Exceptions on Market Place 2022-04-02 13:27:40 +01:00
Remco
599844d4b1 Merge branch 'dev' into 'dev'
Removed old links, and Re-wrote the startup.

See merge request morningstar/Arcturus-Community!515
2022-03-31 08:36:27 +00:00
SenpaiDipper
a9de571426 Removed old links, and Re-wrote the startup. 2022-03-31 08:36:26 +00: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
c3d6af45fd Merge branch 'fix-doorbell' into 'dev'
Fix: send to hotelview when cancel doorbell

See merge request morningstar/Arcturus-Community!512
2022-03-23 22:02:14 +00: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
b0b213cfb3 Fix doorbell 2022-03-23 18:20:27 -03:00
brenoepics
8eacb5b977 Update CalendarRewardClaimed.java 2022-03-23 17:50:32 -03:00
ArpyAge
9608d6cec2 Merge branch 'patch/moodlight-color-config' into 'dev'
add moodlight color config

See merge request morningstar/Arcturus-Community!510
2022-03-23 18:01:27 +00:00
Bill
208c07a809 Add bot motto max length to match user 2022-03-23 04:43:39 -04:00
dank074
b668bfd99a add moodlight color config 2022-03-23 03:15:25 -05:00
Bill
e304ba1ecb Revert change to EmptyInventoryCommand 2022-03-23 03:27:50 -04:00
ArpyAge
f81470f7ba No more empty gifts! 2022-03-23 03:28:23 +01:00
dank074
e3b0c62d5b fix wired condition furni has avatars sending wrong data 2022-03-22 20:49:28 -05:00
Remco
529a84ec47 Merge branch 'fix/interaction-football' into 'dev'
Fixed interaction football valid moves

See merge request morningstar/Arcturus-Community!509
2022-03-22 11:50:02 +00: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
ArpyAge
10f2d6d98e Merge branch 'calendar-fix' into 'dev'
Fix calendar timestamp on mariadb

See merge request morningstar/Arcturus-Community!506
2022-03-21 23:27:12 +00: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