Commit Graph

11436 Commits

Author SHA1 Message Date
Chiss 3bd7a7cd1f Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-22 00:01:24 +11:00
Chiss 2f063e9f8e wave 3 snowman invul fix 2013-12-21 23:54:10 +11:00
Jonathan Williams a02ca4513e Added undead/batgun and frost to in game shop for gems. 2013-12-21 07:29:04 -05:00
Chiss 5d3542cb02 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-21 23:19:00 +11:00
Chiss e94784a908 dragon mount removed 2013-12-21 23:09:49 +11:00
Jonathan Williams 629e1d11df Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-21 07:06:48 -05:00
Jonathan Williams 0150fb40b9 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-21 07:06:35 -05:00
Chiss d6c37055da cleaner leak fix. 2013-12-21 23:06:27 +11:00
Jonathan Williams 22f87c336f Updated map. 2013-12-21 07:06:27 -05:00
Chiss 1c3d90a70f leak fixes 2013-12-21 23:00:51 +11:00
Chiss 58e049acf9 snake bit is easier :) 2013-12-21 22:34:04 +11:00
Chiss c08b7c7b96 hub news update 2013-12-21 22:21:16 +11:00
Chiss bfd76474e8 Dragon particles 2013-12-21 20:44:56 +11:00
Chiss a6eb7ea665 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-21 20:07:04 +11:00
Chiss 0585116e78 Hub Gadgets
Hub Dragon (Hero Only)
XMAS block efficiency
2013-12-21 20:05:42 +11:00
Jonathan Williams 793b17e878 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-21 03:23:07 -05:00
Jonathan Williams 7574a5972b Prevented sounds from silenced vegetables. 2013-12-21 03:22:58 -05:00
Chiss c969775df3 Hub gadgets for xmas 2013-12-21 19:00:30 +11:00
Jonathan Williams 5fffcf89b6 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-21 02:44:20 -05:00
Jonathan Williams 70c14268e1 Fixed Leash issue.
Added invis for utilent.ghost
2013-12-21 02:44:12 -05:00
Chiss f50ae06dff NPE fix 2013-12-21 16:52:59 +11:00
Chiss 50c2b10b50 25% easier boss 2013-12-21 15:10:17 +11:00
Chiss c52a7d2fe1 Christmas update
Hub Update
2013-12-21 15:06:01 +11:00
Chiss bc9c309aa1 Xmas Game 2013-12-21 10:17:22 +11:00
Chiss 5dc0a7d4d6 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-21 08:43:02 +11:00
Chiss ac723c14bd Push so i can pull :O
just some xmas stuff
2013-12-21 08:42:49 +11:00
Jonathan Williams f504cb5a8d Added vegetation to horse.
Added Leash method to UtilEnt
2013-12-20 03:52:43 -05:00
Jonathan Williams 379b0d0d75 Check for PullWhileLeashed in EntityCreature. 2013-12-20 03:14:18 -05:00
Jonathan Williams 44145e01f0 Removed weather for hub update. 2013-12-18 13:52:44 -05:00
Jonathan Williams a24e8e233c Enabled pvp in hub for snowballs. 2013-12-18 05:56:59 -05:00
Chiss 6b33306755 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-18 21:46:40 +11:00
Jonathan Williams e55885c85d itsy 2013-12-18 05:22:40 -05:00
Chiss f4edcedce3 push so i can pull :\? 2013-12-18 21:17:28 +11:00
Jonathan Williams 0ba8349e03 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-18 04:48:24 -05:00
Jonathan Williams 64dab19003 Cleanup
Prep work on leash disable functionality.
2013-12-18 04:48:16 -05:00
Chiss 54f2cb3467 Christmas hub snowman target cancel 2013-12-18 19:58:39 +11:00
Jonathan Williams ab8013091d Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2013-12-17 11:10:11 -05:00
Jonathan Williams 938e72b06d Remove tourney stats. 2013-12-17 11:09:36 -05:00
Chiss de99a642d3 Hub tourney text removal 2013-12-17 11:06:04 +11:00
Chiss 4bef100c6a Xmas Hub 2013-12-16 14:32:51 +11:00
Chiss c582b210b5 Hub + Stats + Tournament 2013-12-14 16:51:08 +11:00
Chiss 3ca67d60c0 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-14 16:38:46 +11:00
Chiss 9af8676307 Hub/Stats 2013-12-14 16:38:16 +11:00
Jonathan Williams ac049e0397 FINE JUST FINE>>>>>> STUPID CHICKENS 2013-12-13 21:36:57 -08:00
Jonathan Williams 69fa9eaba5 Added getters for stats/StatsManager.java 2013-12-13 21:35:04 -08:00
Jonathan Williams e054b06cc2 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-13 21:01:08 -08:00
Jonathan Williams 6b92b6c4a8 Added stats manager.
Added lots of missing files.
2013-12-13 21:00:56 -08:00
Chiss 1eebed737e Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
2013-12-13 18:05:08 +11:00
Chiss 5f2e457362 Minor HG Stuffs ;o 2013-12-13 16:21:39 +11:00
Jonathan Williams d6544202f0 Added ghost ability for mobs. 2013-12-12 02:19:58 -08:00