samczsun
4778d28be4
Allow overriding enabled team armor
2017-03-15 23:13:42 -05:00
Sarah
4f9cf987bd
Change block rates and add Rate command
2017-03-15 21:30:48 +01:00
Sarah
1a061f6e2f
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/addons/compass/CompassAddon.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Island.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Skyfall.java
Rot starts at 2 minutes, Rings take 3 Minutes to rot, Top Island rots now, rings rot now
2017-03-15 17:38:07 +01:00
Sam
eb23d793e3
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-03-14 21:06:16 +00:00
Sam
15d691370d
Configuration for bridges
2017-03-14 21:05:52 +00:00
Sam
b35a9582df
Optimise PlayParticle
2017-03-14 17:07:36 +00:00
LCastr0
a3861d43c4
Fixes costume throwing items without complete set
2017-03-14 13:32:49 -03:00
Sam
dae2eea01a
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges
2017-03-14 16:08:57 +00:00
Sam
c8a9cffcdf
Edit the documentation for per player world borders
2017-03-14 16:08:31 +00:00
Sam
a49b19ee0c
Removal of kit progression from bridges
2017-03-14 16:08:16 +00:00
Sam
1e43398875
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges
2017-03-14 15:53:27 +00:00
cnr
96a471fa4e
Disable mounts
2017-03-14 01:30:06 -05:00
cnr
eeee0bb893
Temporarily disable Gem Hunters tutorial
2017-03-14 01:26:39 -05:00
cnr
78a8e53d2e
Re-enable 2FA for Gem Hunters
2017-03-14 00:41:11 -05:00
LCastr0
2b988a02d8
Fixed horse
2017-03-13 19:39:14 -03:00
Sam
654dddbf1b
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-03-13 22:02:07 +00:00
Sam
a231c0b031
Wooo finally!
2017-03-13 22:01:06 +00:00
LCastr0
c54cd066ef
Merge branch 'develop' into update/stpatrickscosmetics
2017-03-12 20:54:48 -03:00
LCastr0
401738f19a
Removed horse cooldown
2017-03-12 20:53:43 -03:00
Sam
7ab201f206
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-03-10 18:10:12 +00:00
cnr
3dc36449b5
Add 2x XP and open Gem Hunters beta
...
This is for spring break, and ends 3/19
2017-03-10 00:29:11 -06:00
Sam
97cb5fe3ce
Enable moderation module
2017-03-09 14:01:56 +00:00
Sam
105ab35bb6
Reset exp on death
2017-03-09 14:00:54 +00:00
AlexTheCoder
7ed485c7ca
Lets turn up the heat on this chess match...
2017-03-09 01:07:30 -06:00
AlexTheCoder
9fdcce525b
Make extreme prejudice a bit more sneaky
2017-03-09 01:07:30 -06:00
AlexTheCoder
b78ce421b5
Notify via redis when an extreme prejudice ban occurs
2017-03-09 01:07:30 -06:00
AlexTheCoder
1148283dff
Implement targeted GWEN-based discrimination against certain ip addresses
2017-03-09 01:07:30 -06:00
samczsun
888761d15e
Somehow missed Team Super Smash
2017-03-09 01:06:53 -06:00
samczsun
b5f026d4c0
Removem misleading comment
2017-03-09 01:06:53 -06:00
samczsun
a99cb6579d
PC-814
2017-03-09 01:06:53 -06:00
samczsun
4be4fcb434
Fix Team Armor Addon (also PC-201)
2017-03-09 01:06:53 -06:00
AlexTheCoder
a069d7ab59
Remove unnecessary INNER JOIN in sql to load a home server id
2017-03-09 01:04:50 -06:00
AlexTheCoder
721dd5a29a
Update SQL to follow table name standards, color channel names in Carl GUI, and fix item positions in GUI
2017-03-09 01:04:50 -06:00
AlexTheCoder
f2394da7dc
Give RewardManager access to StatsManager
2017-03-09 01:04:50 -06:00
AlexTheCoder
a691d58840
Set up clans specific rewards for voting, daily bonus, and youtube clicks. Additionally, set up promotion for specific youtube channels in Carl. Finally, provide support for a differently-named creeper!
2017-03-09 01:04:50 -06:00
AlexTheCoder
7e70d02751
Properly award all values in BonusAmount wherever it is used for rewarding
2017-03-09 01:04:50 -06:00
AlexTheCoder
a4c875b4bd
Refactor Clans gold to be set from Core
2017-03-09 01:04:50 -06:00
AlexTheCoder
9591485bb6
Re-implement voting with Gem rewards and start refactoring Carl gold rewards
2017-03-09 01:04:50 -06:00
Sam
b0b437ab4e
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-03-08 18:24:37 +00:00
Sam
a9b53c8608
Gem Hunters Phase 2
2017-03-08 12:51:16 +00:00
LCastr0
3469b890d4
Rainbow taunt now uses sides of player as locations
2017-03-07 21:51:06 -03:00
LCastr0
1ffac1dd31
Drop nuggets when removing chests
2017-03-06 18:09:42 -03:00
LCastr0
63b4dd1053
Support server stuff
2017-03-06 17:33:36 -03:00
LCastr0
ec5de0ef12
Merging issues
2017-03-06 17:10:29 -03:00
LCastr0
3cc304d99c
Used correct item for the mount
2017-03-04 23:52:12 -03:00
LCastr0
3d76f04508
Fixed rainbow taunt lagging players
2017-03-04 16:08:55 -03:00
LCastr0
f9b66e28f4
Fixed taunts not being disabled correctly
2017-03-04 14:07:24 -03:00
LCastr0
85b5eee92f
Fixed the rainbow taunt
2017-03-04 00:40:53 -03:00
LCastr0
d6605e973d
Changed chest animation
2017-03-03 23:38:32 -03:00
LCastr0
4a496ea4c1
Added particle for when opening the chests
2017-03-03 22:34:21 -03:00
