Commit Graph

142 Commits

Author SHA1 Message Date
Jonathan Williams d01529a344 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2014-09-05 04:38:23 -07:00
Jonathan Williams 1c6790b611 Fixed for DisguiseManager
Rewrote packet handling
Fixed up CustomTagFix
Removed swapping kits in Block Hunt
Removed Stacked entities for 1.8 players.
2014-09-05 04:36:01 -07:00
Chiss 8c1e0c3e9e Fletcher data fix
Minestrike stuff
2014-09-05 15:45:14 +10:00
Jonathan Williams b28fc8ee6b Added custom name tag fix for mobs for 1.8 players
Worked on boss bar display.
Bug with <=50% hp.
2014-09-04 11:33:51 -07:00
Shaun Bennett e7f79aa5bf Update IntelliJ files for latest changes 2014-09-03 11:42:50 -05:00
Jonathan Williams 92191dc19a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_7_R4/PlayerConnection.java
2014-09-03 03:47:15 -07:00
Jonathan Williams a4871b5509 Updated to latest spigot with 1.8 support.
Tweaked disguise manager for 1.8 support.
Work on CUstomer support server + admin stuff.
2014-09-03 03:46:24 -07:00
Chiss 50140ef92d Minestrike update 2014-09-03 14:49:38 +10:00
Chiss 449281501f MineStrike Update 2014-09-02 16:49:15 +10:00
Chiss 207de0e67a fixed MAC kicking players on lillypads 2014-08-30 20:49:32 +10:00
Jonathan Williams b07670f6af Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-30 02:04:32 -07:00
Jonathan Williams 1bd0209b39 Added multi-server tags for npcs
Fixed Customer support packages.
Fixed Account rank expire for Hero
Added SNR mod to update Rank
Changed SNR mod color to gray.
2014-08-30 02:04:04 -07:00
Chiss c3bb0ddbcb Chest example gadget for shauny 2014-08-29 11:00:16 +10:00
Jonathan Williams 931cb5ece8 Removed MineKart code.
Fixed up DisguisePlayer
Added ProfileLoader
Fixed up Notch gadget.
2014-08-23 00:40:07 -05:00
Chiss a159f04d50 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-23 04:30:52 +10:00
Chiss 231ef2bbe1 Cosmetic Update 2014-08-23 04:30:41 +10:00
Jonathan Williams 83b3e49151 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-22 10:48:27 -05:00
Jonathan Williams 70217fe957 Finished first release of Customer Support plugin. 2014-08-22 10:47:46 -05:00
Chiss 0022586e3e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-22 17:08:29 +10:00
Chiss 97c087a28d Allowed commands to specify specific ranks
allowed youtube/build to start/set games
2014-08-22 17:05:14 +10:00
Jonathan Williams 99d15d3ece Work on Customer support server. 2014-08-21 15:55:09 -05:00
Jonathan Williams 830eeca835 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-20 20:14:32 -05:00
Jonathan Williams 315da32518 Removed unused code in Party
Fixed path var in Core.Common
2014-08-20 20:14:23 -05:00
Chiss 60869d114e Dragon Escape changes 2014-08-20 15:45:10 +10:00
Shaun Bennett a7bb84be0b Revert chris' revert 2014-08-19 21:24:49 -05:00
Shaun Bennett f60a818e6a Update craftbukkit to remove the extra _INVALID mappings 2014-08-19 21:22:04 -05:00
Chiss 65c880b300 Parser changes 2014-08-20 12:06:24 +10:00
Chiss 94e5eb03da Fixed errors for new getPlayers method. 2014-08-20 10:43:56 +10:00
Chiss 7535f39d18 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-20 10:39:58 +10:00
Chiss afea0ba87f Parser Merge 2014-08-20 10:39:41 +10:00
Shaun Bennett e1a57a673e Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors 2014-08-19 16:58:55 -05:00
Jonathan Williams d1e69a34f1 Fix chiss path errorrrrrrrrrrrrrrrrrrrrs. 2014-08-13 21:53:03 -05:00
Chiss b6ba142c5a Mineplex in scoreboard is fancier. 2014-08-14 11:23:48 +10:00
Jonathan Williams 6039168601 Updated code base to build #1604 spigot 2014-08-13 18:57:37 -05:00
Chiss 7aa017772f Spectators will not play particle effects
ALL rank no longer displays on morphs.
2014-08-10 00:55:51 +10:00
Chiss 951e1df3d5 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-09 19:05:34 +10:00
Jonathan Williams 0de8d22e62 Changed invis in hub to only be on server npc shops
Fixed /a for senior mods and developers.
2014-08-09 00:06:44 -05:00
Chiss 62eccbcc1e Snr Mod
Creeper knockbak changes
2014-08-09 15:06:00 +10:00
Chiss 313f675ae4 Hub Parkour update
Smash kit prices
2014-08-09 12:16:37 +10:00
Jonathan Williams c01fbd279d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/GadgetManager.java
2014-08-07 00:48:32 -07:00
Jonathan Williams 6d86f403ac Added coins Currency to web api
Added coins purchase for all cosmetic items
Added Stats manager
Added Inventory Manager

Redesigned gadgets/morph/particle/pets/mounts page and inventory.
2014-08-07 00:33:24 -07:00
Chiss dc1a37a92e Gadget STuff 2014-08-07 17:30:46 +10:00
Jonathan Williams d129f722a3 Cleaned up Firework util. 2014-07-29 21:09:16 -07:00
Chiss 4f46ccc8aa Winner is decided on bridge tourney timeout 2014-07-26 20:29:01 +10:00
Chiss fa73ab5335 Bridges Tourney stuff 2014-07-26 17:40:17 +10:00
CoderTim b15534e1b2 Some work on Sneak Assassins NPCs
Added /game start <seconds> to start a game faster
Optimized GameTeam.GetSpawn() by avoiding unnecessary square root calculations
2014-07-11 00:56:25 -04:00
Jonathan Williams 2e5b003cff More work on internet status stuff.
Fixed some buggies with parser.
2014-07-08 13:18:27 -07:00
Jonathan Williams 39b2ad57be Fix for map parser zipping. 2014-07-08 12:37:39 -07:00
Mini-Chiss cf25bdc44f Bridges fix being able to break mid chests before gamestart
Map parser Updates
2014-07-07 19:04:44 -07:00
Mini-Chiss c65712c260 UHC fixes
Sneaky Assassin listener leak fix
Some map parser stuffs.
2014-07-04 23:04:46 -07:00