JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,461 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

1434 Commits

Author SHA1 Message Date
Chiss 892b67beb2 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-05 21:43:33 +10:00
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 4064c5238c bridges volcano fix 
minestrike npe fix
 2014-09-05 21:35:26 +10:00
CoderTim 3830ab8e0f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-05 06:06:13 -04:00
CoderTim 91a2266a04 Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking 2014-09-05 04:00:51 -04:00
Chiss 4e94bcfd98 Block Hunt winners fix (team/solo) 2014-09-05 17:29:23 +10:00
Chiss abc95853f7 sulhpur bomb fix 2014-09-05 15:47:35 +10:00
Chiss 8c1e0c3e9e Fletcher data fix 
Minestrike stuff
 2014-09-05 15:45:14 +10: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
CoderTim aae46bdeda Removed unused intellij module 2014-09-03 16:58:53 -04:00
CoderTim 74e012a811 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-03 16:54:41 -04:00
CoderTim 39b46bc8f5 Fixed some NPEs 2014-09-03 16:53:29 -04: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 21225d7b65 Minor Fixes 2014-09-03 15:09:14 +10:00
Chiss 50140ef92d Minestrike update 2014-09-03 14:49:38 +10:00
Chiss 246f2e91d9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-03 12:38:57 +10:00
Chiss 58f98881f2 Minestrike Update 2014-09-03 12:38:44 +10:00
Chiss 1dec79c0fa Minestrike update 2014-09-03 12:28:45 +10:00
Shaun Bennett 4dbe7003b2 Update Arcade Icon in the game menu 2014-09-02 21:09:12 -05:00
Shaun Bennett 8d06cddfb2 Remove Chiss' debug message for shop 2014-09-02 20:36:25 -05:00
Shaun Bennett 9168de20da Update PlayerConnection method to latest spigot (Fixes right click bug, caused from old spigot code) 2014-09-02 20:33:00 -05:00
Shaun Bennett 08e6b73b1f Disable Treasure stuff for now 2014-09-02 19:04:43 -05:00
Shaun Bennett 2b3f6c9dbc Prevent minecart mounts from being broken by others 2014-09-02 19:03:14 -05:00
Shaun Bennett 2d5c676e1b Merge remote-tracking branch 'origin/master' 2014-09-02 18:57:35 -05:00
Shaun Bennett 4ad034b8d9 more treasure stuff, really basic holograms 2014-09-02 18:33:40 -05:00
Chiss d5766d62ae nerf p90 2014-09-02 16:49:45 +10:00
Chiss 449281501f MineStrike Update 2014-09-02 16:49:15 +10:00
Jonathan Williams 006c7d1e65 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-01 20:04:02 -07:00
Jonathan Williams a568631df8 Work on AccountAdministrator 2014-09-01 20:03:08 -07:00
Chiss 5d6834633f MineStrike update 2014-09-02 11:16:17 +10:00
Shaun Bennett df882012e5 When items are dropped in The Bridges, only the player that broke the block can pickup the item for 8 seconds. (Only applies to specific item types) 2014-09-01 15:38:07 -05:00
Chiss 05623b7522 Initial MineStrike push 
fixed frames being breakable in games
 2014-09-01 21:37:39 +10:00
Chiss 492b3cc0a4 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-01 17:57:17 +10:00
Jonathan Williams 8198bb31c8 Added sneaking to player disguise. 
Did work on DDoSProtectionSwitcher
Work on AccountAdministrator to fix rank issues.
 2014-09-01 00:56:32 -07:00
Shaun Bennett 5905ef5ef7 Treasure Stuff 2014-08-30 14:27:11 -05:00
Chiss 116c54352b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-30 20:49:46 +10:00
Chiss 207de0e67a fixed MAC kicking players on lillypads 2014-08-30 20:49:32 +10:00
Jonathan Williams c8bc697888 Fixed mounts and gadgets for rank messages...no Purchase. 2014-08-30 02:37:27 -07:00
Jonathan Williams f6dcebc3dc Fixed extra spacing in cosmetic menu. 2014-08-30 02:33:37 -07:00
Jonathan Williams 72aa05f73e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-30 02:26:16 -07:00
Jonathan Williams 829736ed07 Fixed purchase info. 2014-08-30 02:26:07 -07:00
Shaun Bennett e52f6deab4 Merge remote-tracking branch 'origin/master' 2014-08-30 04:24:34 -05:00
Shaun Bennett 6a58b86a19 Don't display wins and losses to other players on Achievement Gui 2014-08-30 04:24:25 -05:00
Chiss 2b333859d1 PUUSH 2014-08-30 19:24:04 +10:00
Chiss f58aca7990 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-30 19:07:55 +10:00