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

2830 Commits

Author SHA1 Message Date
LCastr0 ed68ef332b Fixes for Win Room (Players were able to see other players) 
Added command to allow other players to run ranked commands
Fixes code styles
 2016-05-22 21:05:48 -03:00
xXVevzZXx c984bbfc8a make it possible to add stats to the brawl games 2016-05-22 00:29:58 +02:00
LCastr0 92b6abc884 Fixes merging bugs 2016-05-20 23:53:27 -03:00
LCastr0 0109e2f2dd Fixes for Illuminated chest 
Fixes for /check command (Support)
 2016-05-20 23:33:58 -03:00
xXVevzZXx 0fb84e57c1 Merge branch 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
 2016-05-20 23:26:54 +02:00
cnr d6750c7d91 Disable /unlockCosmetics on production servers 2016-05-20 03:23:27 -05:00
LCastr0 22fb507871 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-05-20 05:14:29 -03:00
LCastr0 c58e0f3e30 Fixes for the 1 Shard thing (Next time, for testing, use /unlockCosmetics) 2016-05-20 05:11:59 -03:00
Shaun Bennett efb264dd75 Hook into Booster API 2016-05-20 16:58:58 +10:00
Thanos Paravantis 28f1d45b1c Update achievement category game enum 2016-05-19 20:55:22 +03:00
Thanos Paravantis 472d3881a0 Merge branch 'develop' into thanos-mineware 2016-05-19 20:49:45 +03:00
Thanos Paravantis 87c8c7efa4 Merge branch 'master' into thanos-mineware 2016-05-19 20:42:43 +03:00
cnr 7f44281441 Merge branch 'develop' into project-cosmetics 2016-05-19 10:04:19 -05:00
Shaun Bennett 012edfed45 Use loaded schematics to display fountain progress 2016-05-18 18:04:21 +10:00
LCastr0 11db05b6bf Fixes spelling of MineStrike gun 
Fixes spectators not being sent to the

winroom
 2016-05-18 03:58:50 -03:00
Shaun Bennett e3833b95ad Update Gem Fountain purchase gui 2016-05-18 15:59:04 +10:00
TadahTech 3479d6e318 Fix incognito. 2016-05-17 18:12:05 -05:00
TadahTech 38a0b593ee Fix height for 1.9 and 1.8 users. 
*Thanks QA for not fully testing*....
 2016-05-17 18:11:28 -05:00
Ben 35c7b9a2bd Incognito Updates: 
-ADD: Prompt in Tab to identify who is in vanish (Can be a * or [Vanish])
-ADD: Make it so /stats don't work on vanished staff.
-ADD: Make sure it can be toggled off on /vanish again or network leave. Staff get stuck with it when resigning. Should stay on in-between lobbies.
 2016-05-17 18:10:07 -05:00
Ben 8a75a5098c Remove hub invisibility preference for all but Admins and higher. 2016-05-17 18:08:01 -05:00
Ben 014ce137fc If a player uses /a regardless of if staff are online, offline, or vanished, making it always yield a response telling the player that if there are staff currently online, they will receive a reply soon - removing the "there are no staff online" message. Also a 60s Recharge for this. 2016-05-17 18:03:18 -05:00
Ben 6760c07e6c Fix staff members getting stuck in both Incognito mode and the Hub Invisibility preference, and not being able to toggle either off them off because Incognito would stop Hub Invisibility from getting toggled (on OR off), and vice versa. 2016-05-17 18:00:20 -05:00
xXVevzZXx 6e9b0e4fa5 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java
 2016-05-17 14:41:17 +02:00
TadahTech 43cadf564e Fix Carl the Creeper. Fix Bridges TNT exploit. 2016-05-16 22:03:27 -05:00
LCastr0 fb63b3a1a4 Fixes for winroom command, and illuminated chest 2016-05-15 22:49:10 -03:00
LCastr0 42eef838b3 Fixes podium not being enabled by default 2016-05-15 21:33:36 -03:00
xGamingDudex a27a618b2f Made debugging tools only available on test servers 2016-05-16 02:04:15 +02:00
xGamingDudex 816a7ca232 Re-Activated chest buttons 2016-05-16 01:57:58 +02:00
xGamingDudex d92ad9c53f Made illuminated chest purchasable and added appropriate lore 2016-05-16 01:51:40 +02:00
LCastr0 511726f72a Treasure chest coin checker for test servers 2016-05-15 20:43:46 -03:00
xGamingDudex 4ebf48bd45 Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics 2016-05-16 01:34:08 +02:00
xGamingDudex 8ad7646128 Edits to treasure chests 2016-05-16 01:33:54 +02:00
xGamingDudex f8d5bd3c11 Fixed treasure chests 
Items would sometimes pop out of chest blocks
You could open illuminated chests before they were converted to real
chests
 2016-05-16 00:51:33 +02:00
