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

836 Commits

Author SHA1 Message Date
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
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
Chiss
da5f953212 Fixed BlockMorph leaving blocks behind when player was teleported. 2014-08-27 14:22:35 +10:00
CoderTim
5ef2772abd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-26 20:27:51 -04:00
CoderTim
7d6572ff4d Fixed SheepGame Selfish achievement 2014-08-26 20:27:39 -04:00
Chiss
f25f7d3aa2 Fixed 1v3 achievement not giving achievement if players quit (required 4 at END) 2014-08-27 09:52:33 +10:00
Chiss
5540835052 removed micro debug 
fixed a bug in achievement output
 2014-08-27 09:09:06 +10:00
Chiss
f9ce0d353c Achievements now need 75%+ players at START of game 2014-08-27 08:57:11 +10:00
CoderTim
d9e1f35985 Fixed BadHiderStatTracker and limited stat recording to when games are at least 75% full 2014-08-26 16:30:55 -04:00
Chiss
17649ce36c Fixed bug where desc for past-completed achievements was still showing 2014-08-26 21:51:59 +10:00
Chiss
ab29a5fa29 Fixed text output in Achi GUI for completed 2014-08-26 18:06:01 +10:00
Chiss
3eae26ef80 Updated Achievement Output 2014-08-26 18:03:29 +10:00
Chiss
d62b59776f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-26 17:54:50 +10:00
Chiss
116fe496a8 Changed post game achievement output 
Added Reward to Achi GUI
 2014-08-26 17:53:54 +10:00
Chiss
7e7906865f Fixed some stats being added after send-off 2014-08-26 17:45:35 +10: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
0546c9e175 Fixed so only Supply drop chests trigger achievement 2014-08-26 17:33:23 +10:00
Chiss
1b15a57fc8 Added Gem Rewards for Achievements 2014-08-26 17:10:20 +10:00
Chiss
dd61077850 Added missing Achievements 2014-08-26 14:46:10 +10: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
86930de23e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/AssistsStatTracker.java
 2014-08-26 08:19:50 +10:00
Chiss
07ee44508e Missing Gadgets 2014-08-26 08:17:41 +10:00
CoderTim
933d32d8f8 Fixed team death/kills stats 2014-08-25 18:06:50 -04:00
CoderTim
9acc7d8496 Added team kill and death achievement trackers 2014-08-25 17:43:49 -04:00
CoderTim
4ce537a3a7 Fixed some NPEs and achievement bugs 2014-08-25 16:27:02 -04:00
Chiss
13eb3da0fa Achievment gui changes 2014-08-25 09:26:01 +10:00
Chiss
7669998ad3 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-25 08:38:29 +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
Chiss
23f6d0ae1a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-24 16:46:00 +10:00
Chiss
3f5cff3e21 Killing cheaters for a few things in bridges 2014-08-24 16:45:47 +10:00
CoderTim
c89461628b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-23 16:00:26 -04:00
CoderTim
fb90336d4e Finished stats/achievements 2014-08-23 16:00:15 -04:00
Chiss
642f8b46b9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-23 18:01:35 +10:00
Chiss
7348a26951 fixed damage dealt npe 2014-08-23 18:00:23 +10:00
Chiss
af9bf0727a Fixed damage taken stat NPE 
Added tournament team auto-rejoin
 2014-08-23 17:55:28 +10:00
Jonathan Williams
70beb58bd6 Enabled debugging in Hub/Arcade 2014-08-23 01:49:48 -05:00
Chiss
3ec43f90e8 GameAchievementManager now utilises TaskManager to record whether or not people have previously completed Achievements 2014-08-23 15:04:43 +10:00
CoderTim
4afafe2d51 Some stats fixes 2014-08-22 21:54:08 -04:00
CoderTim
b2b208bdba Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-22 17:30:08 -04:00
CoderTim
02bb53578a Registered stat listeners with each game 2014-08-22 17:20:02 -04:00
Chiss
231ef2bbe1 Cosmetic Update 2014-08-23 04:30:41 +10: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
CoderTim
591b5c026c Almost all achievements done 2014-08-21 18:55:40 -04:00
Jonathan Williams
5e47a12531 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-21 15:56:02 -05:00
CoderTim
94f2aade08 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-21 15:01:22 -04:00
Jonathan Williams
1398543490 Fixed bug with Projectile 
Changed tp out of game to 1 per tick.
 2014-08-21 02:07:54 -05:00
Chiss
ac088e85b2 Added some game flags 
Dragon escape changes
 2014-08-21 13:35:31 +10:00
CoderTim
f266f4e016 More achievements 2014-08-20 19:20:11 -04: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
CoderTim
18ca7d5656 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-19 21:16:44 -04:00
CoderTim
599277b88e More work on achievements 2014-08-19 21:16:28 -04: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
CoderTim
09c01d90ad Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-19 19:07:37 -04:00
Shaun Bennett
e1a57a673e Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors 2014-08-19 16:58:55 -05:00
CoderTim
05686cb584 Work on achievements 2014-08-18 16:41:16 -04:00
Chiss
d8123795aa changed the way disguises show rank. 2014-08-16 16:33:18 +10:00
Chiss
508ef65fcf Added missing file 2014-08-16 14:17:15 +10:00
CoderTim
19222c6815 Updated IntelliJ environment to be compatible with latest changes 2014-08-15 15:51:29 -04:00
Chiss
29db90837d Spleef Update 
Map parser block stuff
 2014-08-15 15:28:50 +10:00
