nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-06-30 20:55:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,471 Commits 6 Branches 30 Tags 9.5 MiB
e304ba1ecb
Commit Graph

822 Commits

Author SHA1 Message Date
Bill
e304ba1ecb Revert change to EmptyInventoryCommand 2022-03-23 03:27:50 -04:00
Remco
e56d4eb791 Fixed interaction football valid moves 2022-03-22 12:47:06 +01: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
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
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
brenoepic
e6c1766c2c Fix pressure plates 2022-03-03 22:27:30 +00:00
Remco
42a65dc54b Merge branch 'crackable-fix' into 'dev' 
Fix ticks in crackable furni interaction.

See merge request morningstar/Arcturus-Community!445
 2022-03-03 10:03:17 +00:00
brenoepic
6a2b5a9618 Merge branch 'dev' into 'calendar-fix' 
# Conflicts:
#   sqlupdates/3_0_0 to 3_0_1.sql
 2022-03-02 23:39:34 +00:00
brenoepics
a778054241 calendar update 2022-03-02 20:05:02 -03:00
Remco
e195a108b1 Merge branch 'wordfilter-event-fix' into 'dev' 
Fix SupportTicketEvent is fired twice

See merge request morningstar/Arcturus-Community!481
 2022-03-02 22:34:21 +00:00
Snaiker
3b8caee5de Cleanup redeem voucher 2022-03-02 22:20:16 +00:00
brenoepic
662befaeb3 Fix YoutubeTV 2022-03-02 22:13:56 +00:00
Remco
9e05691ba6 Merge branch 'mysql-connector-update' into 'dev' 
Addresses #889: update mysql connector

See merge request morningstar/Arcturus-Community!339
 2022-03-02 21:44:54 +00:00
skeletor
c865bb2382 Addresses #889: update mysql connector 2022-03-02 21:44:53 +00:00
brenoepics
f022c31f3d Update ModToolManager.java 2022-02-21 17:49:03 -03:00
xjoao
ba6a849972 Update Navigator Manager 2022-01-20 12:06:04 +00:00
brenoepic
434db05ce3 Fix SubscriptionCommand NPE on not online user 2022-01-18 22:50:57 +00:00
ArpyAge
20120ea6bb Merge branch 'xjoao-master-patch-29021' into 'dev' 
Update ModToolIssue.java removed semicolon

See merge request morningstar/Arcturus-Community!458
 2022-01-18 22:22:19 +00:00
ArpyAge
fb30ca1100 Merge branch 'color-wheel' into 'dev' 
Fix ColorWheel interaction

See merge request morningstar/Arcturus-Community!461
 2022-01-18 22:21:44 +00:00
ArpyAge
cffa8af52e Merge branch 'dev' into 'dev' 
Fix issue Buy furniture with a badge attached

See merge request morningstar/Arcturus-Community!462
 2022-01-18 22:21:35 +00:00
brenoepic
afcffa96a3 Fix Buy furniture with a badge attatched already own 2022-01-18 21:54:36 +00:00
brenoepic
f126115c3d Fix ColorWheel interaction 2022-01-18 20:36:21 +00:00
xjoao
0abfc64acb Update ModToolIssue.java removed semicolon 2022-01-06 11:08:01 +00:00
ArpyAge
61e30ea920 Merge branch 'master' into 'dev' 
Yikes Sorry.

See merge request morningstar/Arcturus-Community!456
 2022-01-05 20:07:22 +00:00
SenpaiDipper
f99de2009c Yikes Sorry. 2022-01-05 19:42:04 +00:00
SenpaiDipper
da789fcc1e Added Check for Kick Permission. 2022-01-02 04:16:22 +00:00
SenpaiDipper
c78813a405 Fixed Possible NPE's with System.getProperty 2021-12-19 15:05:48 +00:00
ArpyAge
86cf51ab05 New event to be able to edit floor items while loading room (to hide furniture for example) 2021-11-20 02:55:26 +01:00