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

754 Commits

Author SHA1 Message Date
CoderTim b341089cfe Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-08 16:28:50 -04:00
CoderTim 90d88ebd0b Fixed "The Longest Shot" achievement bug 2014-09-08 16:27:09 -04:00
Chiss 347e2b1bf5 Changed FIRE items to Blaze Powder 2014-09-08 10:14:55 +10:00
Chiss f138a4108b Deregister stat trackers from listener 2014-09-06 22:01:05 +10:00
Chiss 644d3da050 JOOQ for Eclipse 2014-09-06 11:31:55 +10:00
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 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 2d5c676e1b Merge remote-tracking branch 'origin/master' 2014-09-02 18:57:35 -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
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
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
Chiss 2b333859d1 PUUSH 2014-08-30 19:24:04 +10:00
Chiss 3767911718 updated game desc output 2014-08-30 19:07:43 +10:00
Chiss 7696349187 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-30 16:34:10 +10: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
CoderTim b7baa1b2f4 Count disconnecting from the server as a loss 2014-08-30 02:30:07 -04:00
CoderTim 34f04ad4e3 Fixed Champions Assassination and Longshot achievements 2014-08-29 21:09:51 -04: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
Chiss 1f6b9374eb disable le minestrike 2014-08-29 11:55:06 +10:00
Chiss c3bb0ddbcb Chest example gadget for shauny 2014-08-29 11:00:16 +10:00
CoderTim cc57ddf4bc Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-28 06:54:36 -04:00
CoderTim bdef9acecd Fixed DragonEscape win stat tracker 2014-08-28 00:53:54 -04:00
Chiss ec4cb91a1c Poll changes 
Achievement output double space fix
 2014-08-28 11:50:09 +10:00
Jonathan Williams 526ca42add Fixed Gem booster problem. 
FIxed stat problem.
 2014-08-27 12:48:24 -07:00
Chiss 9439daa852 Fixed bug where spectators could trigger anti-cheat in bridges 2014-08-27 15:16:20 +10:00
Chiss d9ef5f50be disabled minestrike 2014-08-27 14:23:31 +10:00
Chiss 596bcbfae6 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-27 14:23:01 +10:00