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

1648 Commits

Author SHA1 Message Date
Shaun Bennett aad3d59177 Merge remote-tracking branch 'origin/master' 2014-09-18 21:03:59 -05:00
Shaun Bennett 5d643c00d5 treasssssurreeeeees 2014-09-18 21:03:46 -05:00
Chiss 27587a2a11 fixed players being able to be pushed into portals by gadgets 2014-09-19 11:15:48 +10:00
Chiss a0e9d6f6fd fixed a portal break bug 
reduced lag from coin bomb
 2014-09-19 10:59:26 +10:00
Chiss 4b602c1b83 Inventory Update 
added Jooq to Hub build
 2014-09-19 10:36:41 +10:00
Shaun Bennett c93fee2b53 Fix typos for pets 2014-09-18 18:10:33 -05:00
Shaun Bennett ee64ff2bf6 Dispose of Shop if the InventoryOpenEvent gets cancelled 2014-09-18 17:48:35 -05:00
Shaun Bennett 2008dae57b Adjust treasure message 2014-09-18 17:38:05 -05:00
Shaun Bennett 51ad6d8368 Open Treasure chests through cosmetic gui, purchase treasure keys, some bug fixes 2014-09-18 17:33:05 -05:00
Shaun Bennett b8d157f99f Add costumes to RewardManager 2014-09-18 14:47:22 -05:00
Shaun Bennett 76df00978a Add music discs to RewardManager 2014-09-18 14:43:07 -05:00
Shaun Bennett 88a8e3a896 Hackyish way to log rewards given out in a database 2014-09-18 14:35:59 -05:00
Chiss ed59e03795 Loot update 2014-09-18 17:05:56 +10:00
CoderTim 8b14c85572 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-18 01:57:04 -04:00
CoderTim f8ee20c433 Record server name in basic game stats 2014-09-18 01:56:46 -04:00
Shaun Bennett e5d5cda9fd Merge remote-tracking branch 'origin/master' 2014-09-18 00:46:41 -05:00
Shaun Bennett 87bd5d8f7f Add coin party bomb to rare rewards, fix reward values from last commit 2014-09-18 00:46:33 -05:00
Chiss 3fd312ff95 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-18 15:45:01 +10:00
Chiss fed3d31374 MineStrike fixes 2014-09-18 15:44:48 +10:00
Shaun Bennett 6c4479298d Fix RewardManager bug, fooling around with animations 2014-09-18 00:41:56 -05:00
Shaun Bennett 9d0b99b7fc Merge remote-tracking branch 'origin/master' 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
	Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
 2014-09-17 23:56:42 -05:00
Chiss 09a3cc16b0 Reward stuffs 2014-09-18 14:36:22 +10:00
Chiss bb8e481c7f More Reward stuff 2014-09-18 14:25:39 +10:00
Chiss c625fb4121 Restructured rewards for Post-Game rewards 2014-09-18 13:21:30 +10:00
Shaun Bennett 33d33f84b4 More treasure animation touches + fixes 2014-09-17 15:22:54 -05:00
Shaun Bennett da680359d0 Change formatting of treasure announcements 2014-09-17 14:50:34 -05:00
Shaun Bennett 90e402bf69 Fix menu slots 2014-09-17 14:43:58 -05:00
Shaun Bennett 0139e40957 Re-enable Coin Party Bomb reward for rare treasures 2014-09-17 14:35:43 -05:00
Shaun Bennett cc5db5939d Add Music and Costume pages to cosmetic menu 2014-09-17 14:34:57 -05:00
Chiss 8780d5e4ee MS fixes 2014-09-17 11:18:59 +10:00
Chiss 16214613fe Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-17 08:59:23 +10:00
Chiss e6797582f9 Minor fixes 2014-09-17 08:59:09 +10:00
Shaun Bennett 50fa8b02f1 Use explosion particles instead of createExplosion 2014-09-16 17:57:34 -05:00
Shaun Bennett 918a817283 More treasure bug fixes and animation touches 2014-09-16 15:04:42 -05:00
CoderTim 6eed36f0ee Accidentally committed with line of code commented out 2014-09-15 23:46:44 -04:00
CoderTim d3b541dc27 Updated Arcade .classpath 2014-09-15 23:43:13 -04:00
CoderTim d5313540d7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-15 23:32:04 -04:00
CoderTim c5ff9da552 Record basic game stats (game type, timestamp, duration, winners, losers) 2014-09-15 23:31:53 -04:00
CoderTim c550e59d45 Renamed jooq database record classes 2014-09-15 23:30:24 -04:00
Shaun Bennett 5b77fa09a4 Merge remote-tracking branch 'origin/master' 2014-09-15 19:37:28 -05:00
CoderTim 1b416d3e6f Added database tables to record basic game stats 2014-09-15 16:36:59 -04:00
Shaun Bennett 63b3621ae3 Fix treasure open chest bug, added some animation touches 2014-09-15 13:34:21 -05:00
MrTwiggy abea4223ab Recommit up-time checking to prevent brand new empty servers from being prematurely killed by ServerMonitor. 2014-09-15 13:22:11 -04:00
Shaun Bennett 7c18e89249 Send chest open packets for new players that join in the middle of a treasure 2014-09-15 10:37:40 -05:00
Jonathan Williams c7e0ebefd1 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-13 20:52:13 -10:00
Jonathan Williams a395cae764 Fixes for Custom tag 
Fix for Bridge time
Fix for tournament auto whitelist.
Added UI stuf for tourney

