nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-30 09:50:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,867 Commits 6 Branches 30 Tags 9.6 MiB
a6c6e8222f
Commit Graph

1461 Commits

Author SHA1 Message Date
brenoepic
36fed88ea9 Add null checks 2022-04-29 00:28:35 -03:00
brenoepic
1409aedcbb Update YoutubeManager.java 2022-04-29 00:28:18 -03:00
brenoepic
b087b8ace9 Update InteractionTrap.java 2022-04-29 00:28:10 -03:00
brenoepic
2aace7ef9a Update InteractionBuildArea.java 2022-04-29 00:28:04 -03:00
brenoepic
47afae6a8a Update InteractionFootball.java 2022-04-29 00:27:59 -03:00
brenoepic
376a28dcbd cleanup code 2022-04-29 00:05:28 -03:00
brenoepic
572961c2fa Merge this if statement with the enclosing one. 2022-04-28 23:47:05 -03:00
brenoepic
73c5aa78b3 Update PushCommand.java 2022-04-28 23:44:34 -03:00
brenoepic
d2759d376e Update PullCommand.java 2022-04-28 23:44:30 -03:00
brenoepic
7a8a2f42ee Refactor methods to reduce its Cognitive Complexity 2022-04-28 23:44:24 -03:00
brenoepic
952ba6e172 Reorder the modifiers to comply with the Java Language Specification. 2022-04-28 20:28:13 -03:00
brenoepic
751a2d4cff move pseudorandom number generator 2022-04-28 20:20:46 -03:00
brenoepic
61acf1ec59 printStackTrace to LOGGER 2022-04-28 20:19:49 -03:00
brenoepic
1a932f6955 Fix moveItem 2022-04-28 20:19:03 -03:00
Harmonic
1c39e29c8e Reorganise Incoming.java 2022-04-22 08:31:10 -07:00
Harmonic
f1af67522a Finished refactoring incoming.java 
incoming and outgoing packets now match habbo's official names 1:1
 2022-04-22 07:32:22 -07:00
Harmonic
e4349b6369 Finished refactoring incoming.java list 
Still todo: rename all event files.
 2022-04-22 06:40:49 -07:00
Harmonic
4c7b2da4a1 Finishing Packet renaming tomorrow. Phew. 2022-04-21 16:58:03 -07:00
Harmonic
ee45a5ce99 Fixed issue with PacketManager 2022-04-21 16:47:04 -07:00
Harmonic
754cb0c155 Fix Pet InfoEvent 2022-04-21 16:46:27 -07:00
Harmonic
6fbf3ca271 Fixed issues with pet branch merge into 4.0 2022-04-21 16:20:41 -07:00
Harmonic
4f0143e982 Merge branch 'fix-pets-finally' into ms4-unstable 2022-04-21 15:21:35 -07:00
Harmonic
717c7f313b Fixed issues with merging remaining 3.5 features into 4.0 branch 2022-04-21 15:13:51 -07:00
Harmonic
a5bc4f9c50 Fix Oops 2022-04-21 14:47:05 -07:00
Harmonic
23d1a6189e Updates to incoming.java 2022-04-21 14:47:05 -07:00
Harmonic
100f6879bf Updates to incoming.java 2022-04-21 14:47:05 -07:00
Harmonic
9e08840dce Updates to incoming.java 2022-04-21 14:47:05 -07:00
Harmonic
3eebdf6880 Oops. 2022-04-21 14:47:05 -07:00
Harmonic
30f27c1fb0 Start refactoring incoming... here we go again. 2022-04-21 14:47:05 -07:00
Harmonic
8cfcb9580c Fixed packet ids. 2022-04-21 14:47:05 -07:00
Harmonic
c66b739a78 Finished Outgoing (Yay!) 2022-04-21 14:47:05 -07:00
Harmonic
bf23a4be67 Yet another refactoring commit pt3 2022-04-21 14:44:28 -07:00
Harmonic
88e294dd65 Yet another refactoring commit. 2022-04-21 14:44:28 -07:00
Harmonic
8c28bfd85a Yet another refactoring commit. 2022-04-21 14:43:59 -07:00
Harmonic
afd46b2bdd I never learned the alphabet... 2022-04-21 14:43:59 -07:00
Harmonic
6902a6ff95 Refactored all outgoing composer names beginning with F 2022-04-21 14:33:26 -07:00
Harmonic
da1226b083 Refactored all outgoing composer names beginning with G 2022-04-21 14:30:35 -07:00
Harmonic
9e5877d9c4 Refactored all outgoing composer names beginning with D 2022-04-21 14:28:52 -07:00
Harmonic
a97a7d5ae2 Refactored all outgoing composer names beginning with C 2022-04-21 14:28:52 -07:00
Harmonic
1a86232ab0 Refactored all outgoing composer names beginning with B 2022-04-21 14:28:52 -07:00
Harmonic
3ca03f9d8f Refactored all outgoing composer names beginning with A 2022-04-21 14:28:52 -07:00
brenoepic
9f9bbf1a37 Fix Interaction Water 2022-04-21 14:28:52 -07:00
brenoepic
0fb8dad0ea fix previous enable 2022-04-21 14:28:03 -07:00
Harmonic
a23fb4f8cd Start Renaming and Incoming Refactor 2022-04-21 14:28:03 -07:00
Harmonic
2fa5251a95 Cleaned Up Outgoing.java 2022-04-21 14:27:28 -07:00
Harmonic
55189dfa21 Added todo to empty composers. 2022-04-21 14:27:28 -07:00
Harmonic
f1fb401ba6 Refactoring Outgoing Part 383 - yay 2022-04-21 14:27:28 -07:00
Harmonic
9263800612 Refactoring Outgoing Part 382 - yay 2022-04-21 14:27:28 -07:00
Harmonic
ff588b404f Refactoring Outgoing Part 381 - yay 2022-04-21 14:27:28 -07:00
Harmonic
6a63513b7a 4.0.0 Developer Preview 2022-04-21 14:27:28 -07:00
Harmonic
28993ead89 Fixed Composer Name 2022-04-21 14:26:56 -07:00
Harmonic
edc4050184 Refactoring Outgoing Packet Composer Names Part 5 2022-04-21 14:26:23 -07:00
brenoepic
5b869f35b4 Fix flagme 2022-04-21 14:26:10 -07:00
brenoepic
8d89f2034d UsernameEvent > GetIgnoredUsersEvent 2022-04-21 14:25:50 -07:00
brenoepic
c33e8675a8 Set lastonline on habbo.java 2022-04-21 14:24:29 -07:00
brenoepic
d7e059326e Fix CalendarCommand 2022-04-21 14:24:29 -07:00
Harmonic
963d892934 Refactoring Outgoing Packet Composer Names Part 4 2022-04-21 14:24:29 -07:00
Harmonic
6447563a28 Refactoring Outgoing Packet Composer Names Part 3 2022-04-21 14:24:29 -07:00
Harmonic
f42a14db7c Refactoring Outgoing Packet Composer Names Part 2 2022-04-21 14:24:29 -07:00
Harmonic
33495ef038 Refactoring Outgoing Packet Composer Names Part 1 2022-04-21 14:23:11 -07:00
Harmonic
4e1a6118f2 Revert "Revert "Merge branch 'refactor/wired-saving' into 'dev'"" 
This reverts commit d3762c9b87
 2022-04-21 00:02:16 +00:00
