Commit Graph

417 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
b691b1bad0 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-05 12:51:59 +10:00
Chiss
f6ce9abed8 Minestrike
- added mixed slow/instant mode
- added accurate hitboxes for slow bullets
- added many new weapons
- removed speed from knife
- adjusted gun balance
2014-09-05 12:28:29 +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
Shaun Bennett
4dbe7003b2 Update Arcade Icon in the game menu 2014-09-02 21:09:12 -05:00
Shaun Bennett
08e6b73b1f Disable Treasure stuff for now 2014-09-02 19:04:43 -05:00
Shaun Bennett
5905ef5ef7 Treasure Stuff 2014-08-30 14:27:11 -05: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
2c30cc3ef4 Implemented new servers flags
Removed OP from Admisn in HUB, gave them /gm command instead
2014-08-30 16:33:56 +10:00
Chiss
41daba98c4 Background work for Minestrike
Admins no longer have OP in hubs. They have /gm command to gamemode.
2014-08-29 18:21:08 +10:00
Jonathan Williams
fa56aa0843 Fixed regular players not able to join Beta servers. 2014-08-28 14:02:55 -07:00
Jonathan Williams
5281558cdb Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-28 14:01:49 -07:00
Jonathan Williams
409e2c6141 Tweaked menus for quick game, Cosmetic menu.
Removed debug for Hub
Output a little debug info in LobbyBalancer
Added duplicate check to ServerMonitor
updated Customer SUpport server to have changeable password, added logging of command executors, added lifetime perks for hero/ultra
2014-08-28 14:01:37 -07:00
Chiss
ec4cb91a1c Poll changes
Achievement output double space fix
2014-08-28 11:50:09 +10:00
Shaun Bennett
b67e127902 Merge remote-tracking branch 'origin/master' 2014-08-27 14:08:47 -05:00
Shaun Bennett
573f71164f Add a way to view poll statistics in game, load polls that aren't enabled for stat tracking 2014-08-27 14:07:22 -05:00
Chiss
4e43a2ca73 Extended range of snake parkour, ensuring people tp back to it when they fall. 2014-08-27 15:19:08 +10:00
Chiss
da5f953212 Fixed BlockMorph leaving blocks behind when player was teleported. 2014-08-27 14:22:35 +10:00
Shaun Bennett
b508cd036c Lazy fix so that polls award gems instead of coins 2014-08-26 18:36:40 -05:00
Jonathan Williams
5fdf466722 Fixed bug in server monitor.
re-enabled animal spawn in hub.
2014-08-26 02:02:31 -07:00
Jonathan Williams
526b5c333a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-26 00:34:00 -07:00
Jonathan Williams
137b8692e4 Added Gem booster use. 2014-08-26 00:33:48 -07:00
Chiss
1b15a57fc8 Added Gem Rewards for Achievements 2014-08-26 17:10:20 +10:00
Jonathan Williams
162a86d4b2 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/CosmeticShop.java
2014-08-25 23:58:54 -07:00
Jonathan Williams
b8b6c031cd Re-did and added a game to the quick game menu.
Fixed npc triggers with non npcs named the same.
Fixed naming pet longer than 16 chars.
Added sugar cane to restricted block type for paintball gun
Properly hooked in gadget block event for paitnball gun.
Added auto purchase page on item gadget ammo empty.
Added check on rank for customer support command.
Fixed ConcurrentModificationException problem with spigot.
2014-08-25 23:56:58 -07:00
Chiss
1b3e32ca26 Added Arcade Achievements 2014-08-26 14:42:17 +10:00
Chiss
28d523d696 Added Achievements 2014-08-26 13:42:42 +10:00
Chiss
07ee44508e Missing Gadgets 2014-08-26 08:17:41 +10:00
Chiss
0e3cf67402 Some new cosmetics 2014-08-25 12:59:29 +10:00
Chiss
13eb3da0fa Achievment gui changes 2014-08-25 09:26:01 +10:00
Shaun Bennett
ff441f2262 Merge remote-tracking branch 'origin/master'
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementData.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2014-08-24 16:14:29 -05:00
Shaun Bennett
2cb87b23e6 Stat Gui, Start of Treasure Gui (disabled) 2014-08-24 16:08:19 -05:00
Jonathan Williams
70beb58bd6 Enabled debugging in Hub/Arcade 2014-08-23 01:49:48 -05:00
Jonathan Williams
931cb5ece8 Removed MineKart code.
Fixed up DisguisePlayer
Added ProfileLoader
Fixed up Notch gadget.
2014-08-23 00:40:07 -05:00
Jonathan Williams
3a47a161c5 Enabled snake parkour
Updated servermanager/serverNpcPage to handle free and beta timers.
2014-08-22 22:53:15 -05:00
Chiss
e40cb17e47 Updated tutorial locations 2014-08-23 08:52:50 +10:00
Chiss
e5944ff872 Spawn location fix 2014-08-23 08:40:02 +10:00
Chiss
9fad775f73 More cosmetics 2014-08-23 07:50:07 +10: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
97c087a28d Allowed commands to specify specific ranks
allowed youtube/build to start/set games
2014-08-22 17:05:14 +10: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