Commit Graph

5476 Commits

Author SHA1 Message Date
NewGarbo 7efcf5426d no hunger depletion in safe zones 2015-11-27 06:34:29 +00:00
NewGarbo c96b0c529a Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-27 06:26:23 +00:00
NewGarbo 42d39a40e9 WIND 2015-11-27 06:25:58 +00:00
Shaun Bennett 94090c9434 adjust gold drops 2015-11-27 01:24:03 -05:00
Shaun Bennett e211fe182d Adjust gem conversion rate 2015-11-27 01:06:53 -05:00
NewGarbo c33eea28a2 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-27 06:05:39 +00:00
NewGarbo a9669ade31 Immolate fix hopefully 2015-11-27 06:05:22 +00:00
Shaun Bennett 0aeca96746 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-27 01:05:16 -05:00
Shaun Bennett 32c17cad7e Shop price changes 2015-11-27 01:04:51 -05:00
Cheese 77be81c216 pet changes 2015-11-27 16:50:22 +11:00
Cheese 2b047cdde8 more titan stuff 2015-11-27 16:46:48 +11:00
NewGarbo 9082ace3f3 wind blade fall damage 2015-11-27 05:46:37 +00:00
NewGarbo 20a9ed5a6e staff not being able to join fix 2015-11-27 05:13:47 +00:00
NewGarbo f81d1d390a Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-27 05:04:46 +00:00
NewGarbo b22c766c94 more clans modificatons 2015-11-27 05:04:24 +00:00
Cheese 05e7183b65 titan stuff update 2015-11-27 15:55:00 +11:00
Shaun Bennett a46bed53fa Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-26 23:42:22 -05:00
Shaun Bennett 31f083387d Use Castle icon on travel page 2015-11-26 23:42:16 -05:00
NewGarbo 174825776b meow clams 2015-11-27 04:39:04 +00:00
NewGarbo 9dcc048953 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-27 04:23:14 +00:00
NewGarbo 6119500b68 changes 2015-11-27 04:23:02 +00:00
Shaun Bennett faaa1fcf0b Use castle clan icon for /c <clan> 2015-11-26 23:15:14 -05:00
NewGarbo 5744178286 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-27 04:06:02 +00:00
NewGarbo dbda29e3f3 magnetic maul fixes 2015-11-27 04:05:47 +00:00
NewGarbo 73f4450fa3 clans fixes 2015-11-27 04:04:29 +00:00
Shaun Bennett ef511f1704 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-26 22:38:03 -05:00
Shaun Bennett 6da10950da Update clan icons, fix client class 2015-11-26 22:37:54 -05:00
NewGarbo 0274bf2847 loads of changes. 2015-11-27 03:28:19 +00:00
libraryaddict 3c98243201 Some more guardian stuff 2015-11-27 15:56:56 +13:00
libraryaddict 0a4416381b Fix guardian 2015-11-27 15:55:02 +13:00
Cheese 98d988584d titan cosmetics 2015-11-27 13:35:25 +11:00
NewGarbo e849484670 bunch of changes and fixes and bugs and stuff and things 2015-11-26 23:59:47 +00:00
NewGarbo 055702b36e changes and fixes and woo 2015-11-26 23:08:33 +00:00
NewGarbo 56d4b34969 fixed formatting on death notices.
Made world event middle texts longer lasting.
Fixed logout NPC timer
2015-11-26 21:57:26 +00:00
NewGarbo 5393d1d18c Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-26 21:16:21 +00:00
Shaun Bennett 6e416b1059 Merge remote-tracking branch 'origin/clans-beta' into clans-beta
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java
2015-11-26 16:12:54 -05:00
Shaun Bennett 27e214a643 Region fix 2015-11-26 16:12:29 -05:00
NewGarbo dd33d9587d made power recharge a tad faster with Wind Blade 2015-11-26 21:12:09 +00:00
NewGarbo 0aaee24600 fixed gear UI display stuff incorrectly 2015-11-26 21:06:33 +00:00
NewGarbo bb3ea0115d fixed classes not loading 2015-11-26 20:41:42 +00:00
NewGarbo 67a28a94fb bunch of fixes 2015-11-26 20:32:01 +00:00
NewGarbo 2bce722539 some code polishing. fixed some mispositioning with Spawn holograms. 2015-11-26 13:29:40 +00:00
NewGarbo e5fa59b8da Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-26 13:17:28 +00:00
NewGarbo 009ddaaee1 stop players in tutorial from receiving/sending chat. 2015-11-26 13:16:50 +00:00
NewGarbo bbfd319bcd Spawn holograms 2015-11-26 13:14:10 +00:00
NewGarbo 1ce2a362c6 disallow item frames being rotated in Spawn 2015-11-26 12:34:12 +00:00
NewGarbo be19c17fee fixed gem -> gold conversion rate 2015-11-26 12:33:29 +00:00
NewGarbo 9aaad0b4a1 fixed formatting in /spawn command 2015-11-26 12:31:55 +00:00
Shaun Bennett bdc08676d9 Merge remote-tracking branch 'origin/clans-beta' into clans-beta
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java
2015-11-26 03:34:33 -05:00
Shaun Bennett d4f3786b1c Fixes 2015-11-26 03:31:03 -05:00