Commit Graph

1088 Commits

Author SHA1 Message Date
Chiss
0e7dec919d minor updates 2014-12-22 10:51:19 +11:00
Chiss
437c1aeabe MPS rank todo 2014-12-18 13:06:57 +11:00
Chiss
60f567a3fb fixed some errors ;o 2014-12-18 12:47:00 +11:00
Chiss
679f7909b0 Merge branch 'feature/private-servers' of ssh://184.154.0.242:7999/min/mineplex into feature/private-servers 2014-12-18 12:45:56 +11:00
Chiss
56d14b7bc0 Particle stuff 2014-12-18 12:45:45 +11:00
Shaun Bennett
604243dfa3 UI improvements - icon changes, whitelist toggle, notify messages 2014-12-17 19:42:11 -06:00
Shaun Bennett
2677d2e557 Fancy icons for 1.8! 2014-12-17 19:15:31 -06:00
Shaun Bennett
a63c48e338 Refactoring private server menu 2014-12-17 18:45:15 -06:00
Shaun Bennett
d19431a47f Rename Clicked to onClick 2014-12-17 18:40:44 -06:00
Shaun Bennett
6e42894d5c Refactor button again 2014-12-17 18:33:24 -06:00
Chiss
12973aba7d Merge branch 'master' into feature/private-servers 2014-12-17 16:47:19 +11:00
libraryaddict
0e7adab3eb Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-17 18:32:50 +13:00
libraryaddict
17ac36d9ae Add wither pet, pets are no longer stackable. Enderdragon no longer has his health changed in the hub 2014-12-17 18:31:51 +13:00
Shaun Bennett
6eb3efa0b6 More changes 2014-12-16 20:37:14 -06:00
Shaun Bennett
62a621270e More work on private server gui. Still need to do a bunch of refactoring 2014-12-16 13:43:01 -06:00
Shaun Bennett
83218c9a73 Pushing unfinished code for laptop 2014-12-16 11:42:06 -06:00
Chiss
a433ad764d Wither Morph
Legend Particle
2014-12-16 16:18:09 +11:00
Jonathan Williams
c43ee95c55 Added 1.8 hooks for disguise setName and getName
Refactored method names in some disguise classes.
2014-12-15 21:46:14 -05:00
Chiss
2e7d101850 added material/data for gametypes 2014-12-16 12:26:37 +11:00
Chiss
ee363f55a6 re-enabled gems for CC 2014-12-15 15:50:25 +11:00
Chiss
d7eb01e8f0 fixed CC Bug :D 2014-12-15 15:49:52 +11:00
Chiss
d1be64d7e7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
2014-12-15 14:56:09 +11:00
Chiss
95081a8ab7 Gems cannot be given multiple times for certain things (prevents bugs giving mass gems) 2014-12-15 14:33:38 +11:00
Jonathan Williams
230c6ede13 Disabled gem reward in ChristmasChaos 2014-12-14 22:14:41 -05:00
Chiss
19dfafe9ed disabled gems 2014-12-15 13:58:36 +11:00
Chiss
909c0d9be7 christmas no longer rewards gems 2014-12-15 13:56:48 +11:00
Chiss
d0f8a6a063 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-15 12:26:25 +11:00
Chiss
9136165d4f fixed christmas elf name
pet names now have limited range
2014-12-15 12:24:40 +11:00
Jonathan Williams
5b67e2182a Added disguise to Pet Manager for eventual wither disguised pet. 2014-12-14 02:30:39 -05:00
Chiss
78a34b1517 hopefully fixed a bug where pumpking king despawned.
removed 11 disc from loot
2014-12-13 11:55:12 +11:00
Chiss
3f24325c3c removed +50% player limit for CC 2014-12-12 21:23:01 +11:00
Chiss
4fd6ed80c4 final xmas Updates
xmas hub
2014-12-12 19:44:04 +11:00
libraryaddict
9a16616e6c Add fix for wither bossbar and add a checkpoint hologram for snake bit in xmas 2014-12-12 12:40:23 +13:00
Chiss
adafc95d3f boss weaker 2014-12-12 10:26:32 +11:00
Chiss
2be4d7d6d2 XMAS UPDATE 2014-12-12 10:03:25 +11:00
Chiss
3af8a90d3b near final xmas push :D 2014-12-11 15:23:01 +11:00
libraryaddict
3a8ab0afb0 Uncomment SleighHorse 2014-12-11 15:24:10 +13:00
Chiss
6b1fa91565 Xmas Updates 2014-12-11 12:42:06 +11:00
Chiss
86b9d8342f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Christmas.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Sleigh.java
2014-12-11 11:27:47 +11:00
libraryaddict
ee8d699bd1 Minor text cleanup in the sleighhorse code because you guys seem to like that 2014-12-11 07:25:40 +13:00
libraryaddict
2a13255af3 Turn christmas chaos game horses into reindeer 2014-12-11 07:23:47 +13:00
Chiss
068a0901f9 xmas updatre 2014-12-11 00:16:15 +11:00
Chiss
358d5fde44 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-10 22:38:19 +11:00
Chiss
450d3eb923 merge 2014-12-10 22:38:08 +11:00
Jonathan Williams
c4fee8e681 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Hub/.classpath
2014-12-10 03:34:53 -08:00
Jonathan Williams
ea034812b9 Fixed path finder crap in UtilEnt
Cleaned up unused code in OutfitRaveSuit
Fixed eclipse bug for NotificationManager
Removed christmas/Sleigh columns.
2014-12-10 03:32:35 -08:00
Chiss
db8e0484ab missing files + new pet 2014-12-10 18:23:22 +11:00
Chiss
0aba82eee6 fixed some eclipse java6 stuff with mail
Christmas game update
2014-12-10 15:38:57 +11:00
Chiss
bee81ff455 lowered coin rewards 2014-12-09 20:23:56 +11:00
Chiss
828fabb80a Initial Christmas Chaos update 2014-12-09 20:04:59 +11:00