Harmonic
d3762c9b87 Revert "Merge branch 'refactor/wired-saving' into 'dev'" 
This reverts merge request !507
 2022-04-20 23:55:55 +00:00
Harmonic
8236fba2f7 3.5.0 tag 2022-04-20 16:48:38 -07:00
ArpyAge
fa0f58b87f Custom stacking setting to stack bigger items on top of smaller ones 2022-04-17 03:39:55 +02:00
Harmonic
098d6a6684 Merge branch 'fix-floorplaneditor' into 'dev' 
add null check

See merge request morningstar/Arcturus-Community!549
 2022-04-15 21:50:52 +00:00
brenoepic
d9d24d9073 add null check 2022-04-15 15:41:32 -03:00
Harmonic
8724c301ba Merge branch 'rcon-change-username' into 'dev' 
Added new RCON command (Change Username)

See merge request morningstar/Arcturus-Community!547
 2022-04-15 01:25:22 +00:00
Snaiker
609cfd4fe3 Added new RCON command 2022-04-15 02:02:35 +01:00
Snaiker
2a6e81ef05 Check if the offline user exists 2022-04-15 01:29:06 +01:00
Snaiker
9dad818fda Removed old code 2022-04-15 01:19:50 +01:00
ArpyAge
631dbe9d38 Changed order or operations so Buildheight event can override max/min height of tiles 2022-04-15 01:08:23 +02:00
Harmonic
7e2beb83ce Merge branch 'fix-mannequin' into 'dev' 
Fix mannequin name

See merge request morningstar/Arcturus-Community!539
 2022-04-14 22:23:36 +00:00
Harmonic
8442d72750 Merge branch 'fix-inventories' into 'dev' 
Fix empty inventories

See merge request morningstar/Arcturus-Community!544
 2022-04-14 22:13:54 +00:00
brenoepics
002c53e8bb Update src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryItemsEvent.java 2022-04-14 19:07:10 +00:00
brenoepics
471dae3068 Fix empty inventories 2022-04-14 19:01:22 +00:00
Harmonic
ffc24bfb2e Merge branch 'fix-duplicated-badge' into 'dev' 
Change the condition

See merge request morningstar/Arcturus-Community!543
 2022-04-14 13:11:06 +00:00