LCastr0 09b7fbdbbe Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-05-15 18:48:00 -03:00
LCastr0 4f79ec6551 Pinata fixes 2016-05-15 18:47:09 -03:00
xGamingDudex b4aad690e5 Fixed some rewards and added party trail to chests 2016-05-15 23:31:10 +02:00
xGamingDudex fdf167953f Fixed emerald set order 2016-05-15 23:30:17 +02:00
xGamingDudex 1e6dda2d7d Cleaned up some win effect backend code & fixed kits working in winroom 2016-05-15 23:28:12 +02:00
xGamingDudex d850bed725 Minor code tweaking 
* Made reward manager ammo multiplier private final field
* Removed old commented code from WinEffectPodium, WinEffectLavaTrap,
ParticleMusic, ParticleEmerald, ParticleBlood
* Cleaned up the GameModifierMineStrikeSkin filter
* Removed unused Math#isBetween(double, double, double) method
* Changed Animator to use PriorityQueue
 2016-05-15 19:43:07 +02:00
xGamingDudex 97f82e422d Merge branch 'project-cosmetics' of 
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
project-cosmetics

Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/Animator.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/AnimatorEntity.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ICosmeticShape.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java
 2016-05-15 16:03:36 +02:00
xGamingDudex 22e54557d8 Fixed cleaning method for WineffectRiseOfTheElderGuardian 
The class contained commented code, removed when debugging
 2016-05-15 15:33:42 +02:00
xGamingDudex abddc446fd Added java docs and tweaked code 
* Fixed possible duplication bug in MulitBlockUpdaterAgent
* Tweaked some of the factor methods for Shape.java
* Cleaned some code in ShapeWings.java
 2016-05-15 15:32:44 +02:00
LCastr0 1cc44d1b3e Fixes for the following classes: 
KitGameModifier
KitModifierType
MultiBlockUpdaterAgent
Shape
GadgetManager
KitModifierType
HatLovestruck
HatSecretPackage
SetLove
Animator
AnimatorEntity
AnimationPoint
ICosmeticShape
UtilText
KitGameModifier
KitModifierType
Removed build.xml and org.eclipse.jdt.ui.prefs
 2016-05-15 00:20:07 -03:00
xGamingDudex 24f7a4b409 Added "(Minestrike Weapon Skin)" suffix to MS skins in treasure rewards 2016-05-14 18:53:09 +02:00
samczsun b2e92fdf15 Don't pass on INTERACT_AT as INTERACT. Fixes PC-114 2016-05-14 09:42:28 -05:00
LCastr0 20b9f428b4 Fixes Illuminated Chest's Lore 
Fixes Pinata Burst not being saved
Fixes AWP Asiimov and XM1014 Tranquility materials
Removes Fireworks WinRoom
Changes prices of things from 1 shard to Treasure Chest
More unused imports removed
Fixed ANGLE_WING_PATTERN -> ANGEL_WING_PATTERN
Adds javadoc to UtilColor.applyColor()
Adds javadoc to UtilColor.getNextColor()
defaultLeatherColor -> DEFAULT_LEATHER_COLOR
Adds suggestions for UtilColor
Adds final modifier to _worldBorders (UtilPlayer)
Changed _worldBorders key from String to UUID
Adds suggestion for UtilPlayer
Adds final modifier to _type (GameModifierSubPage)
Adds final modifier to _type and _kitType (KitGameModifierPage)
DefaultDencity -> DefaultDensity (Shape)
Changed <Vector> to <> (Shape)
dencity -> density (ShapeBox, ShapeGrid, ShapeSphere)
Using speed and count in constructor (ShapeWings)
Removed empty constructor (WorldGenCleanRoom, MultiBlockUpdaterAgent)
Adds final modifier to all fields (AnimationPoint)
 2016-05-14 01:18:37 -03:00
