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

7622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Conrad
8eba2c9ccb Merge pull request #59 from Mineplex-LLC/feature/logitech-brand 
Move billboard up 1
 2016-05-09 11:55:22 -04:00
Conrad
5ecf197f20 Merge pull request #58 from Mineplex-LLC/update/emergency-disable-report 
Disable report system as it is not ready to go live
 2016-05-09 11:35:30 -04:00
AlexTheCoder
7932258579 Move billboard up 1 2016-05-09 03:44:16 -04:00
AlexTheCoder
de1fabf53d Disable report system as it is not ready to go live 2016-05-09 02:10:51 -04:00
Conrad
39c3833b47 Merge pull request #57 from Mineplex-LLC/clans/beta 
Latest clans/beta changes
 2016-05-08 18:08:50 -04:00
cnr
4aa44cd796 Merge branch 'develop' into clans/beta 2016-05-08 16:53:48 -05:00
Conrad
a1780eff74 Merge pull request #56 from Mineplex-LLC/feature/report 
Implement Reporting system (version 1)
 2016-05-08 17:49:11 -04: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
cnr
b47c49d93b Temporarily disable clans ban functionality 
This can be reverted when clans bans are properly audited/fixed/tested.
 2016-05-07 19:02:19 -05: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
phobia
38f22b1577 Disable obsidian dropping after breaking THE BLOCK 2016-05-07 19:51:19 +10: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
Conrad
c0c5b3e284 Merge pull request #54 from Mineplex-LLC/update/rank-colors 
Change LT, Owner, Developer, Admin to DARK_RED
 2016-05-06 09:48:31 -04: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
Shaun Bennett
60dce9ef1b Change LT, Owner, Developer, Admin to DARK_RED 2016-05-06 13:43:30 +10: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
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
875fb4eccd The big bug fix batch 
+ Added some text utils
+ Added angel wing shape

* Tweaked the wing particle effects.
* Fixed item tool not despawning items in arcade servers
* Removed strange gadget disable
* Updated some death/win effects and particles
* Added Illuminated chest
* Added MS skin name to death message
 2016-05-05 20:07:29 +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
Keir Nellyer
b68aea00c6 Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
 2016-05-04 15:10:43 +01:00
Conrad
d7d00e1614 Merge pull request #52 from Mineplex-LLC/alex-mcl 
Add a method for simply checking if a player has been participating i…
 2016-05-04 09:30:00 -04:00
AlexTheCoder
0e509898ec Add a method for simply checking if a player has been participating in the current game, and implement it in the ranked bans system 2016-05-03 21:07:50 -04: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
cnr
57fca2a8d0 Temporarily(?) mitigate spigot CME 
During a PlayerVelocityEvent in an unloaded chunk (usually as result of
a teleport), if one calls Location#getChunk() on the player's location,
and the chunk contains persistent entities, the server crashes with a
ConcurrentModificationException.
 2016-05-03 04:56:31 -05: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
3d98c08a67 Add in missing file 2016-05-02 16:33:11 -04:00
AlexTheCoder
cdef447b7f Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/logitech-brand 2016-05-02 16:28:26 -04:00