Cheese
0bc64fec16
Proxy limit fixes
2015-11-21 09:28:15 +11:00
AlexTheCoder
386032a4f5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-20 06:03:30 -05:00
AlexTheCoder
f51358552a
-B
2015-11-20 05:57:29 -05:00
Cheese
46505a8e8e
converted to new res pack locations
2015-11-17 09:19:33 +11:00
AlexTheCoder
d654f1f4b1
- Fixed class edit in lobbies
...
- Fixed conflict between rave suit and assassin
2015-11-10 06:17:25 -05:00
AlexTheCoder
dfbf19c66a
Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-08 01:02:06 -05:00
libraryaddict
79d0466355
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2015-11-07 21:36:36 +13:00
Cheese
f4bf685e96
removed halloween hub
...
removed titan giveaway and pumpkins
2015-11-07 13:20:29 +11:00
Shaun Bennett
3893617d58
Logitech Giveaway (still needs testing)
2015-11-06 21:15:37 -05:00
AlexTheCoder
fafc92606c
Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
2015-11-06 18:43:11 -05:00
libraryaddict
0486404c4b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2015-10-28 14:38:34 +13:00
AlexTheCoder
f7dab72e8c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-10-23 03:23:35 -04:00
Cheese
d9d0254e46
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-23 17:30:59 +11:00
Shaun Bennett
e3e7dd4694
Titan rewards from mythical chests
2015-10-23 02:08:31 -04:00
libraryaddict
ddb8d592f8
Remove all is1_8 checks
2015-10-22 18:37:14 +13:00
libraryaddict
07f032a5d2
Fix wither pet making sounds, fixed worldtime.
2015-10-21 04:22:31 +13:00
AlexTheCoder
12319169a9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/RadarData.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilRadar.java
2015-10-18 00:54:18 -04:00
Cheese
d901cfa12c
buildies can join full
2015-10-18 10:54:34 +11:00
libraryaddict
3dda9352e7
Progress
2015-10-16 13:32:23 +13:00
AlexTheCoder
0bd026f506
- Fixed merge issues
2015-10-12 18:04:35 -04:00
AlexTheCoder
f497eab633
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-10-12 17:54:11 -04:00
Mysticate
b6d573a4d5
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
2015-10-11 22:25:25 -04:00
Mysticate
7a4ccdf680
Bug fixes
2015-10-11 22:17:34 -04:00
Cheese
cb9e8f8e0b
pumpkin smasher achievement
2015-10-11 14:48:02 +11:00
Mysticate
5e7ddb968e
Changes and bug fixes.
2015-10-10 15:54:18 -04:00
Cheese
6cf786eb8c
Merge branch 'Myst_HALLOWEEN'
2015-10-10 19:28:08 +11:00
Cheese
1026a2ae22
fixed explosions
2015-10-10 19:27:54 +11:00
Shaun Bennett
aa9fd1abf3
Titan giveaway work
2015-10-09 22:14:10 -04:00
AlexTheCoder
09e44d3372
- Fixed version stuff
2015-09-23 13:47:49 -04:00
AlexTheCoder
3ee6c5c7c8
- Fix Merge Error
2015-09-23 13:25:41 -04:00
AlexTheCoder
c709980db3
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-09-23 13:08:25 -04:00
Cheese
119dc8ab52
changed name of method
2015-09-12 15:01:18 +10:00
Sarah
5c0ada3df6
Implementing RequiredRank file and command.
2015-09-12 06:39:40 +02:00
AlexTheCoder
6fefcbd953
Kit Changes/Fixes:
...
- Fixed Kit Mobs not opening guis in Champions games
- Fixed Abilities not working in CTF
- Added new event when a player attempts to choose a kit
- Cancelled changing kit while holding a flag
2015-08-30 17:13:08 -04:00
Mysticate
ebd3fbe6d5
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-08-28 20:19:27 -06:00
Jonathan Williams
e9b33668bc
Added donorsOnline to MinecraftServer snapshot
...
Refactored Rank class to use lowercase methods.
2015-08-28 13:22:04 -07:00
Mini-Chiss
1487692609
completely disabled team armor in arcade. avoids typing it just as game starts.
2015-08-13 12:57:30 +02:00
Mini-Chiss
f3b58fe9b6
disabled team armor command in games D:
2015-08-13 12:51:57 +02:00
Sarah
be699558f1
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-12 08:38:18 +02:00
Sarah
af19754bcd
Implementing Carl to Arcade.
2015-08-12 08:37:54 +02:00
Sarah
2c30d20cb1
changing OP method, setHost permissions and /e command.
2015-08-11 09:26:01 +02:00
Sarah
d457e3a955
changing the setOP Event.
2015-08-11 08:36:39 +02:00
Sarah
0d70fb6b96
removing deop of Admins and adding OP condition to setHost.
2015-08-09 16:55:10 +02:00
Mysticate
a9350bfacd
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-08-07 11:58:53 -04:00
Mini-Chiss
afc41c8831
converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity
2015-08-02 11:50:26 +02:00
Mysticate
53a3a29cd2
Extreme revisions. Cheers!
2015-07-31 00:50:32 -06:00
Mini-Chiss
52844d7b80
Merge branch 'EventGameUpdates'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
2015-07-29 16:41:35 +02:00
Mini-Chiss
932fe197b4
Merge branch 'perm-changes'
...
Conflicts:
Plugins/.idea/encodings.xml
reverted it.
2015-07-29 14:06:21 +02:00
Mini-Chiss
b42be044ae
whtielisted MPS will be hidden from GUI
2015-07-29 13:20:20 +02:00
Ben Sihota
0b53bca385
Needed permission changes for Jr Developers (Pending approval)
2015-07-26 18:58:35 -07:00
