Keir Nellyer
|
2cdab061b6
|
PC-886 Move report bans over to punishment gui
|
2016-09-16 17:40:14 +01:00 |
|
Keir Nellyer
|
ebe212c8ff
|
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
|
2016-09-15 17:30:27 +01:00 |
|
Alexander Meech
|
93c227a22d
|
Change Mavs Basketball to 5 Minutes (#201)
* Update ScoringManager.java
* Update Basketball.java
|
2016-09-14 20:49:24 -04:00 |
|
Keir Nellyer
|
5e5cb3284a
|
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
|
2016-09-12 10:11:31 +01:00 |
|
Sam
|
38473dcffd
|
Fix metal taking too little damage with full iron (#203)
|
2016-09-10 22:47:52 -04:00 |
|
Shaun Bennett
|
e12ed35da1
|
Fix NPE and kit upgrades issue
|
2016-09-07 23:13:28 -04:00 |
|
Shaun Bennett
|
9318ba4de2
|
Merge branch 'develop' into bugfix/samczsun
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
|
2016-09-07 20:12:57 -04:00 |
|
Sam
|
5bf35d49db
|
Message inconsistancy
|
2016-09-06 21:38:43 +01:00 |
|
Sam
|
7a5a6c3d00
|
Fix duplicate message
|
2016-09-06 19:55:31 +01:00 |
|
samczsun
|
08090f5e06
|
PC-818
Seismic Charges can no longer remove barrier blocks
|
2016-09-05 18:25:16 -04:00 |
|
samczsun
|
11c97691a9
|
PC-937
This commit allows Arcade to consider spectating and vanished players when
deciding to autostart a game
|
2016-09-05 18:25:16 -04:00 |
|
samczsun
|
3aaa9b2514
|
Sort tab list properly
|
2016-09-05 18:25:16 -04:00 |
|
Sam
|
8ebaad4736
|
Beta ready commit
|
2016-09-05 17:59:49 +01:00 |
|
Keir Nellyer
|
acd63c90a1
|
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/UserPreferences.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
|
2016-09-05 14:26:06 +01:00 |
|
Sam
|
34ee62bdc3
|
Fix NPE
|
2016-09-03 20:32:10 +01:00 |
|
Sam
|
b3212fc003
|
Particle changes
|
2016-09-03 20:13:08 +01:00 |
|
Sam
|
4b1c93150b
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
|
2016-09-03 20:12:39 +01:00 |
|
Sam
|
8d5d0c6272
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
|
2016-09-03 18:29:37 +01:00 |
|
Sam
|
fc0217f1fd
|
More magic OITQ
|
2016-09-03 18:25:17 +01:00 |
|
Sam
|
e0424c78b2
|
Added spawn barrier
|
2016-09-03 18:24:56 +01:00 |
|
Sam
|
7eb148cc59
|
Ultimate colour change
|
2016-09-03 18:24:44 +01:00 |
|
cnr
|
374142e63f
|
Merge branch 'update/the-smoothest-release-we-will-never-have' into develop
|
2016-09-02 00:42:51 -05:00 |
|
TadahTech
|
e2f974e1e6
|
Add sounds and messages to basketball.
|
2016-09-02 00:40:23 -05:00 |
|
cnr
|
ae0d30558c
|
Merge branch 'update/the-smoothest-release-we-will-never-have' into develop
|
2016-09-02 00:12:12 -05:00 |
|
cnr
|
f6db5393a3
|
Merge branch 'project-cosmetics' into develop
|
2016-09-02 00:08:23 -05:00 |
|
TadahTech
|
9e0bb6ff96
|
Tweak invite starting index.
Disable NextBestGame in an MPS
|
2016-09-01 20:59:28 -05:00 |
|
TadahTech
|
d8486abbfd
|
Fix minor best game issues.
|
2016-09-01 20:05:53 -05:00 |
|
TadahTech
|
a6360249b7
|
Use party if a player has it.
|
2016-09-01 08:47:43 -05:00 |
|
TadahTech
|
6f3d7dcd29
|
Merge branches 'develop' and 'update/the-smoothest-release-we-will-never-have' of https://github.com/Mineplex-LLC/Minecraft-PC into update/the-smoothest-release-we-will-never-have
|
2016-09-01 08:45:43 -05:00 |
|
TadahTech
|
41936e0efc
|
Remove users from the map.
|
2016-09-01 08:31:16 -05:00 |
|
TadahTech
|
fdc54e1dd1
|
Fix BestGame not cancelling for parties.
|
2016-09-01 08:29:51 -05:00 |
|
cnr
|
05f640266f
|
Fix basketball scoring infinite loop
|
2016-09-01 06:36:47 -05:00 |
|
TadahTech
|
53846acbf6
|
Dont let Minestrike use NextBestGame
|
2016-09-01 05:39:47 -05:00 |
|
TadahTech
|
46053e82e1
|
Mavs changes.
|
2016-09-01 02:35:31 -05:00 |
|
cnr
|
9cd5b73432
|
Merge branch 'update/basketball-game' into develop
|
2016-08-31 23:19:51 -05:00 |
|
Sam
|
57292414c6
|
Gems for winners
|
2016-08-31 22:55:13 +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
|
b1faecea49
|
Kit Fire incorrect values
|
2016-08-31 12:07:25 +01: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 |
|
TadahTech
|
94bfc9aa15
|
Use proper server group / remove testing.
|
2016-08-29 22:33:01 -05: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 |
|
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 |
|
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 |
|