7a2864a701
Merge branch 'develop' into feature/clans-season-3
2017-06-16 16:25:57 -04:00
d4f27ef768
Update xenforo forum id for mapper rank
2017-06-14 22:28:28 -05:00
29d5a80a67
Final changes
2017-06-15 01:33:20 +01:00
b6c5052db8
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-06-09 13:10:14 +01:00
ac52903b7d
QOL changes
2017-06-09 13:10:11 +01:00
68084c5cf0
Insert linebreaks in mapper + mapdev descriptions
2017-06-09 02:43:34 -05:00
e7174a0e4e
Add an item unbreakable checker to UtilItem
2017-06-08 20:19:12 -04:00
3c3cffb001
Add MAPPER rank and modify BUILDER description
2017-06-08 18:53:37 -05:00
e94201409b
Finalize raid system and implement Charles Witherton Raid
2017-06-01 02:16:12 -04:00
c78ee51307
Add method for testing 2d squared distance
2017-06-01 02:16:12 -04:00
c6bd00a811
Make UtilEnt#GetMetadata actually return the field assigned to that metadata key and add a method to remove metadata from an entity
2017-06-01 02:16:12 -04:00
03d9032f82
Add backend system for saving/loading clans mounts with varied stats and skins
2017-06-01 02:16:12 -04:00
70eec9e38c
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-05-31 13:17:41 +01:00
edfadde239
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-05-31 13:05:13 +01:00
cf8109b3bd
Add method for detecting bottom slabs to UtilBlock
2017-05-30 22:49:30 -05:00
2c6112347a
Add Bob Ross Morph
2017-05-30 22:49:30 -05:00
b9af3a8dfb
Sort CMA in the tab list next to Mod
2017-05-29 22:49:01 -05:00
e501982712
Update cma scoreboard id
2017-05-29 22:48:25 -05:00
2895397aec
Implement CMA rank
2017-05-29 22:48:25 -05:00
8e87b1d3e9
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-05-27 13:55:36 +01:00
4a7ca75b24
Open UFO event for the weekend
2017-05-26 18:08:24 -05:00
d70cd38049
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-05-26 18:34:23 +01:00
fd1cd148cb
Implement Alien Event service calls on Hub/Arcade
2017-05-24 20:52:24 -05:00
9df9fb80da
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion
2017-05-22 22:59:46 +01:00
4ed3135cdf
Implement improved targetting system
2017-05-22 20:53:22 +01:00
1db7454e81
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-05-20 17:45:19 +01:00
500367b473
Premtive hotfix
2017-05-17 20:15:11 -06:00
f23e778d92
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
2017-05-13 17:31:00 +01:00
d493a61d3d
Polish the hub event
2017-05-13 17:13:47 +01:00
ff07d38d00
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2017-05-12 23:04:47 +01:00
6ecbf85dc8
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion
2017-05-12 22:22:01 +01:00
abb983ac04
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion
2017-05-12 17:34:55 +01:00
c8a1035591
Comped accounts
2017-05-11 19:29:31 -07:00
92eaf4f8d8
Merge branch 'develop' into update/mayitems
2017-05-09 23:31:43 -03:00
5398bf5e81
More progress
2017-05-07 22:35:15 +01:00
a32ae91996
Gotta go fast!
2017-05-05 22:30:37 +01:00
f6cb654e12
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2017-05-04 20:20:59 +01:00
ee0971443e
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion
2017-05-04 17:32:16 +01:00
66136a035b
Change scoreboard tag for Event Moderator
...
This ensures that they're sorted next to Sr Mods in the tab list
2017-05-03 18:30:36 -07:00
bd52e63dc3
More alien stuff
2017-05-03 20:48:19 +01:00
4e56d2133b
Merge branch 'develop' into update/mayitems
2017-05-02 19:13:43 -03:00
0f1cea013c
Guardian changes
2017-05-01 14:05:18 +01:00
8ec6ebd060
Fix particles being sent to everyone
2017-04-30 18:42:16 -03:00
0b2d0d348c
Merge branch 'develop' into update/mayitems
2017-04-30 13:38:26 -03:00
3268a49f82
Fixed more conflicts
2017-04-30 12:05:30 -03:00
91fb50cc8b
Fixed conflicts
2017-04-30 12:05:04 -03:00
fdee6b1163
Add some more event commands, fix some existing event commands and change permissions for event related commands to be executeable by EVENT_MODERATOR
2017-04-30 01:38:04 -07:00
e45e3be4e8
Added first kit selector
2017-04-27 20:01:29 -03:00
95f50604c0
Fixed colors
2017-04-27 18:29:55 -03:00
246c0c1788
Added wools to the top of the castle
2017-04-27 16:28:09 -03:00
19138eb501
Added castle stuff for hub
2017-04-26 01:12:43 -03:00
12f7659195
Added king particle
2017-04-25 00:16:32 -03:00
fe1cda820f
Merge branch 'update/aprilchest' of github.com:Mineplex-LLC/Minecraft-PC into feature/eastereggs
2017-04-12 16:00:37 -04:00
1904990f84
Fixed merging issues
2017-04-11 23:16:42 -03:00
2d61dffaea
Implement an easter egg hunt of epic proportions
2017-04-11 19:57:10 -04:00
8e92317b9c
So that's why Tim closed inventories
2017-04-06 00:35:49 -05:00
db59c32b5e
PC-1028
2017-04-06 00:34:34 -05:00
f03df67219
PC-830
2017-04-06 00:34:34 -05:00
64d5fe3c80
Revert "Revert "Merge branch update/bridges into develop""
...
This reverts commit 0ad69ebefc
2017-04-06 00:33:41 -05:00
03d781ca70
It be April fools matey, walk yee plank
2017-04-01 02:11:11 -05:00
850b7b1aad
Merge remote-tracking branch 'update/aprilppc' into develop
2017-03-31 00:50:55 -05:00
e8d6c321cd
Merge branch 'develop' into update/aprilppc
2017-03-31 00:40:38 -03:00
99534e19c5
PC-599
2017-03-29 23:30:49 -05:00
235288af56
Changed wing shape again
2017-03-27 17:35:05 -03:00
1c1af8b81e
Changed shape of bee wings
2017-03-26 08:09:58 -03:00
9ee6960038
Added bee wings
2017-03-26 01:25:08 -03:00
bff837ca9b
Fixed morph and possible fix for balloons, added lore and icon for particle effect
2017-03-25 18:36:12 -03:00
d2851b0708
Merge branch 'develop' into update/aprilchest
2017-03-24 14:01:15 -03:00
0ad69ebefc
Revert "Merge branch update/bridges into develop"
...
This reverts commit 7e8f5b4939222e4267d2
2017-03-23 23:24:00 -05:00
3ebfb453c5
Implement rank and powerplay linking to the website and give specific ranks an id corresponding to their respective forum tag
2017-03-23 23:18:29 -05:00
75ad5b9d51
Flowers where player walks
2017-03-20 08:23:32 -03:00
2ca0d0ce14
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges
2017-03-18 23:36:11 +00:00
b1a1faacb1
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges
2017-03-17 17:03:55 +00:00
f6884fccd8
Change update protocol
2017-03-17 00:20:56 -05:00
b35a9582df
Optimise PlayParticle
2017-03-14 17:07:36 +00:00
c54cd066ef
Merge branch 'develop' into update/stpatrickscosmetics
2017-03-12 20:54:48 -03:00
4be4fcb434
Fix Team Armor Addon (also PC-201)
2017-03-09 01:06:53 -06:00
ec5de0ef12
Merging issues
2017-03-06 17:10:29 -03:00
4a496ea4c1
Added particle for when opening the chests
2017-03-03 22:34:21 -03:00
9669e960a7
Autorotate maps
2017-03-01 23:58:20 -06:00
60d9bd5d21
Move api to config file
2017-02-24 00:46:04 -06:00
e731a91e40
Leprechaun pet
2017-02-23 17:35:50 -03:00
2657a98e70
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-02-17 18:16:36 +00:00
d56cd59df0
Quests and a whole host of wacky changes
2017-02-17 18:16:17 +00:00
ecb42d91fe
Fix bugs
2017-02-16 02:04:34 -06:00
cd387284bf
Ignore armorstands for fleshhook/snowball
2017-02-16 02:03:25 -06:00
16ba7b984b
Use proper GameProfile serializer
2017-02-16 02:03:25 -06:00
3a4e973551
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-02-12 13:12:53 +00:00
1780923501
Fix Frost Barrier not activating
...
Negative yaw values are considered valid in minecraft.
UtilShapes doesn't correctly handle negative yaw values
(throws an ArrayIndexOutOfBoundsException) so whenever
a player is facing east they're unable to activate Frost
Barrier.
This commit fixes the issue by allowing UtilShapes to take
negative values.
2017-02-08 22:32:57 -06:00
b5130181a2
Merging errors
2017-02-01 11:25:47 -02:00
0ce741a5fb
Small wings for cupid pet
2017-01-28 21:38:14 -02:00
2cfd51e38e
Heart shaped wings
2017-01-27 17:40:35 -02:00
e2de60971e
Fixed uneven butterfly wing
2017-01-27 10:29:18 -02:00
7200572583
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-26 20:10:48 +00:00
dd9f6e938d
Added small butterfly wings
2017-01-26 09:56:21 -02:00
741d0914ba
Change premium rank hover descriptions
2017-01-25 21:12:30 -06:00
b2d17f2680
Merge branch 'update/true-love-pet' into develop
2017-01-25 21:11:56 -06:00
8a9a3cb2ac
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-19 21:16:12 +00:00
36c0c56f27
World Events and Sheets rewrite
2017-01-19 21:15:06 +00:00
fd65f2df1b
Tab completion for /game set
2017-01-18 23:34:57 -06:00
912bad5035
Used wrong method name
2017-01-18 21:20:32 -02:00
1a580251e9
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-17 09:51:17 +00:00
9e4f756fe8
Even better way of making pet circle around you
2017-01-15 02:46:44 -02:00
28442abbbd
Now using the correct naming...
2017-01-14 23:09:46 -02:00
03c2ec56b7
Added love wings
2017-01-14 22:21:38 -02:00
d667524ed9
Love Doctor Morph
2017-01-14 20:50:44 -02:00
251eb2e53e
Let's be legal
2017-01-12 23:22:40 -06:00
8d47e80066
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-12 18:03:07 +00:00
132036bd17
Move Constants to common
2017-01-11 20:42:46 -06:00
e72d1e51a2
Ignore bypass for testing sever motd
2017-01-11 20:29:37 -06:00
19ac8f0c3b
Create framework for proper test network
2017-01-11 20:29:36 -06:00
cea08cae67
Merge branch 'update/cosmetics-balloons' into develop
2017-01-11 15:32:41 -06:00
99211d5d89
Fix particles
2017-01-11 15:11:57 -06:00
0218965bee
Villager trading and loot upgrades
2017-01-08 15:44:04 +00:00
6478656501
Fixed armorstand balloon types
2016-12-29 16:25:20 -02:00
e114ab03b5
Chest spawning
2016-12-27 17:20:53 +00:00
d19d661c7d
Modified pets so they don't make different sounds anymore :toot:
2016-12-26 19:02:35 -02:00
6712ad427b
Added bat so players can use items in hand with the leash
...
Changed silence method so it works :toot:
2016-12-26 19:00:11 -02:00
a4a039b619
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2016-12-25 22:09:03 +00:00
94d8e5d2f4
Update Formatter to support specifically colored commands
2016-12-21 19:30:54 -07:00
ac224e3f68
Initial communities code
2016-12-21 19:30:25 -07:00
7f3bb9671a
Change thresholds, add notifs, move stuff around
2016-12-20 15:05:52 -05:00
383c4d3670
More
2016-12-20 15:05:26 -05:00
77f1f18f27
More metadata
2016-12-20 15:05:01 -05:00
9409cbc42c
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2016-12-19 00:32:53 +00:00
58761a0478
1.8 blocker
2016-12-15 20:48:40 -07:00
fd00644eb8
Finalize Titles
2016-12-14 19:56:27 -07:00
d291521ad1
Clean up DonationManager
2016-12-14 19:52:13 -07:00
f2fc70f400
Titles
2016-12-14 19:52:13 -07:00
d0f3aff051
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2016-12-10 11:21:20 +00:00
b7e738b4e8
Revert commits from #302
...
This reverts commits from the range 062fdd3^..a0beeab
Changes from #302 are on hold until a later date.
2016-12-08 20:41:46 -07:00
58613fa77f
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2016-12-08 19:42:55 +00:00
b6173c4990
Google Sheets implementation
2016-12-08 19:25:48 +00:00
a0beeab5ec
Fix Frost Barrier not activating
...
Negative yaw values are considered valid in minecraft.
UtilShapes doesn't correctly handle negative yaw values
(throws an ArrayIndexOutOfBoundsException) so whenever
a player is facing east they're unable to activate Frost
Barrier.
This commit fixes the issue by allowing UtilShapes to take
negative values.
2016-12-07 13:20:04 -06:00
20697982e7
Create Rank ScoreboardTag to fix Name collision
2016-12-07 13:05:54 -06:00
97ce2d0ae6
Gingerbread Cosmetics
...
Adds the following:
- Gingerbread Chests
- Holiday Tree particle
- Freeze Suit
- Winter Warfare win effect
- Present Danger Win Effect
- Gingerbread Man pet
2016-12-01 23:39:33 -06:00
fa0e42a918
Revert "Anticheat Logging #299 "
...
This reverts commit cae9d2f67e
2016-12-01 01:59:50 -06:00
cae9d2f67e
Anticheat Logging #299
...
Remove MAC
Add AntiHack Logging
Change thresholds, add notifs, move stuff around
Add warning if check does not exist
Handle multiple bans when ranked TWITCH+
Prevent punishment abuse
2016-12-01 01:24:05 -06:00
f6bf316afb
Update rank colors
2016-11-24 04:58:03 -05:00
15f3b19f8a
Merge remote-tracking branch 'origin/update/uhc-moppletop' into update/uhc-moppletop
...
* origin/update/uhc-moppletop:
Retry CTF proxy fix
Eternal Giveaway Fixes
Eternal giveaway refactoring
Revert: Disable Fated giveaway tools for now
Eternal Rank
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
2016-11-23 18:11:26 -05:00
bfa27f2bc4
Update Enderchest endpoint location
2016-11-23 18:10:59 -05:00
e892476ca0
Setup enderchest API
2016-11-22 08:17:24 -05:00
325c0ab56c
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop
2016-11-21 19:13:34 +00:00
712019b45b
Eternal Rank
2016-11-17 21:05:10 -05:00
53b67214fb
More bugs
2016-11-17 21:20:00 +00:00
142cf4dd93
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop
2016-11-17 19:41:47 +00:00
b862a30c76
Thanksgiving Cosmetics ( #278 )
...
* Added chickens to Holiday Manager (Thanksgiving)
Added TextEffect
Moved all the effects to a different package to make it easier to find
Added method in Effect to get the Effect Location
* Removed(?) wildcard import
* Testing New year thing
Added some symbols to UtilBlockText
* Allow multiple pets with the same EntityType
* Added Stray Morph
Added Shulker Pet
Added code for a possible new year effect
Added Metal Man Morph to the menus
Added Metal Man Morph as an yearly bonus for PPC subscriptions
* Added chickens to Holiday Manager (Thanksgiving)
Added TextEffect
Moved all the effects to a different package to make it easier to find
Added method in Effect to get the Effect Location
* Removed(?) wildcard import
* Testing New year thing
Added some symbols to UtilBlockText
* Allow multiple pets with the same EntityType
* Added Stray Morph
Added Shulker Pet
Added code for a possible new year effect
Added Metal Man Morph to the menus
Added Metal Man Morph as an yearly bonus for PPC subscriptions
* I seriously don't remember what is in this commit, I'm just doing it to
fix the thing with develop...
* Fixed Pet menu
Fixed morph menu
Changed from List to Set
* Changed from PurchasUnknownSalesPackage to AddUnknownSalesPackageOwned
* Added Santa Morph
Removed Sleigh Morph
Changed all the cosmetics GUIs to start on the second row, instead of the first
* Changed some stuff from Holiday Manager so now chickens will walk around when spawned
* Added sound effects to Metal Man
Added slowness to Metal Man
* Added new lore for the Metal Man Morph description
Added Stray Morph Ability
Fixed some problems with the Thanksgiving Chickens
* Added Fated giveaway manager and animation
Moved titan and fated giveaway managers to a new package
* Fixed lores for Stray morph and Shulker pet
Changed ability of Stray morph
* Removed Stray and Shulker pet from the menu
Deleted Pet class since it was not being used
Changed position of achievement on the menu
Changed color of chicken's name
Changed colors of Power Play message
Stray morph, Santa morph and Shulker pet are hidden from the menus for now
Removed feathers dropping from chickens, changed them to snow particles
* Added hover ability to Metal Man Morph
* Fixed some stuff on Metal Man
2016-11-17 02:06:00 -05:00
1535fcc38b
Fix temp blocks in unloaded claims not restoring, fix ClassCombatCreatureSpawnEvent having a null world name, fix block toss fallingblocks solidifying in unloaded chunks, make safelog in clans disable when server shuts down, and make UtilBlock recognize 1.8 fence gates as usable blocks
2016-11-16 22:37:25 -05:00
07cd716cf7
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop
2016-11-13 10:37:21 +00:00
6a9648e646
Solo Mode and Faster UHC
2016-11-05 11:06:12 +00:00
Alexander Meech
Sam
cnr
AlexTheCoder
Graphica
samczsun
LCastr0
Sarah
Nate Mortensen
Shaun Bennett