Added build files for arcade.
 2014-09-13 20:50:27 -10:00
Shaun Bennett 8659422877 Merge remote-tracking branch 'origin/master' 2014-09-14 00:29:37 -05:00
Shaun Bennett c1bc9fca2e Small treasure tweaks 2014-09-14 00:29:30 -05:00
Chiss 26a51f4ef2 Re-allowed opening of chests (for GUIs) during games. 2014-09-14 15:28:43 +10:00
Chiss f3df86a5a9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-14 14:10:51 +10:00
Chiss 7e3b9b4b3a some 1.8 title stuff 2014-09-14 14:10:40 +10:00
Shaun Bennett fc44592edf Merge remote-tracking branch 'origin/master' 2014-09-13 23:07:21 -05:00
Shaun Bennett 228cca4805 fix bug with reward amounts 2014-09-13 23:07:15 -05:00
Jonathan Williams 7ad7dd939d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-12 22:00:18 -10:00
Jonathan Williams 1c3326333d Fix for crash. 2014-09-12 21:59:12 -10:00
Jonathan Williams 4f5430e390 Added tournament stuff. 2014-09-12 21:52:44 -10:00
Chiss e31ab1b37a disabled treasure again! 2014-09-13 16:44:51 +10:00
Chiss 054709a859 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
 2014-09-13 16:44:11 +10:00
Chiss 31c4a95da5 Disabled Treasure Chests 2014-09-13 16:43:18 +10:00
Shaun Bennett 1e7ed8d491 Treasure rewards + some minor fixes 2014-09-13 01:25:14 -05:00
Jonathan Williams a196e43fde Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
 2014-09-12 19:46:19 -10:00
Shaun Bennett 0afb0f061c Changes to fireworks animation 2014-09-12 23:43:38 -05:00
Shaun Bennett aafdc555b1 Oops, accidentally removed some code! 2014-09-12 23:41:50 -05:00
Shaun Bennett 0f44850367 Treasure stuff 2014-09-12 23:30:00 -05:00
Shaun Bennett 5e9cbcef75 Merge remote-tracking branch 'origin/master' 2014-09-12 23:15:58 -05:00
Shaun Bennett 71f42c6e7b Treasure updates 2014-09-12 23:15:53 -05:00
Chiss a31e20d709 treasure styles 2014-09-13 14:09:50 +10:00
Chiss 4454627b32 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-13 13:41:48 +10:00
Chiss e511df4605 Merge treasure 2014-09-13 13:41:37 +10:00
Shaun Bennett fc6a2633c9 Remove debug message, make sure player is far enough from spawn to open treasure 2014-09-12 22:41:10 -05:00
Shaun Bennett 88ef0ce35b Merge remote-tracking branch 'origin/master' 2014-09-12 22:33:28 -05:00
Shaun Bennett a8eeef02dd Adjustments to how treasure rewards are selected 2014-09-12 22:33:22 -05:00
Chiss e36f843feb Fixed bug in MineStrike 2014-09-13 12:29:35 +10:00
Chiss f0fa3469df Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-13 09:17:50 +10:00
Chiss 58f784187b UHC Manager for Hub 2014-09-13 09:13:46 +10:00
Jonathan Williams 14c4152248 Fixed CustomTagFix. 
Updated ServerData ServerGroup and SErverMonitor for new flags in Arcade.
 2014-09-12 10:03:33 -10:00
Shaun Bennett 20680acea0 More treasure rewards + tweaks 2014-09-12 14:24:30 -05:00
Shaun Bennett dea6c98fc9 Merge remote-tracking branch 'origin/master' 2014-09-12 14:08:22 -05:00
Shaun Bennett 4ea786a1a5 Fix fireworks for 1.8 client, a bunch more treasure stuff 2014-09-12 14:08:10 -05:00
Chiss 5de59b6e0e Hub UHC countdown basics 
UHC MOTD timer stuff
 2014-09-12 18:06:51 +10:00
Chiss b5152bd621 removed some redundant repeated color stuff 2014-09-12 11:59:32 +10:00
Chiss b507571403 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Database/.classpath
 2014-09-12 11:49:18 +10:00
Chiss fba1d0e430 Required for merge 2014-09-12 11:48:32 +10:00
Chiss 0dff0412d1 Fixed game flag for not allowing inventory opens 
Removed some redundant flags in game
Lots of MineStrike updates
Fixed NPE in WinWithoutLosingTeammateStatTracker
 2014-09-12 11:47:39 +10:00
CoderTim f5f9ba6bdf Added .project and .classpath for Mineplex.Database 2014-09-11 17:10:24 -04:00
Chiss 092e9ba479 Modified UHC borders for release 2014-09-11 17:44:57 +10:00
Chiss 2791d54040 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-11 13:43:34 +10:00
Chiss 56263718d7 Fix for BossBar 2014-09-11 13:17:57 +10:00
Shaun Bennett b910c5098c Cross version Holograms (Alignment might be a tad off) 
A bunch of stuff for Treasure Chests
 2014-09-10 12:16:31 -05:00
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
Jonathan Williams 1ea660df3a Update craftbukkit with new patch file 2014-09-05 16:59:29 -05: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 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