Commit Graph

1184 Commits

Author SHA1 Message Date
Harmonic
683ff1dd1d Revert "cleaned up wordfilter"
This reverts commit 947d7a4ce7
2020-09-27 14:38:57 -04:00
Remco
e7a090d9fc Fix branch state 2020-09-26 17:52:53 +02:00
Remco
246bbc80a8 Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2020-09-26 16:00:53 +02:00
Harmonic
f27d707832 Merge branch 'patch-3' into 'dev'
Verify the length of the name group

See merge request morningstar/Arcturus-Community!273
2020-09-25 17:04:08 -04:00
Harmonic
e24b2afa31 Merge branch 'dev' into 'patch-3'
# Conflicts:
#   src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyEvent.java
2020-09-25 17:03:57 -04:00
Harmonic
0033fb79ff Merge branch 'dev' into 'dev'
mannequin fix for jackets

See merge request morningstar/Arcturus-Community!303
2020-09-25 17:02:15 -04:00
Mikkel Friis
c6ea16fe7d mannequin fix for jackets 2020-09-25 04:41:16 +02:00
Harmonic
6815cdf248 Merge branch 'dev' into 'dev'
The sphere now flashes blue when the timer starts

See merge request morningstar/Arcturus-Community!301
2020-09-24 16:09:57 -04:00
Ilany
8b873edd14 Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2020-09-24 09:41:14 +02:00
Kitt Mustang
b64e837535 The sphere now flashes blue when the timer starts 2020-09-23 08:52:51 -04:00
Harmonic
4c73b37e21 Merge branch 'dev' into 'dev'
cleaned up wordfilter

See merge request morningstar/Arcturus-Community!300
2020-09-22 15:35:31 -04:00
Harmonic
c270c46c13 Merge branch 'bugfix/vendingmachine-npe' into 'dev'
Fixed NPE when a vendingmachine is facing a wall where the user can't reach it

See merge request morningstar/Arcturus-Community!299
2020-09-22 15:35:14 -04:00
Mikkel Friis
947d7a4ce7 cleaned up wordfilter 2020-09-22 04:31:38 +02:00
Ilany
e72d1780eb Merge branch 'dev' of https://git.krews.org/Remco/Arcturus-Community into dev 2020-09-21 16:22:01 +02:00
Ilany
4a334fb563 Fixed vendingmachines NPE 2020-09-21 15:41:51 +02:00
Harmonic
d82184ca83 Merge branch '730-vending-machine-bug' into 'dev'
Fixed sitting rotate bug vending machines

See merge request morningstar/Arcturus-Community!290
2020-09-19 13:17:01 -04:00
Harmonic
114794c171 Merge branch 'NullExceptions' into 'dev'
Fixed Null Exception

See merge request morningstar/Arcturus-Community!277
2020-09-19 13:16:50 -04:00
Harmonic
58ceabf338 Merge branch 'football-fixes' into 'dev'
Football fixes

See merge request morningstar/Arcturus-Community!291
2020-09-19 13:16:25 -04:00
Harmonic
a886341c60 Merge branch 'buildheight_stackable_event' into 'dev'
Plugin events to make everything stackable if needed (in case of :buildheight)

See merge request morningstar/Arcturus-Community!281
2020-09-19 13:16:11 -04:00
Harmonic
17af91536b Merge branch 'dev' into 'dev'
multiple fixes

See merge request morningstar/Arcturus-Community!293
2020-09-19 13:15:52 -04:00
Harmonic
5de8d0607c Merge branch 'fix/gate' into 'dev'
Fix: Gates shouldn't close if a user stands on it when clicked or activated by wired

