20dd9c683b
Merge remote-tracking branch 'origin/master' into monster-maze
...
Conflicts:
Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
Changed the scoreboard a bit, added it to MPS.
2015-10-11 10:52:45 -04:00
7bc3b4970b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/titangiveaway/TitanGiveawayRepository.java
2015-10-10 17:34:17 +11:00
7851cb451a
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
2015-10-09 22:34:05 -04:00
aa9fd1abf3
Titan giveaway work
2015-10-09 22:14:10 -04:00
90c685617d
Animation
2015-10-09 22:14:01 -04:00
99fd88473b
rank colors
2015-10-09 14:20:02 +11:00
082b16fe0d
Stuff and things to help make mounts be cool.
2015-10-08 22:28:07 -04:00
ec5694737c
statsmanager debug
...
rank fix
2015-10-09 11:44:12 +11:00
3c437925f1
halloween prep
2015-10-08 12:36:00 +11:00
6c73b1a5ac
Start moving i18n into master.
2015-10-04 15:24:58 +01:00
68c6ba595e
Visual enhancements.
2015-09-30 19:31:36 -04:00
8a9cc9ff14
Food Dupe Fix
2015-09-28 20:42:14 -04:00
00eecc0325
Fixes
2015-09-28 20:33:38 -04:00
eea7ef8350
Swag
2015-09-27 02:11:28 -04:00
b2f1f7d2ae
Fixed the tracker for pilot.
2015-09-25 11:38:32 -04:00
9a3ef895c9
Merge pull request #38 in MIN/mineplex from mrsomeone12_SmallFixes to master
...
* commit '633cbdabe279a9ec1a57d96d6585f58a6d3754df':
player.isOnGround() is controlled by packets from the player, meaning players can easily fake being on the ground resulting in infinite double jumps. player.getFallDisance() is also reset when isOnGround() returns true, meaning we'll need to manually check if the player is on the ground.
2015-09-23 19:37:48 -05:00
0581474a16
lots of work on Monster Maze
2015-09-18 08:25:11 -07:00
2de7fff267
Merge remote-tracking branch 'origin/master' into monster-maze
2015-09-13 08:45:34 -07:00
c9971bb117
fixed duplicate rank name
2015-09-12 16:45:22 +10:00
4184fe20cf
minor fixes
2015-09-12 14:09:04 +10:00
a4cc70c3f0
new small youtuber rank
2015-09-10 13:17:11 +10:00
ebd3fbe6d5
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-08-28 20:19:27 -06:00
e9b33668bc
Added donorsOnline to MinecraftServer snapshot
...
Refactored Rank class to use lowercase methods.
2015-08-28 13:22:04 -07:00
7b42f2155d
Tweaks. :D
2015-08-24 20:40:34 -04:00
cbaaee60d9
Removed mob spectating method from evolving.
2015-08-21 13:00:08 -04:00
63107b0c26
missing file
2015-08-20 20:39:20 +02:00
15c873392a
updated give to allow naming of items.
2015-08-20 20:38:07 +02:00
633cbdabe2
player.isOnGround() is controlled by packets from the player, meaning
...
players can easily fake being on the ground resulting in infinite double
jumps. player.getFallDisance() is also reset when isOnGround() returns
true, meaning we'll need to manually check if the player is on the
ground.
Outlines two opposite corners of the entities bounding box, scann all
blocks inside, check if any of them are solid and return respectively.
2015-08-20 15:42:39 +02:00
859a7e07d5
added the optional functionality
...
to include air blocks in the util
method getInBoundingBox()
2015-08-18 16:46:20 -07:00
2659dd4e39
Fixed minor bugs. Head now follows mob altitude.
2015-08-14 23:17:56 -04:00
7fb85f24d1
UtilEnt: Change CreatureLook to support LivingEntity, not just Creature
2015-08-14 19:15:35 +12:00
33a6e4cb13
UtilEnt: Add CreatureLook method
2015-08-14 19:12:05 +12:00
0c3c9702d9
Small fixes.
...
Added holograms to show kit abilities.
Fireworks are now client side only.
Decreased the # of emerald particles.
2015-08-12 09:44:55 -04:00
bd414cd231
Merge remote-tracking branch 'origin/master' into Myst_EVO
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
2015-08-10 19:47:53 -04:00
e81a3f7ecd
Added a method to UtilAlg.
2015-08-10 14:32:49 -04:00
b8b19ed4a5
Merge remote-tracking branch 'remotes/origin/master' into Bonus
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-08-10 03:24:59 -05:00
090c1f135d
Merge branch 'SarahsAwesomeBugFixes'
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
2015-08-07 21:48:35 +02:00
b22706e649
hub update part 1
2015-08-07 21:45:38 +02:00
abf12dbbfa
Merge branch 'SarahsAwesomeBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into SarahsAwesomeBugFixes
2015-08-06 08:44:36 +02:00
6a3d888f5b
fix git
2015-08-06 08:44:16 +02:00
ea0c6075f2
rank sifx
2015-08-05 20:25:23 +02:00
e86e7b624e
remnvoed special case for me
2015-08-05 10:28:05 +02:00
2f571aed25
fixed bugs from my vel fixes, WHOOPS. normalisation :(
2015-08-03 18:19:31 +02:00
e200ddd777
Merge branch 'master' into Bonus
...
# Conflicts:
# Plugins/.idea/misc.xml
2015-08-03 08:32:45 -05:00
8ea967b37e
fixed possible NPE
2015-08-02 12:35:25 +02:00
638406254b
refactored a little so theres no data stored in the util
2015-08-02 12:07:00 +02:00
afc41c8831
converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity
2015-08-02 11:50:26 +02:00
ac4755a5a9
Fixed incorrect velocity
2015-08-02 11:24:34 +02:00
c9c3db70f3
Merge branch 'SSM2PlayerTeams'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-07-29 14:08:17 +02:00
da94c30c02
Stuff
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-28 18:06:00 -04:00
Mysticate
Cheese
Shaun Bennett
alexmack929
Shaun Bennett
fooify
Jonathan Williams
Mini-Chiss
xGamingDudex
libraryaddict
Sarah
Aaron Brock