ArpyAge
dd704b6db7 items with lay for wired.place.under 2022-04-14 01:26:23 +02:00
Snaiker
da5ef038aa Change 2022-04-13 14:35:37 +01:00
Bill
d8e4fbe2da Merge branch 'fix-duplicated-badge' into 'dev' 
Fix Achievements Badge

See merge request morningstar/Arcturus-Community!541
 2022-04-13 04:55:43 +00:00
Snaiker
850f5a3e12 Fix 2022-04-13 05:47:03 +01:00
Snaiker
fedc19c726 Fix Achievements Badge 2022-04-13 05:45:02 +01:00
Bill
c8a9984167 Merge branch 'fix-duplicated-badge' into 'dev' 
Fix: Duplicated badges

See merge request morningstar/Arcturus-Community!540
 2022-04-13 04:16:03 +00:00
Snaiker
a5e9fba8e4 Fixs 2022-04-13 05:08:09 +01:00
brenoepic
ab5c491aa5 Fix mannequin name 2022-04-12 23:03:48 -03:00
Harmonic
a201c7603c Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2022-04-12 18:52:26 -07:00
Harmonic
8ac9d130bd Fixed packet issue - copied 1:1 habbo behaviour on group admins for moderating threads 2022-04-12 18:51:42 -07:00
Harmonic
9eff2274d7 Merge branch 'fix-bots' into 'dev' 
Fix PlaceBot stackheight

See merge request morningstar/Arcturus-Community!538
 2022-04-13 00:22:55 +00:00
Harmonic
8fc91fc875 More consistent check. 2022-04-12 17:12:37 -07:00
Harmonic
593ec5447a More consistent check. 2022-04-12 17:08:57 -07:00
Harmonic
eecb8ba8fa Normal group members can no longer view hidden posts & admins can now hide & unhide posts. 2022-04-12 17:06:00 -07:00
Harmonic
eb36d7018c Updated Catalog Layouts (TenShie) 2022-04-12 11:50:28 -07:00
brenoepic
890cdd519a Fix PlaceBot stackheight 2022-04-12 14:55:30 -03:00
Harmonic
8a73eb2b43 Merge branch 'fix-floorplaneditor' into 'dev' 
Fix FloorPlanEditor

See merge request morningstar/Arcturus-Community!536
 2022-04-12 17:52:45 +00:00
brenoepic
9e1e90f4f1 Fix room z and removed tiles 2022-04-12 13:27:42 -03:00
Harmonic
e8192e3f79 Merge branch 'fix-teleports' into 'dev' 
Fix teleport bugs

See merge request morningstar/Arcturus-Community!535
 2022-04-12 11:18:08 +00:00
brenoepic
85da25e70d Fix Room change during teleport 2022-04-11 23:49:29 -03:00
brenoepic
bad061bfd1 Fix teleports on floorplaneditor 2022-04-11 23:46:05 -03:00
Harmonic
281a611cc7 Merge branch 'fix-pets-finally' into 'fix-pets-finally' 
Code cleanup + InteractionPetToy + InteractionPetDrink

See merge request morningstar/Arcturus-Community!534
 2022-04-12 00:01:04 +00:00
brenoepic
7fef24fa85 Trampoline interaction 2022-04-11 20:21:11 -03:00
brenoepic
c8d3308523 Update InteractionPetDrink.java 2022-04-11 17:51:37 -03:00
brenoepic
278da94db6 Fix pet drinks 2022-04-11 16:14:07 -03:00
brenoepic
a11544ffdc Update InteractionPetToy.java 2022-04-11 16:13:29 -03:00
brenoepic
f54d185772 Feature: InteractionPetToy 2022-04-11 14:45:14 -03:00
brenoepic
0cc5b5cb73 code cleanup 2022-04-11 14:44:36 -03:00
Harmonic
388c8ec812 Merge branch 'fix-pets-finally' into 'fix-pets-finally' 
Fix ActionCroak

See merge request morningstar/Arcturus-Community!531
 2022-04-11 13:00:26 +00:00
Oliver
e3f4d2898c Fix ActionCroak 2022-04-11 13:00:26 +00:00
Harmonic
375f6a0e42 Fixed Guilds so group admins can accept and remove group members. 2022-04-10 17:11:25 -07:00
brenoepic
90fec0f18a Fix turtles roll 2022-04-10 19:35:51 -03: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
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
brenoepic
a0193c48b3 Pet Fixes + fix conflicts 2022-04-10 00:11:14 -03:00
oshawott
d591c3f5f0 Update Voucher.java 2022-04-10 01:18:52 +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
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
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
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
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
c8f787bf32 Merge branch 'fix-packet-integer-room-score' into 'dev' 
Fixed RoomDataComposer to send correct room score

See merge request morningstar/Arcturus-Community!496
 2022-03-20 20:34:44 +00:00
Snaiker
e7bde3cbee Fixed RoomDataComposer to send correct room score 2022-03-20 20:34:44 +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