cnr
|
9cd5b73432
|
Merge branch 'update/basketball-game' into develop
|
2016-08-31 23:19:51 -05:00 |
|
cnr
|
55086efd91
|
Merge branch 'feature/shadowmute' into develop
|
2016-08-31 23:16:57 -05:00 |
|
LCastr0
|
8e8719070c
|
Changes Omega Chest to not be craftable
Changes LockCosmetic and PowerPlay commands to be JNR_DEV+
|
2016-08-31 23:26:41 -03:00 |
|
Sam
|
57292414c6
|
Gems for winners
|
2016-08-31 22:55:13 +01:00 |
|
Keir Nellyer
|
725892e93b
|
PC-957 Show warning message when a user's report is marked as abusive
|
2016-08-31 16:38:35 +01:00 |
|
Keir Nellyer
|
8f28ab3f0d
|
PC-949 /reportclose argument "<conclusion>" should be "<reason>"
|
2016-08-31 16:30:55 +01:00 |
|
Sam
|
0b7fdc01eb
|
Initial balence change
|
2016-08-31 16:30:50 +01:00 |
|
Keir Nellyer
|
97e06053d1
|
PC-948 Don't send handler to server if they are already connected to it
|
2016-08-31 16:25:14 +01:00 |
|
Keir Nellyer
|
04432d44d7
|
This can be an in-line return
|
2016-08-31 15:04:15 +01:00 |
|
Sam
|
6a139d5c55
|
Tiny code improvement
|
2016-08-31 13:28:48 +01:00 |
|
Sam
|
7599630328
|
Pyromancer Ultimate name change
|
2016-08-31 13:27:07 +01:00 |
|
Sam
|
8d222aafec
|
Fix increasing loop in Overtime
|
2016-08-31 13:26:54 +01:00 |
|
Sam
|
1bfebf358f
|
Add Overtime
|
2016-08-31 12:07:50 +01:00 |
|
Sam
|
47df09b770
|
Handle null sound
|
2016-08-31 12:07:35 +01:00 |
|
Sam
|
b1faecea49
|
Kit Fire incorrect values
|
2016-08-31 12:07:25 +01:00 |
|
Keir Nellyer
|
41bae9d5f8
|
Add bottom margin so that big chat logs do not collide with footer
|
2016-08-31 10:45:38 +01:00 |
|
Keir Nellyer
|
a7d224b7e4
|
Fix reports duplicating themselves and causing massive issues
|
2016-08-30 23:18:12 +01:00 |
|
Keir Nellyer
|
96b74444e5
|
Fix duplicate message entries
|
2016-08-30 22:54:58 +01:00 |
|
AlexTheCoder
|
8397f53d39
|
Remove unneeded teleportation in clans hubs
|
2016-08-30 03:27:11 -04:00 |
|
AlexTheCoder
|
ba02dea404
|
Fix me being dumb
|
2016-08-30 03:22:55 -04:00 |
|
TadahTech
|
90ce21db3d
|
Update preferences
|
2016-08-30 00:51:51 -05:00 |
|
AlexTheCoder
|
8ca214a4d8
|
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game
|
2016-08-30 01:37:14 -04:00 |
|
TadahTech
|
a68f7395e4
|
Use proper server group / remove testing.
|
2016-08-30 00:10:38 -05:00 |
|
AlexTheCoder
|
5108a6f08d
|
Convert to npc for entering mavericks lobby
|
2016-08-30 01:02:26 -04:00 |
|
AlexTheCoder
|
d7d8ef021e
|
Disable using cosmetics inside mavericks hub
|
2016-08-30 00:47:48 -04:00 |
|
TadahTech
|
94bfc9aa15
|
Use proper server group / remove testing.
|
2016-08-29 22:33:01 -05:00 |
|
TadahTech
|
dfced7186f
|
Finish tweaks for the hub
|
2016-08-29 22:32:07 -05:00 |
|
AlexTheCoder
|
463c03e9d1
|
Add pitch and yaw to npcs
|
2016-08-29 22:11:53 -04:00 |
|
Shaun Bennett
|
f72647e1d4
|
Merge with develop
|
2016-08-29 21:56:03 -04:00 |
|
Shaun Bennett
|
e7d876e865
|
Fix string.format param order
|
2016-08-29 21:33:00 -04:00 |
|
TadahTech
|
39ea280098
|
NextBestGame code and new hub releases
|
2016-08-29 20:21:36 -05:00 |
|
Alexander Meech
|
464c9fcdc3
|
Update steal chance
|
2016-08-29 20:37:02 -04:00 |
|
LCastr0
|
3687c7ad98
|
PowerPlayClub update
|
2016-08-29 21:32:11 -03:00 |
|
Shaun Bennett
|
f3e38031ab
|
Add shadowmuting
|
2016-08-29 18:57:07 -04:00 |
|
Sam
|
7a3ce9813c
|
Payload (OITQ)
|
2016-08-29 23:08:04 +01:00 |
|
Sam
|
9454e1f409
|
Skywars and Kit Progression
|
2016-08-29 23:07:48 +01:00 |
|
Keir Nellyer
|
b30f395d88
|
Update chat snap site for backend changes
|
2016-08-29 12:21:57 +01:00 |
|
Sam
|
ec8ed76270
|
Convert old perks to new perks
|
2016-08-28 09:06:07 +01:00 |
|
Sam
|
88f4813534
|
Perk related issue
|
2016-08-28 09:05:49 +01:00 |
|
Sam
|
ccd855da84
|
Name the ultimates
|
2016-08-28 09:05:31 +01:00 |
|
Sam
|
54e8f8e5e8
|
Code improvement and cleanup
|
2016-08-28 09:05:11 +01:00 |
|
Sam
|
34c6e1cab7
|
Add the base of kit progression
|
2016-08-28 09:04:46 +01:00 |
|
Sam
|
d81ed348f3
|
Remove used import
|
2016-08-28 09:04:09 +01:00 |
|
Keir Nellyer
|
022e9f6bd4
|
Players can have more than 1 active report open against them
|
2016-08-27 22:38:54 +01:00 |
|
Keir Nellyer
|
3f18c0cc6b
|
Fix join/leave report handling
|
2016-08-27 22:35:12 +01:00 |
|
Keir Nellyer
|
cd9423a8e4
|
De-couple chatsnap from report system
|
2016-08-27 22:21:56 +01:00 |
|
Sam
|
a35c162dc4
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
|
2016-08-26 21:26:16 +01:00 |
|
Sam
|
efc14ee13f
|
Another merge fix
|
2016-08-26 21:26:14 +01:00 |
|
Sam
|
4bc49e6133
|
Solve merge conflicts
|
2016-08-26 21:21:18 +01:00 |
|
LCastr0
|
3e38eb5990
|
Fixes to the merging conflicts
|
2016-08-25 20:13:59 -03:00 |
|