AlexTheCoder
|
eecf960613
|
Fixed Merge Conflicts
|
2017-09-23 03:40:21 -04:00 |
|
Sam
|
2b4e9e62e1
|
The mess that is now this
|
2017-09-16 23:33:42 +01:00 |
|
Sam
|
0458f18843
|
More hub stuff
|
2017-09-12 21:33:19 +01:00 |
|
Sam
|
c729857a00
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover
|
2017-09-09 09:19:46 +01:00 |
|
Sam
|
c0cda476e4
|
Complete chest
|
2017-09-09 02:29:19 +01:00 |
|
Sam
|
8724a35269
|
Tron Hub Game
|
2017-09-06 11:22:49 +01:00 |
|
Sam
|
cd99700eda
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics
|
2017-09-01 16:12:51 +01:00 |
|
cnr
|
d4e6860fb0
|
Accommodate relocatin of guava in spigot
|
2017-09-01 00:10:51 -05:00 |
|
Sam
|
fd090a5644
|
Fix a lot of bugs
|
2017-08-20 23:04:28 +01:00 |
|
Sam
|
456f959a8d
|
Implement Emblems
|
2017-08-13 15:25:41 +01:00 |
|
Sam
|
bf940177f9
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics
|
2017-08-01 13:07:01 +01:00 |
|
Graphica
|
ab91e3cfd6
|
Add fruit skin data
|
2017-07-31 22:37:49 -04:00 |
|
Graphica
|
c2ab6f9dd4
|
Allow flags to handle article formatting
|
2017-07-31 22:37:49 -04:00 |
|
Graphica
|
d24b8a229c
|
Alphabetize CountryFlag data
|
2017-07-31 22:37:49 -04:00 |
|
Graphica
|
200578df88
|
Add new flags to CountryFlag enum
|
2017-07-31 22:37:48 -04:00 |
|
Sam
|
3f739a5f22
|
Finish off morphs
|
2017-07-29 22:25:33 +01:00 |
|
AlexTheCoder
|
66e5339eab
|
Make UtilEnt#GetMetadata infer needed type
|
2017-07-26 23:34:00 -04:00 |
|
Sam
|
099d2cb132
|
Cleanup HubVisibilityManager while slowing down the rate at which players are shown other players
|
2017-07-26 20:26:46 -04:00 |
|
cnr
|
5ba1630fae
|
Merge branch 'update/july-cosmetics' into develop
|
2017-06-30 22:15:31 -07:00 |
|
Graphica
|
55a1afbb71
|
Expose banner data in CountryFlag
|
2017-07-01 01:05:44 -04:00 |
|
Graphica
|
b01cb0c2e9
|
Add Revolutionary SkinData
|
2017-07-01 01:05:05 -04:00 |
|
cnr
|
dfe2a61b8f
|
Revert freedom chest cosmetics
|
2017-06-28 23:43:30 -07:00 |
|
cnr
|
ed67a44fef
|
Merge branch 'feature/moba' into develop
|
2017-06-28 20:39:27 -07:00 |
|
Graphica
|
e04d467830
|
Add new cosmetic items
|
2017-06-28 20:38:58 -07:00 |
|
Graphica
|
c15e8f8f90
|
Allow UtilParticle to accept java awt colors
|
2017-06-28 20:38:58 -07:00 |
|
Graphica
|
39f11da634
|
Create flag gadget type
|
2017-06-28 20:38:58 -07:00 |
|
Graphica
|
93015151db
|
Add Hat skin data
|
2017-06-28 20:38:58 -07:00 |
|
Sam
|
85007820d2
|
Add a go-back button to kit selection
|
2017-06-28 23:38:50 +01:00 |
|
Graphica
|
3d430dedf6
|
Add new cosmetic items
|
2017-06-28 01:35:57 -04:00 |
|
Graphica
|
c1765aaf20
|
Allow UtilParticle to accept java awt colors
|
2017-06-28 01:30:56 -04:00 |
|
Graphica
|
b7a094f472
|
Create flag gadget type
|
2017-06-28 01:30:29 -04:00 |
|
Graphica
|
845e96109b
|
Add Hat skin data
|
2017-06-28 01:29:02 -04:00 |
|
Sam
|
b9a72312a8
|
Add a go back button on kit selection
|
2017-06-28 00:21:47 +01:00 |
|
md_5
|
a6493ed18a
|
Update MapParser to 1.12, refactor out some common base utilities.
|
2017-06-22 23:25:20 -05:00 |
|
cnr
|
31605b02b0
|
Use polygon geometry for MOBA Boss AI boundaries
|
2017-06-19 18:38:31 -05:00 |
|
Alexander Meech
|
7a2864a701
|
Merge branch 'develop' into feature/clans-season-3
|
2017-06-16 16:25:57 -04:00 |
|
Alexander Meech
|
d4f27ef768
|
Update xenforo forum id for mapper rank
|
2017-06-14 22:28:28 -05:00 |
|
Sam
|
29d5a80a67
|
Final changes
|
2017-06-15 01:33:20 +01:00 |
|
Sam
|
b6c5052db8
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
|
2017-06-09 13:10:14 +01:00 |
|
Sam
|
ac52903b7d
|
QOL changes
|
2017-06-09 13:10:11 +01:00 |
|
cnr
|
68084c5cf0
|
Insert linebreaks in mapper + mapdev descriptions
|
2017-06-09 02:43:34 -05:00 |
|
AlexTheCoder
|
e7174a0e4e
|
Add an item unbreakable checker to UtilItem
|
2017-06-08 20:19:12 -04:00 |
|
cnr
|
3c3cffb001
|
Add MAPPER rank and modify BUILDER description
|
2017-06-08 18:53:37 -05:00 |
|
AlexTheCoder
|
e94201409b
|
Finalize raid system and implement Charles Witherton Raid
|
2017-06-01 02:16:12 -04:00 |
|
AlexTheCoder
|
c78ee51307
|
Add method for testing 2d squared distance
|
2017-06-01 02:16:12 -04:00 |
|
AlexTheCoder
|
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 |
|
AlexTheCoder
|
03d9032f82
|
Add backend system for saving/loading clans mounts with varied stats and skins
|
2017-06-01 02:16:12 -04:00 |
|
Sam
|
70eec9e38c
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
|
2017-05-31 13:17:41 +01:00 |
|
Sam
|
edfadde239
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
|
2017-05-31 13:05:13 +01:00 |
|
Graphica
|
cf8109b3bd
|
Add method for detecting bottom slabs to UtilBlock
|
2017-05-30 22:49:30 -05:00 |
|
Graphica
|
2c6112347a
|
Add Bob Ross Morph
|
2017-05-30 22:49:30 -05:00 |
|
cnr
|
b9af3a8dfb
|
Sort CMA in the tab list next to Mod
|
2017-05-29 22:49:01 -05:00 |
|
Alexander Meech
|
e501982712
|
Update cma scoreboard id
|
2017-05-29 22:48:25 -05:00 |
|
Alexander Meech
|
2895397aec
|
Implement CMA rank
|
2017-05-29 22:48:25 -05:00 |
|
Sam
|
8e87b1d3e9
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
|
2017-05-27 13:55:36 +01:00 |
|
cnr
|
4a7ca75b24
|
Open UFO event for the weekend
|
2017-05-26 18:08:24 -05:00 |
|
Sam
|
d70cd38049
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
|
2017-05-26 18:34:23 +01:00 |
|
cnr
|
fd1cd148cb
|
Implement Alien Event service calls on Hub/Arcade
|
2017-05-24 20:52:24 -05:00 |
|
Sam
|
9df9fb80da
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion
|
2017-05-22 22:59:46 +01:00 |
|
Sam
|
4ed3135cdf
|
Implement improved targetting system
|
2017-05-22 20:53:22 +01:00 |
|
Sam
|
1db7454e81
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
|
2017-05-20 17:45:19 +01:00 |
|
Sam
|
500367b473
|
Premtive hotfix
|
2017-05-17 20:15:11 -06:00 |
|
Sam
|
f23e778d92
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba
|
2017-05-13 17:31:00 +01:00 |
|
Sam
|
d493a61d3d
|
Polish the hub event
|
2017-05-13 17:13:47 +01:00 |
|
Sam
|
ff07d38d00
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
|
2017-05-12 23:04:47 +01:00 |
|
Sam
|
6ecbf85dc8
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion
|
2017-05-12 22:22:01 +01:00 |
|
Sam
|
abb983ac04
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion
|
2017-05-12 17:34:55 +01:00 |
|
samczsun
|
c8a1035591
|
Comped accounts
|
2017-05-11 19:29:31 -07:00 |
|
LCastr0
|
92eaf4f8d8
|
Merge branch 'develop' into update/mayitems
|
2017-05-09 23:31:43 -03:00 |
|
Sam
|
5398bf5e81
|
More progress
|
2017-05-07 22:35:15 +01:00 |
|
Sam
|
a32ae91996
|
Gotta go fast!
|
2017-05-05 22:30:37 +01:00 |
|
Sam
|
f6cb654e12
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
|
2017-05-04 20:20:59 +01:00 |
|
Sam
|
ee0971443e
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion
|
2017-05-04 17:32:16 +01:00 |
|
cnr
|
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 |
|
Sam
|
bd52e63dc3
|
More alien stuff
|
2017-05-03 20:48:19 +01:00 |
|
LCastr0
|
4e56d2133b
|
Merge branch 'develop' into update/mayitems
|
2017-05-02 19:13:43 -03:00 |
|
Sam
|
0f1cea013c
|
Guardian changes
|
2017-05-01 14:05:18 +01:00 |
|
LCastr0
|
8ec6ebd060
|
Fix particles being sent to everyone
|
2017-04-30 18:42:16 -03:00 |
|
LCastr0
|
0b2d0d348c
|
Merge branch 'develop' into update/mayitems
|
2017-04-30 13:38:26 -03:00 |
|
LCastr0
|
3268a49f82
|
Fixed more conflicts
|
2017-04-30 12:05:30 -03:00 |
|
LCastr0
|
91fb50cc8b
|
Fixed conflicts
|
2017-04-30 12:05:04 -03:00 |
|
Sarah
|
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 |
|
LCastr0
|
e45e3be4e8
|
Added first kit selector
|
2017-04-27 20:01:29 -03:00 |
|
LCastr0
|
95f50604c0
|
Fixed colors
|
2017-04-27 18:29:55 -03:00 |
|
LCastr0
|
246c0c1788
|
Added wools to the top of the castle
|
2017-04-27 16:28:09 -03:00 |
|
LCastr0
|
19138eb501
|
Added castle stuff for hub
|
2017-04-26 01:12:43 -03:00 |
|
LCastr0
|
12f7659195
|
Added king particle
|
2017-04-25 00:16:32 -03:00 |
|
AlexTheCoder
|
fe1cda820f
|
Merge branch 'update/aprilchest' of github.com:Mineplex-LLC/Minecraft-PC into feature/eastereggs
|
2017-04-12 16:00:37 -04:00 |
|
LCastr0
|
1904990f84
|
Fixed merging issues
|
2017-04-11 23:16:42 -03:00 |
|
AlexTheCoder
|
2d61dffaea
|
Implement an easter egg hunt of epic proportions
|
2017-04-11 19:57:10 -04:00 |
|
samczsun
|
8e92317b9c
|
So that's why Tim closed inventories
|
2017-04-06 00:35:49 -05:00 |
|
samczsun
|
db59c32b5e
|
PC-1028
|
2017-04-06 00:34:34 -05:00 |
|
samczsun
|
f03df67219
|
PC-830
|
2017-04-06 00:34:34 -05:00 |
|
cnr
|
64d5fe3c80
|
Revert "Revert "Merge branch update/bridges into develop""
This reverts commit 0ad69ebefc.
|
2017-04-06 00:33:41 -05:00 |
|
Sam
|
03d781ca70
|
It be April fools matey, walk yee plank
|
2017-04-01 02:11:11 -05:00 |
|
cnr
|
850b7b1aad
|
Merge remote-tracking branch 'update/aprilppc' into develop
|
2017-03-31 00:50:55 -05:00 |
|
LCastr0
|
e8d6c321cd
|
Merge branch 'develop' into update/aprilppc
|
2017-03-31 00:40:38 -03:00 |
|
samczsun
|
99534e19c5
|
PC-599
|
2017-03-29 23:30:49 -05:00 |
|
LCastr0
|
235288af56
|
Changed wing shape again
|
2017-03-27 17:35:05 -03:00 |
|
LCastr0
|
1c1af8b81e
|
Changed shape of bee wings
|
2017-03-26 08:09:58 -03:00 |
|