Shaun Bennett b802cdec6d Rename shop to "Fountain Keeper" 2016-05-14 14:01:28 +10:00
xXVevzZXx 63c44afa10 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants 2016-05-13 22:05:27 +02:00
xXVevzZXx df5c628c35 add new gamemodes Tiny Winners, Random Kit SSM, UHC SW, UHC SG and improve OP SG, OP SW, OP Bridges, Dukes of decoration, OP Gladiators, Faster than Light, Bunny Hopper and Countdown 2016-05-13 20:23:04 +02:00
xGamingDudex 2cc609b67e Moved some rewards from normal to valentines 2016-05-13 01:28:26 +02:00
xGamingDudex 35ab155756 Removed unnecessary lore from minestrike game modifiers 2016-05-13 01:20:06 +02:00
xGamingDudex d34f77a381 Moved some rewards from normal to winter chest 2016-05-13 01:19:06 +02:00
xGamingDudex 9c2c415eb2 Fixed the emerald trail leaving from idle to moving 2016-05-13 01:14:00 +02:00
xGamingDudex 3bb3821fa9 WinEffect gadget disable and MineStrike name and data update 2016-05-13 01:04:35 +02:00
xGamingDudex 4958ab8149 Bug Fixes 
* Fixed Menu page adding glow to win effects if game modifiers were
active
* MineStrike skins were not properly applying material and data
* Skinned knife was not dealing damage
 2016-05-13 00:38:56 +02:00
xGamingDudex 06e583c05e Added flat podium to Firework and Punchman 2016-05-12 23:50:41 +02:00
xGamingDudex 956d64d750 Git Merge Import Fix 2016-05-12 23:46:39 +02:00
xGamingDudex 29d4db0bfd Merge branch 'project-cosmetics' of 
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
project-cosmetics

Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
 2016-05-12 23:46:17 +02:00
xGamingDudex 2db98613ab Cosmetic Update 
* Redid the Reward manager
	Added new rewards to the chest and changed some values
* Fixed some MineStrike skin bugs
* Removed particles/death effects from Minestrike
* Removed old test minestrike skins
* Moved minestrike skins to correct package
* Changed the illuminated chest animation a bit
* Fixed other minor bugs
 2016-05-12 23:42:37 +02:00
LCastr0 6f4c6bc545 Fixes counter on WindUp suit 
Removes kit modifier categories
 2016-05-12 15:00:43 -03:00
xGamingDudex 276f572009 Merge branch 'project-cosmetics' of 
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
project-cosmetics

Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathPinataBurst.java
 2016-05-10 20:21:37 +02:00
xGamingDudex 1b0b9a894b Tweaked some cosmetics 
* Changed Party Death to firework icon
* Removed idle spark from Emerald Trail
* Changed wing style to pixie from angle on infernal wings
* Added black dots to YinYang

Started some work on the RewardManager
 2016-05-10 20:20:44 +02:00
