Commit Graph

531 Commits

Author SHA1 Message Date
Cheese 5d40a57df8 sound fix 2015-11-27 19:29:17 +11:00
Shaun Bennett 0b0710458f Hub updates/try to fix chiss stuff 2015-11-27 03:22:17 -05:00
Cheese e25df8739d EAST 2 WEST 2015-11-27 18:46:15 +11:00
Cheese 4085c998cd MUSIC 4 LIFE 2015-11-27 18:44:33 +11:00
Shaun Bennett 408c2cf72a im an idiot 2015-11-27 01:40:28 -05:00
Shaun Bennett bdbb75e196 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-27 01:35:16 -05:00
Shaun Bennett 34368722a9 Fix gold manager again 2015-11-27 01:35:10 -05:00
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
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
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
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
NewGarbo 94a0f3244d corrected typo in WindBlade.java 2015-11-26 07:53:37 +00:00
NewGarbo af0df835b8 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java
2015-11-26 07:52:35 +00:00
NewGarbo 97e903f403 updated regions 2015-11-26 07:51:10 +00:00
Shaun Bennett 75ff5bb3da Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-26 02:46:56 -05:00
NewGarbo c0cfdf9785 fixed windblade not recharging whilst jumping 2015-11-26 07:29:39 +00:00
NewGarbo e80c1097b5 corrected regions 2015-11-26 07:08:30 +00:00
NewGarbo 0d43ffc7b2 fixessss 2015-11-26 06:54:49 +00:00
Shaun Bennett 6de7b8a73e Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-26 01:46:43 -05:00
NewGarbo 972a2d151a simplified combat log npc title 2015-11-26 06:21:01 +00:00
NewGarbo f92849f796 that doesn't do what i thought it did 2015-11-26 05:32:59 +00:00
NewGarbo 1e4b6b4d0f fixed formatting error in clan tip 2015-11-26 05:30:13 +00:00
NewGarbo 7da8b8e3bf fix players hurting each other in safe zones 2015-11-26 05:29:35 +00:00
NewGarbo 48ebfc219d removed travel npcs from shops 2015-11-26 05:24:33 +00:00
Shaun Bennett 389956240b Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-26 00:20:41 -05:00
NewGarbo 76d009e0de Unstuck (Spawn) command 2015-11-26 05:18:18 +00:00
NewGarbo 33cdd5400d fixed some coloring issues 2015-11-26 04:32:41 +00:00
Shaun Bennett 8f14c8beae Merge remote-tracking branch 'origin/clans-beta' into clans-beta
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java
2015-11-25 23:26:29 -05:00
Shaun Bennett 7a663b4f7b Fix legendaries 2015-11-25 23:24:07 -05:00
NewGarbo 8bd1f4b3c8 reduced hyper axe damage. OP as heck 2015-11-26 04:21:30 +00:00
NewGarbo abcee009dd stuff 2015-11-26 04:07:33 +00:00
NewGarbo 670afc17ef clans chat is being weird 2015-11-26 03:26:15 +00:00
NewGarbo 5230b25dfd fixed suicide command (?) 2015-11-26 03:24:48 +00:00
NewGarbo 4f275d79fa fixed staff tags only displaying if player is in clan 2015-11-26 03:19:40 +00:00
NewGarbo 5fb58b1dad added suicide command 2015-11-26 03:17:05 +00:00
NewGarbo 8a64a2f4ce fixed world events spawning floating on grass and other boundless blocks 2015-11-26 03:06:27 +00:00
NewGarbo b43cf0b28a got rid of enchanted effect on rare items 2015-11-26 03:00:59 +00:00
NewGarbo 7e23f896ca changes 2015-11-26 02:49:01 +00:00
NewGarbo a19ade0739 rain rain go away 2015-11-26 00:53:01 +00:00
Shaun Bennett c150ea6175 Potatoes and Tornadoes 2015-11-25 19:08:13 -05:00
Shaun Bennett cc75bafb4c Bugs and thugs 2015-11-25 16:45:04 -05:00
NewGarbo c5211e0368 buuugs 2015-11-25 17:40:12 +00:00
NewGarbo 9a8fba543d auto-replanting trees 2015-11-25 17:03:48 +00:00
NewGarbo 2adfef41ca bug fixes and new stuff ( https://docs.google.com/spreadsheets/d/1jrKJIXhIF0TZvYKLyAC50IYfN8ylLZK_M8lSexEZTkc/edit#gid=0&vpid=A10 ) 2015-11-25 16:46:53 +00:00
NewGarbo 7e9dc7968e gear gui fixes and legendaries changes 2015-11-25 01:32:05 +00:00
NewGarbo 3a6dab7224 stuff 2015-11-25 00:55:11 +00:00
NewGarbo 3cb22c8cb7 uuid bug fixed finally! 2015-11-25 00:47:35 +00:00
NewGarbo aa52c1be27 custom item stuff 2015-11-25 00:14:34 +00:00
NewGarbo 6220ce14fe Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-24 23:04:24 +00:00
NewGarbo 98edd0a452 dissallow chests, doors, furnaces, etc. from being accessed in territories that are not yours 2015-11-24 23:03:19 +00:00
NewGarbo 81c2d2a11f *just pushing my current changes so that i can start fresh on recoding custom item serialization stuff* 2015-11-24 22:49:28 +00:00
NewGarbo 31afe9f886 removed debug message from undead camp 2015-11-24 22:29:20 +00:00
Shaun Bennett 57302221df Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-24 17:27:46 -05:00
Shaun Bennett cb7422b4fe Re-enable world events 2015-11-24 17:27:35 -05:00
NewGarbo befe4d129d formatted PlayerGear.java (to avoid further confusion) 2015-11-24 22:21:01 +00:00
NewGarbo 459e1beeff clans buggy fixers 2015-11-24 22:18:48 +00:00
NewGarbo 8559a63887 Added all rank names to Clans name blacklist 2015-11-23 22:10:29 +00:00
NewGarbo 3fa0beceb7 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-23 21:39:53 +00:00
Shaun Bennett ef7c26c04c Clans changes 2015-11-23 15:57:13 -05:00
NewGarbo 91067535db changed getting started tutorial gold reward to be proper (5000 now) 2015-11-23 18:09:50 +00:00