Shaun Bennett
cf73d27a84
Merge remote-tracking branch 'origin/master'
2015-12-10 20:53:42 -05:00
Shaun Bennett
4d05bd5c50
Player count for chiss
2015-12-10 20:53:38 -05:00
Shaun Bennett
16f39c1e71
Pushing changes to go help william
2015-12-10 20:51:34 -05:00
William Burns
f8d7aeb5ea
before revert
2015-12-11 01:32:32 +00:00
William Burns
dda5ac6728
work
2015-12-11 01:20:36 +00:00
William Burns
626a812844
Many changes
2015-12-11 00:40:54 +00:00
Shaun Bennett
4d8b8bd58b
Fix errors, update cosmetic menu
2015-12-10 19:27:32 -05:00
Shaun Bennett
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
Shaun Bennett
5d96ceb41e
Let owner+ disguise as staff - easy way to check a player's rank
2015-12-10 19:20:11 -05:00
Shaun Bennett
7b4f5d5b75
Christmas chest in gui
2015-12-10 19:19:20 -05:00
Shaun Bennett
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
xGamingDudex
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
xGamingDudex
5b0909012d
Renamed GadgetActivateEvent to GadgetEnable event
...
Some files didn't make it to prev commit
2015-12-11 01:07:47 +01:00
xGamingDudex
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
Shaun Bennett
d16d9a36e9
Use Account ID from client manager instead of PlayerCache
2015-12-10 17:25:39 -05:00
Shaun Bennett
ab16bf89e5
Merge remote-tracking branch 'origin/master'
2015-12-10 17:04:25 -05:00
Shaun Bennett
851b613d2e
Now playing fix
2015-12-10 17:04:15 -05:00
William Burns
4cf33eef05
Tutorial changes!
2015-12-10 21:32:14 +00:00
William Burns
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
William Burns
0bd276c16a
Merge branch 'pregametutorial' of ssh://184.154.0.242:25565/min/mineplex into pregametutorial
2015-12-10 20:53:01 +00:00
William Burns
8d7b03e3f6
Added the ability to have title AND subtitle per TutorialText.
2015-12-10 20:52:41 +00:00
William Burns
2951088005
Tutorial changes/additions.
2015-12-10 20:48:13 +00:00
William Burns
3586642414
Added back the tutorial.
2015-12-10 19:32:25 +00:00
William Burns
af7c058f22
Lots of bug fixes / additions since the testing 12/9/15.
2015-12-10 19:06:07 +00:00
Thanos paravantis
e17669427e
Merge branch 'master' into thanos-mineware
...
Conflicts:
Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
2015-12-10 10:03:41 +02:00
Thanos paravantis
e6125b74ef
Commit all changes before pulling from master.
2015-12-10 09:59:37 +02:00
libraryaddict
1ee1e7a04b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-12-10 20:02:39 +13:00
libraryaddict
eaf3937004
Fix the damage while walking on falling block
2015-12-10 20:02:12 +13:00
Cheese
fabf3dab59
updated blocksearch
2015-12-10 13:12:01 +11:00
William Burns
87a834c01b
FIX
2015-12-10 00:03:57 +00:00
William Burns
90896073d4
debug
2015-12-10 00:03:17 +00:00
William Burns
cea2716851
fight man
2015-12-09 23:59:20 +00:00
William Burns
05bd55f720
iter
2015-12-09 23:53:04 +00:00
William Burns
b8a2304edd
work
2015-12-09 23:39:00 +00:00
William Burns
3ad0a3db6e
fix
2015-12-09 23:14:08 +00:00
William Burns
17c989d941
Less per-player arena stuff
2015-12-09 22:39:04 +00:00
William Burns
513db5dd8d
doing byes
2015-12-09 21:33:31 +00:00
William Burns
852be97bae
Work
2015-12-09 20:16:16 +00:00
Sarah
a5c46545df
fixing timer being shown.
2015-12-09 14:44:22 +01:00
NewGarbo
667f076202
fixed unsafe timer
2015-12-09 10:46:05 +00:00
William Burns
c021fbf9ed
Bounce baby bounce.
2015-12-08 23:27:38 +00:00
William Burns
d709071feb
Much fix, many wow.
2015-12-08 23:20:42 +00:00
Shaun Bennett
2e49611035
LinkedHashMaps, Buttons
2015-12-08 17:45:27 -05:00
Shaun Bennett
7f75749194
Merge remote-tracking branch 'origin/master'
2015-12-08 16:55:14 -05:00
Cheese
26c5c419f8
fixed a bug where old displayName would be used after name was updated.
2015-12-09 08:38:05 +11:00
Cheese
fba88ec231
mount stuff is fixed
2015-12-09 08:19:55 +11:00
William Burns
a83ede3caa
Handling slow movers
2015-12-08 21:14:19 +00:00
William Burns
7bdbd5a6af
Woo almost done!
2015-12-08 21:10:27 +00:00
Cheese
2decc049c5
fixed my muddling of perks
2015-12-09 07:47:07 +11:00
Cheese
09d8367b4b
fixed method
2015-12-09 07:32:36 +11:00
