Commit Graph

1843 Commits

Author SHA1 Message Date
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
56677c2e15 Merge branch 'fix-pets-finally' into 'fix-pets-finally'
Add 4 new commands and cleanups

See merge request morningstar/Arcturus-Community!525
2022-04-10 14:56:34 +00:00
Harmonic
0324dbc163 Merge branch 'fix-pets-finally' into 'fix-pets-finally'
# Conflicts:
#   src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnitStatus.java
2022-04-10 14:56:26 +00:00
Harmonic
f09234a922 Merge branch 'fix-pets-finally' into 'fix-pets-finally'
Add HaveToyItem + fix conflicts

See merge request morningstar/Arcturus-Community!528
2022-04-10 11:32:26 +00:00
brenoepic
a0193c48b3 Pet Fixes + fix conflicts 2022-04-10 00:11:14 -03: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
Harmonic
0c61803992 Merge branch 'fix-pets-finally' into 'fix-pets-finally'
5 PetActions + InteractionPetTree + Pet animation on water

See merge request morningstar/Arcturus-Community!527
2022-04-09 19:24:42 +00:00
brenoepic
930987d9fa Merge branch 'fix-pets-finally' of https://git.krews.org/brenoepic/Arcturus-Community into fix-pets-finally 2022-04-09 15:30:15 -03:00
brenoepic
90dfc45796 Added pet swim on water 2022-04-09 15:30:01 -03:00
brenoepic
0363baf523 Add is dragon check 2022-04-09 15:29:32 -03:00
brenoepics
2942b41715 Merge branch 'fix-pets-finally' into 'fix-pets-finally'
# Conflicts:
#   src/main/java/com/eu/habbo/habbohotel/pets/PetManager.java
#   src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionRingOfFire.java
2022-04-09 17:24:57 +00:00
brenoepics
45766ef104 Update RoomUnitStatus.java 2022-04-09 03:22:11 +00:00
brenoepic
e16b0527b8 Update PetManager.java 2022-04-09 00:19:27 -03:00
brenoepic
ac60af6cc1 Create ActionSwing.java 2022-04-09 00:19:20 -03:00
brenoepic
510cfef21c Create ActionRoll.java 2022-04-09 00:19:13 -03:00
brenoepic
8e4446e46e Create ActionRingOfFire.java 2022-04-09 00:19:08 -03:00
brenoepic
4a84432630 Create ActionHang.java 2022-04-09 00:19:00 -03:00
brenoepic
582da9dad0 Feature InteractionPetTree 2022-04-09 00:18:53 -03:00
brenoepic
8509692f4b Tree RoomUnitStatus 2022-04-09 00:17:00 -03: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
Oliver
3427700897 Update PetManager for new commands 2022-04-08 22:49:15 +00:00
Oliver
85f71ca745 Upload New File 2022-04-08 22:45:33 +00:00
Oliver
49f62727f9 Upload New File 2022-04-08 22:45:05 +00:00
Oliver
8940b2d727 Add Bounce command 2022-04-08 22:44:47 +00:00
Oliver
02ba30072a Add Flat command 2022-04-08 22:44:10 +00:00
Oliver
01e082136f Cleaned up RoomUnitStatus and added some stuff 2022-04-08 22:43:10 +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
Harmonic
bd0bb09fec Merge branch 'fix-pets-finally' into 'fix-pets-finally'
Fix pet pickup in other peoples rooms

See merge request morningstar/Arcturus-Community!523
2022-04-08 19:01:52 +00:00
Harmonic
f0a1c6b70b Merge branch 'fix-pets-finally' into 'fix-pets-finally'
Add 3 commands

See merge request morningstar/Arcturus-Community!522
2022-04-08 19:01:03 +00:00
brenoepic
397edaeba8 Fix PetPickupEvent 2022-04-08 13:28:20 -03:00
Oliver
fd23c73b24 Add dance and Mambo to PetManager.java 2022-04-08 16:20:14 +00:00
Oliver
12ad3adfcc Add Dance & Mambo 2022-04-08 16:19:14 +00:00
Oliver
5e44354ce3 Upload ActionRingOfFire 2022-04-08 15:34:49 +00:00
Oliver
66d8db7fb4 Add some dragon stuff to RoomUnitStatus.java 2022-04-08 15:33:11 +00:00
Oliver
6484d7f563 Add Ring of Fire to PetManager.java 2022-04-08 15:30:26 +00:00
Harmonic
c32754d1dd Merge branch 'fix-pets-finally' into 'fix-pets-finally'
Fix Pet ActionSit

See merge request morningstar/Arcturus-Community!520
2022-04-08 09:21:22 +00:00
brenoepic
8e449e79a1 Fix Follow Left/Right 2022-04-08 01:44:21 -03:00
brenoepic
df0b34a7bd Fix ActionFollow 2022-04-08 01:41:07 -03:00
brenoepic
55015afd46 Fix ActionPlayDead 2022-04-08 00:37:40 -03:00
brenoepic
01c01dcf70 Update ActionSit.java 2022-04-08 00:17:30 -03:00
brenoepic
6625e4edc4 Fix ActionDown 2022-04-08 00:17:14 -03:00
brenoepic
516560f603 Fix ActionSit 2022-04-08 00:02:30 -03:00
Harmonic
0795a9f6ad Merge branch 'fix-pets' into 'fix-pets-finally'
Fix pets and bots invalid tiles

See merge request morningstar/Arcturus-Community!519
2022-04-08 00:52:00 +00:00
Harmonic
4a68e6a4a2 Fixed Action Turn Right and Turn Left not moving the pets head. 2022-04-07 17:49:47 -07:00
Breno Andrade
2e2d7ae96c Fix pets and bots invalid tiles 2022-04-07 21:42:59 -03:00
Harmonic
42198c46bd Fixed pet commands not pushing the RoomUserStatusComposer after setting the gesture. 2022-04-07 14:37:34 -07:00