3cd187ff04
Move LineFormat.java
2015-12-11 16:57:21 +13:00
bc46518a05
Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics
2015-12-10 22:54:53 -05:00
1ab13d2ef5
Treasure Shards!
2015-12-10 22:52:15 -05:00
4cfa7c436b
Add missing file
2015-12-11 16:48:40 +13:00
a760dba783
i lied.
2015-12-11 02:59:16 +00:00
7a597d90b7
final push goodnight
2015-12-11 02:48:06 +00:00
1607345f04
title + debug
2015-12-11 02:41:44 +00:00
557f3e97a5
Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics
2015-12-10 21:32:35 -05:00
5a1892e1ed
Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics
2015-12-10 21:32:14 -05:00
d6aed5dff7
More work
2015-12-10 21:32:10 -05:00
563a0f0ec7
remove tutorial and no flicker
2015-12-11 02:30:44 +00:00
a0b7870acc
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-12-11 15:21:18 +13:00
1661c056c1
Added line stuff
2015-12-11 15:21:05 +13:00
31cea3342e
some gadget stuff
2015-12-11 13:17:38 +11:00
ffd4658740
Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics
2015-12-10 21:06:50 -05:00
2694787590
Reverting
2015-12-10 20:59:57 -05:00
cf73d27a84
Merge remote-tracking branch 'origin/master'
2015-12-10 20:53:42 -05:00
4d05bd5c50
Player count for chiss
2015-12-10 20:53:38 -05:00
16f39c1e71
Pushing changes to go help william
2015-12-10 20:51:34 -05:00
f8d7aeb5ea
before revert
2015-12-11 01:32:32 +00:00
dda5ac6728
work
2015-12-11 01:20:36 +00:00
4abad9e1c4
fixing chat and test commands.
2015-12-11 02:00:26 +01:00
ffb75a7832
Adding CustomEnding
2015-12-11 01:44:19 +01:00
626a812844
Many changes
2015-12-11 00:40:54 +00:00
4d8b8bd58b
Fix errors, update cosmetic menu
2015-12-10 19:27:32 -05:00
a9e6224eca
Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-12-10 19:21:33 -05:00
5d96ceb41e
Let owner+ disguise as staff - easy way to check a player's rank
2015-12-10 19:20:11 -05:00
7b4f5d5b75
Christmas chest in gui
2015-12-10 19:19:20 -05:00
72a8aaf556
Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-12-10 19:18:49 -05:00
44a244caf4
Merge branch 'project-cosmetics' of http://JustSomeDude@184.154.0.242:7990/scm/min/mineplex.git into project-cosmetics
2015-12-11 01:10:54 +01:00
5b0909012d
Renamed GadgetActivateEvent to GadgetEnable event
...
Some files didn't make it to prev commit
2015-12-11 01:07:47 +01:00
a6a4c8be36
Cosmetic Update
...
+ Added GadgetDisable Event
+ Renamed GadgetActivateEvent to GadgetEnable event
+ Added hat framework, and some example hats
+ Added sets and Frost Lord set
+ Fixed some imports
+ Added new way of checking ownership of gadgets
+ Added some utility methods to GadgetManager
+ Added support for alternative package name of gadgets
+ Fixed coal
+ New Blood Helix particle
2015-12-11 01:05:32 +01:00
d16d9a36e9
Use Account ID from client manager instead of PlayerCache
2015-12-10 17:25:39 -05:00
ab16bf89e5
Merge remote-tracking branch 'origin/master'
2015-12-10 17:04:25 -05:00
851b613d2e
Now playing fix
2015-12-10 17:04:15 -05:00
4cf33eef05
Tutorial changes!
2015-12-10 21:32:14 +00:00
624e8bbe89
Merge branches 'pregametutorial' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
2015-12-10 20:56:03 +00:00
0bd276c16a
Merge branch 'pregametutorial' of ssh://184.154.0.242:25565/min/mineplex into pregametutorial
2015-12-10 20:53:01 +00:00
8d7b03e3f6
Added the ability to have title AND subtitle per TutorialText.
2015-12-10 20:52:41 +00:00
2951088005
Tutorial changes/additions.
2015-12-10 20:48:13 +00:00
3586642414
Added back the tutorial.
2015-12-10 19:32:25 +00:00
af7c058f22
Lots of bug fixes / additions since the testing 12/9/15.
2015-12-10 19:06:07 +00:00
0f8028f6e6
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
2015-12-10 12:24:11 +01:00
1ee1e7a04b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-12-10 20:02:39 +13:00
eaf3937004
Fix the damage while walking on falling block
2015-12-10 20:02:12 +13:00
fabf3dab59
updated blocksearch
2015-12-10 13:12:01 +11:00
c94c84f203
Some fixes
2015-12-10 02:59:22 +01:00
76b29756ff
Fixing some stats and disabling Chat spam messages.
2015-12-10 02:02:36 +01:00
87a834c01b
FIX
2015-12-10 00:03:57 +00:00
90896073d4
debug
2015-12-10 00:03:17 +00:00
libraryaddict
Shaun Bennett
William Burns
Cheese
Shaun Bennett
Sarah
xGamingDudex