LCastr0 4fada6de49 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-05-10 12:45:22 -03:00
LCastr0 5b8ff933b1 Removed more unused imports 
Fixed some lores and names for cosmetics
Renamed some classes to match Set name
Commented out the Lovely set (Duplicate of Cupid's Love)
Fixed set descriptions
Added 'Comming soon...' to set bonuses
 2016-05-10 12:44:45 -03:00
Keir Nellyer 7c80c3826b Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-05-08 21:49:16 +01:00
Conrad ac86f3ac8c Merge pull request #55 from Mineplex-LLC/alex-mcl 
Change the visuals of the Billboards and of ELO's display in the stat…
 2016-05-08 13:29:23 -04:00
AlexTheCoder 34e8d65f4d Change the visuals of the Billboards and of ELO's display in the stats menu to be more user friendly 2016-05-07 21:16:12 -04:00
Keir Nellyer b68127b111 Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-05-08 00:37:59 +01:00
Keir Nellyer b1a41c3cb3 Make chat abuse colour easier on the eyes 
Dark blue [bold] is hard to read, dark aqua [bold] should be easier
to read.
 2016-05-07 22:48:49 +01:00
xGamingDudex 5649939f8c Removed some old disabled code. 2016-05-06 21:59:18 +02:00
xGamingDudex e04a897488 Added some pre-animation to chicken win effect. Removed some comments. 2016-05-06 21:58:31 +02:00
xGamingDudex 0fea90516b Alternative emerald trail for full set 2016-05-06 13:24:06 +02:00
xGamingDudex f58db6ee3b Removed firework from party death 
Replaced the death effect with item drops instead
 2016-05-06 13:12:28 +02:00
xGamingDudex d60fea4f76 Added chicken and guardian win room schematic handlers 2016-05-06 13:00:45 +02:00
LCastr0 97ef801e3d Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-05-06 00:40:55 -03:00
LCastr0 49c45628a2 Removed more unused imports 
Fixed some lores and names for cosmetics
Renamed some classes to match Set name
Commented out the Lovely set (Duplicate of Cupid's Love)
 2016-05-06 00:40:22 -03:00
Shaun Bennett 93c2886601 Add boosters to inventory menu 2016-05-06 13:31:59 +10:00
Conrad 55d40a1a6b Merge pull request #53 from Mineplex-LLC/feature/logitech-brand 
Changed design of billboard and fixed its centering in hubs
 2016-05-05 18:33:15 -04:00
AlexTheCoder f329051399 Changed design of billboard and fixed its centering in hubs 2016-05-05 18:25:51 -04:00
xGamingDudex 17a4517e71 Merge remote-tracking branch 'origin/develop' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
 2016-05-05 21:03:15 +02:00
xGamingDudex 1a96ea3c18 Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics 2016-05-05 20:29:28 +02:00
xGamingDudex db21c7dd22 EGit FTW! 
Git, you are the greates, randomly deciding not to include everything
when I spesify you to do so....

This should have been part of prev commit.
 2016-05-05 20:26:00 +02:00
xGamingDudex 9fca9283e2 Fixed skin layers for Player/Human disguises 2016-05-05 10:39:00 +02:00
Keir Nellyer e1f2bb9740 Use all-man style braces here to be compliant with the coding standards 
(cherry picked from commit e553ac5)
 2016-05-04 16:02:39 +01:00
Keir Nellyer a663cb3e01 Revert "Revert "Report system (version 1)"" 
This reverts commit d0d2de1e21.

# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2016-05-04 15:24:29 +01:00
Conrad 145ea9221a Merge pull request #40 from Mineplex-LLC/clans/beta 
Clans/beta
 2016-05-03 16:57:07 -04:00
LCastr0 cfc6f3703d Merge pull request #50 from Mineplex-LLC/develop 
Merge from develop
 2016-05-03 13:24:32 -03:00
Conrad 3c482e38cc Merge pull request #47 from Mineplex-LLC/feature/logitech-brand 
Convert over to System.out.println() for error messaging and add prot…
 2016-05-02 16:34:58 -04:00
Conrad 2cd76fbf72 Merge pull request #48 from Mineplex-LLC/alex-mcl 
Add catch for rare occurrence where players have no stored data
 2016-05-02 16:34:50 -04:00
AlexTheCoder ccd5b47d75 Convert over to System.out.println() for error messaging and add protection for billboards in Hub via a new manager 2016-05-02 16:20:41 -04:00
LCastr0 055b8684c2 - Added action bar message when booster is ready (Wind Up Suit) 
- Moved each suit to an individual package, to make it easier to work with
- Removed some unused imports
- Added util to get entity egg data
- Added kit modifiers: Beastmaster, Horseman and Necromancer (SG), Apple (Bridges)
- Added specific kit pages to game modifier menu
 2016-05-02 00:13:06 -03:00
AlexTheCoder 7e97bd346e Change an internal method to private and add missing class JavaDoc 2016-05-01 15:16:42 -04:00
AlexTheCoder 335c5a4510 Clean up billboard generation and clearing, rewrite MapRender for logos, and add JavaDocs to comply with code standard 2016-05-01 14:58:40 -04:00
AlexTheCoder 48c8a5a630 Force structure to spawn correctly, complete with maps on item frames 2016-05-01 01:56:07 -04:00
Ben 189f9ad524 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-05-01 01:42:32 +01:00
Ben 2337e89a93 Improvements to the Clans ban system in general as it was performing more operations than required, and accessing the database more than was necessary. Polished up the Clans ban GUI as well. 2016-05-01 01:42:11 +01:00
AlexTheCoder 070326e72d Create systems to automatically create and destroy branding boards, as well as implement the Logitech branding 2016-04-30 19:26:16 -04:00
AlexTheCoder 39c105f0cf Add catch for rare occurrence where players have no stored data 2016-04-30 15:34:04 -04:00
Conrad d0d2de1e21 Revert "Report system (version 1)" 2016-04-30 14:53:59 -04:00
Conrad e0e30a8b7f Merge pull request #43 from Mineplex-LLC/alex-mcl 
Fix Async Elo Ranked Bans
 2016-04-30 14:46:49 -04:00