See merge request morningstar/Arcturus-Community!297
2020-09-19 13:15:29 -04:00
Mikkel Friis
a0072a407f check rights if room is invisible
this fixes #788
2020-09-19 01:56:00 +02:00
Mikkel Friis
1bd21c490f stop dancing if respecting
this fixes #787
2020-09-19 01:44:45 +02:00
Ilany
986a3b323c Wired cannot trigger door when a Habbo is on it 2020-09-18 15:04:57 +02:00
Ilany
0a09ff1f41 Added comments 2020-09-18 14:24:42 +02:00
Ilany
8cbe5129ac Fixed gate bug 2020-09-18 13:35:25 +02:00
Ilany
35988378b7 Cleanup imports 2020-09-17 19:15:52 +02:00
Ilany
9d2347cb9f Fixed wired trigger for one way gates 2020-09-17 19:10:36 +02:00
Mikkel Friis
c2dabbd0ed "Follow" does not disappear #780
this fixes #780
2020-09-17 08:33:19 +02:00
Mikkel Friis
7cba83e60a force walks on furni on one way gate #784
this fixes #784
2020-09-17 08:24:58 +02:00
Mikkel Friis
0d88193994 message overflow fix #741
this fixes #741
2020-09-17 08:11:06 +02:00
Mikkel Friis
407bdb4440 Talking furni fix #779
This fixes issue #779
2020-09-17 07:35:00 +02:00
Mikkel Friis
774cf85926 wired furni selection count fix 2020-09-15 19:38:31 +02:00
Harmony
b28f115784 Merge branch 'dev' into 'dev'
Recycler value fix (critical)

See merge request morningstar/Arcturus-Community!292
2020-09-15 11:34:18 -04:00
Mikkel Friis
cdbae76e84 Recycler value fix (critical) 2020-09-15 17:22:35 +02:00
Beny
1b779b772e Football fixes 2020-09-13 07:25:05 +02:00
Beny
01b23cdc7e Fixed sitting rotate bug vending machines 2020-09-13 07:14:59 +02:00
Harmonic
e70bffccf3 Merge branch 'master' into 'dev'
# Conflicts:
#   README.md
#   pom.xml
#   src/main/java/com/eu/habbo/Emulator.java
#   src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemEvent.java
#   src/main/java/com/eu/habbo/messages/incoming/catalog/CheckPetNameEvent.java
#   src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumPostThreadEvent.java
2020-09-06 08:24:22 -04:00
harmonic
9dd93e5c4e 2.4.0 Stable. Changed Version String. 2020-09-06 13:25:46 +01:00
harmonic
270d07f2c3 Revert Changes to FriendRequestEvent 2020-09-06 13:23:08 +01:00
harmonic
1298f48e53 Added Thankyou Console Command. Added missing SQL File. 2.4.0 Stable. 2020-09-06 13:21:06 +01:00
harmonic
b7446bca45 Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev-latest 2020-09-06 12:55:39 +01:00
Harmonic
7949d835a8 Merge branch '730-vending-machine-bug' into 'dev'
Vending machines fixed

See merge request morningstar/Arcturus-Community!285
2020-09-06 07:36:35 -04:00
ArpyAge
86ae72c02d Removed unused code 2020-09-03 22:08:24 +02:00
ArpyAge
3600a8f53c updated getStackHeight so it's the same as the devbuild 2020-09-03 22:07:45 +02:00
Beny
2c7b58c2a1 Vending machines fixed 2020-09-03 02:04:41 +02:00
Beny
2f1205f5e6 Merge branch '694-multiple-users-on-rollers' into 'dev'
Config value added for amount of users to roll - hotel.room.rollers.roll_avatars.max

See merge request morningstar/Arcturus-Community!283
2020-09-01 14:53:16 -04:00
Beny
f6f1897ab8 Config value added for amount of users to roll - hotel.room.rollers.roll_avatars.max 2020-09-01 20:47:49 +02:00
ArpyAge
47865f0ec5 Plugin events to make everything stackable if needed (in case of :buildheight) 2020-09-01 00:22:21 +02:00
Harmonic
973f918c2e Merge branch 'dev' into 'dev'
Fix Teleport invisible Bug and 1 user per roller

See merge request morningstar/Arcturus-Community!279
2020-08-27 15:48:13 -04:00