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

8327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ca556f7846 Fixed win room would not sort player properly for solo games 2016-05-15 23:29:58 +02:00
xGamingDudex
7073ba4e6a Fixed gadgets in the win room 2016-05-15 23:29:24 +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
14f7e64a77 Fixed Animator and removed duplicate test call in Game.java 2016-05-15 21:05:37 +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
29a0ba565b Added better hollow calculations to ShapeBox and UtilBlock 2016-05-15 17:05:11 +02:00
xGamingDudex
296f304d29 Changed the way UtilItem.dropItem handles despawning 2016-05-15 17:04:50 +02:00
xGamingDudex
a8db293bcf Moved JavaDocs from ICosmeticShape (now removed) to CosmeticShape 2016-05-15 17:04:25 +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
aa36097729 Made Animator abstract and added final modifiers 2016-05-15 15:58:05 +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
xXVevzZXx
44e52f4b5b Add javadoc to added files 2016-05-15 10:24:29 +02:00
phobia
a67fec95fc Remove ultra tag 2016-05-15 03:21:58 -05:00
xXVevzZXx
a1a6abc1ca Add champions gladiators and fix tiny winners typo 2016-05-15 10:13:06 +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
0544e86cb1 Started fixing the stat tracking for MS knife 2016-05-13 02:39:43 +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
AlexTheCoder
fab24e2139 Allow admins to be opped on testing servers 2016-05-12 17:24:37 -04:00
LCastr0
6f4c6bc545 Fixes counter on WindUp suit 
Removes kit modifier categories
 2016-05-12 15:00:43 -03:00
Sam Sun
2ae072f5b7 Rename modules to correct name 2016-05-12 11:44:35 -04:00
Alex-The-Coder
05312a9bef Update where players spawn upon first join... 
...to avoid flight kick upon login
 2016-05-11 21:57:42 -04:00