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

2438 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shaun Bennett
32bbecd01a Merge remote-tracking branch 'origin/master' 2014-09-09 19:27:16 -05:00
Shaun Bennett
c4ad00bef1 add armor stand hologram, just to send code to laptop 2014-09-09 19:27:05 -05:00
CoderTim
235cf8cae7 Fixed win stats on solo games 2014-09-09 02:18:20 -04:00
Chiss
7bbb7ca545 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-09 10:53:03 +10:00
Chiss
1943dbeaab Removing PermissionsEx dependency for MapParser 2014-09-09 10:52:51 +10:00
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
Shaun Bennett
652075138e More treasure rewards work 2014-09-08 13:26:18 -05:00
Chiss
347e2b1bf5 Changed FIRE items to Blaze Powder 2014-09-08 10:14:55 +10:00
CoderTim
3e5b827a7f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-07 18:10:31 -04:00
CoderTim
201782a7cd Added leaderboard.php 2014-09-07 18:09:46 -04:00
Shaun Bennett
6441b110b4 Treasure stuff from laptop 2014-09-07 13:35:49 -05:00
Chiss
aa77821c20 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-06 22:01:17 +10:00
Chiss
f138a4108b Deregister stat trackers from listener 2014-09-06 22:01:05 +10:00
Jonathan Williams
558231457c Fixed disguises leaving extra tags 
Fixed memory problem in Arcade.
 2014-09-06 03:39:20 -07:00
Shaun Bennett
86d063dafb Merge remote-tracking branch 'origin/master' 2014-09-06 01:07:49 -05:00
Shaun Bennett
15b46e8f96 Fix displaying on stats on achievement gui 2014-09-06 01:07:40 -05:00
Chiss
644d3da050 JOOQ for Eclipse 2014-09-06 11:31:55 +10:00
Chiss
a3545d074d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-06 10:58:23 +10:00
Shaun Bennett
eb27c1dfbe Add Util class for sending titles to players 2014-09-05 19:46:11 -05:00
Shaun Bennett
8ad137c218 Merge remote-tracking branch 'origin/master' 2014-09-05 17:01:38 -05:00
Jonathan Williams
1ea660df3a Update craftbukkit with new patch file 2014-09-05 16:59:29 -05:00
Jonathan Williams
f3da99d539 Updated patch for spigot. 2014-09-05 14:40:39 -07:00
Jonathan Williams
c0e4539e53 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-05 14:38:28 -07:00
Jonathan Williams
2f8b53f771 Fix for customer support server. 
Fix for Boss bar junk.
Fix for Disguises.
 2014-09-05 14:36:10 -07:00
Shaun Bennett
0ad844d1b5 Merge remote-tracking branch 'origin/master' 2014-09-05 16:35:26 -05:00
Shaun Bennett
b96ba09857 Update CraftBukkit to latest spigot changes. Includes title and tab packets 2014-09-05 16:35:00 -05: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
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
e6bc048179 Spigot patch file for mineplex 2014-09-03 03:50:26 -07: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