Chiss
85522cddca Debug (will clean once fixed) 
Game stats
 2014-08-15 09:49:00 +10:00
Chiss
74435bac12 fixed bug where players kept inventory open, to be able to enable morphs ingame. 2014-08-14 17:31:14 +10:00
Chiss
5f80d9c57a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
 2014-08-14 11:24:51 +10:00
Chiss
b6ba142c5a Mineplex in scoreboard is fancier. 2014-08-14 11:23:48 +10:00
Shaun Bennett
b9534bd245 Merge remote-tracking branch 'origin/master' 2014-08-13 20:07:01 -05:00
Shaun Bennett
cfe45139b6 Adjust lobby text for the removal of premium kits 2014-08-13 19:56:47 -05:00
Shaun Bennett
83f04273fa Sort kits properly when a game uses NullKit 2014-08-13 19:45:38 -05:00
Chiss
b21ae8ef72 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-14 10:32:52 +10:00
Chiss
7a3bba45a7 Mergey! 2014-08-14 10:32:41 +10:00
Jonathan Williams
6039168601 Updated code base to build #1604 spigot 2014-08-13 18:57:37 -05:00
Chiss
95394c51cc Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-12 11:24:12 +10:00
Chiss
2d67d4ce36 Achievement fix + active 2014-08-12 11:23:53 +10:00
Shaun Bennett
d63137ead2 Merge remote-tracking branch 'origin/master' 2014-08-11 12:44:28 -05:00
Shaun Bennett
7e93ed657f Display boss bar properly while a dragon mount is spawned in arcade 2014-08-11 12:26:56 -05:00
Chiss
02270a9d25 TNT effect only triggers off self tnt. 2014-08-11 15:33:45 +10:00
Chiss
7191d48bd0 fixed paintball pre-game bug 2014-08-11 14:25:11 +10:00
Chiss
e4871c4988 Disabling cosmetics 5s before game starts, was having some carryover due to lag. 2014-08-11 11:55:00 +10:00
Chiss
d81b32bd3a Sneaky Assassins balance+polish 2014-08-10 21:05:41 +10:00
Chiss
06bcf5079b Disabled Gem hunter (bugged?) 
Disabled chicken morph letting people fly
 2014-08-10 18:36:18 +10:00
Chiss
25b525837f Fixed TNT blowing up lobby when it changed to prepare. 2014-08-10 11:07:05 +10:00
Chiss
9057246ab8 Arcade Inventory fixes 2014-08-10 10:50:31 +10:00
Chiss
3533ce1b7e Particles dont play in stealth games. 2014-08-10 01:04:53 +10:00
Chiss
616a0ecf11 Staff get all kits unlocked. 2014-08-10 00:32:50 +10:00
Chiss
38fd85335f Fixes disguises being disabled. 2014-08-10 00:21:45 +10:00
Chiss
62cc422f42 FINAL FIX 2014-08-10 00:13:04 +10:00
Chiss
c95cf79aa6 fxied more 2014-08-10 00:10:08 +10:00
Chiss
a43a5b2c0e bacon brawl fix 
signel game ultra shows in hub scoreboard
 2014-08-10 00:09:39 +10:00
Chiss
3d1ddecffb Smash Kit fix 
Gem Booster (dragons) fix
 2014-08-09 23:25:13 +10:00
Chiss
cac7f85410 Single game ultra kit unlock 2014-08-09 23:10:40 +10:00
Chiss
23f93e55cf fixed dragons destroying pregame lobby 2014-08-09 22:59:54 +10:00
Chiss
ff6ea3c798 Added Cosmetics to Arcade 
Set prices on cosmetics
 2014-08-09 19:55:05 +10:00
Jonathan Williams
8fe4e39207 Split up Cosmetic shop and Inventory 
Added Ammo purchase for item gadgets.
 2014-08-09 03:57:56 -05:00
Chiss
91a79f0345 Pig Morph 
Morphs have tags/
 2014-08-09 14:57:01 +10:00
Chiss
fb19e93992 Gem text 2014-08-09 13:46:41 +10:00
Chiss
c93a49add2 More gem boosty! 2014-08-09 13:42:29 +10:00
Chiss
2e95548b6e Gem Boosters! 2014-08-09 13:39:57 +10:00
Chiss
3a220b6f1c Micro Update 
SGTeams inv click fix.
 2014-08-09 13:11:32 +10:00
Jonathan Williams
6bd9273edf Refactored getting item count for ClientInventory 
Fixed up Arcade gem boosters so they are hooked into inventory.
Cleaned up unused code.
 2014-08-08 22:10:02 -05:00
Chiss
313f675ae4 Hub Parkour update 
Smash kit prices
 2014-08-09 12:16:37 +10:00
Chiss
b36b1cb007 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-08 17:05:23 +10:00
Chiss
fa3695be4e Gem Booster In Lobby 
Achievement Stuff
 2014-08-08 17:05:11 +10:00
Shaun Bennett
9395711dcb Merge remote-tracking branch 'origin/master' 2014-08-08 01:51:50 -05:00
Shaun Bennett
b7ecf5eb04 GET MINEPLEX ULTRA FOR AMAZING FUN TIMES 2014-08-08 01:51:11 -05:00
Chiss
1a33dbb5ee Achievement Module 
Gem Booster/Achivement
 2014-08-08 13:46:35 +10:00
Shaun Bennett
2fd7621a81 Display proper team in Arcade Lobby (Fixes bug where a player connecting will break scoreboards) 2014-08-07 18:44:27 -05: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