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 |
|
Shaun Bennett
|
7fbd6087eb
|
Merge pull request #187 from Mineplex-LLC/update/oitq
Skywars Update Patch
|
2016-09-07 20:08:08 -04:00 |
|
samczsun
|
fba449ca03
|
Don't rearrange GUI if all dev servers are ingame
|
2016-09-07 19:17:47 -04:00 |
|
samczsun
|
a8adf23c15
|
Allow dev servers
|
2016-09-07 11:45:42 -04:00 |
|
Keir Nellyer
|
7b6f0ae221
|
PC-953 Make report ids in /reportstats command clickable
|
2016-09-07 16:40:05 +01:00 |
|
Sam
|
bed563876a
|
Add a comment to explain usage of KitUpgradeShop
|
2016-09-07 14:18:07 +01:00 |
|
Shaun Bennett
|
ba322f0df1
|
Merge pull request #195 from Mineplex-LLC/update/emergency-support-fixes
Update/emergency support fixes
|
2016-09-07 07:57:53 -04:00 |
|
Shaun Bennett
|
b1b9900c9e
|
Add offline stat checking
|
2016-09-07 07:47:19 -04:00 |
|
Keir Nellyer
|
e2840f36b5
|
PC-958 Don't allow chat abuse reports of players who haven't spoken
in chat
|
2016-09-07 11:28:20 +01:00 |
|
Keir Nellyer
|
640a8d3516
|
PC-958 Allow reporting of offline players
|
2016-09-07 09:50:10 +01:00 |
|
AlexTheCoder
|
225583a13d
|
Remove join restrictions on beta servers from unranked players
|
2016-09-06 21:36:30 -04:00 |
|
Sam
|
5bf35d49db
|
Message inconsistancy
|
2016-09-06 21:38:43 +01:00 |
|
Sam
|
be268991b0
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
|
2016-09-06 21:37:33 +01:00 |
|
Sam
|
7a5a6c3d00
|
Fix duplicate message
|
2016-09-06 19:55:31 +01:00 |
|
Keir Nellyer
|
353cdb2413
|
Merge remote-tracking branch 'origin/feature/report-v2' into feature/report-v2
|
2016-09-06 17:28:03 +01:00 |
|
Keir Nellyer
|
b1b275fc67
|
PC-958 Prepare codebase for reporting of offline players
|
2016-09-06 17:27:48 +01:00 |
|
Keir Nellyer
|
94b5a6e760
|
PC-952 Add /reportinfo
|
2016-09-06 16:43:51 +01:00 |
|
AlexTheCoder
|
64db10c91a
|
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/emergency-support-fixes
|
2016-09-05 20:27:09 -04:00 |
|
AlexTheCoder
|
a124aa3d85
|
Fix items added via support server not showing up in customer service logs
|
2016-09-05 20:25:02 -04:00 |
|
samczsun
|
444fe5d151
|
Remove hacky reflection method to get server name
|
2016-09-05 18:37:17 -04: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
|
6490ab3786
|
Don't hide banwave animation from staff
|
2016-09-05 18:25:16 -04:00 |
|
samczsun
|
3aaa9b2514
|
Sort tab list properly
|
2016-09-05 18:25:16 -04:00 |
|
samczsun
|
6b1d551a37
|
Remove please investigate
|
2016-09-05 18:25:16 -04:00 |
|
samczsun
|
0678f7287d
|
No fake levels for those who don't want it
|
2016-09-05 18:25:16 -04:00 |
|
samczsun
|
d09b27bfe1
|
Fix disguises prevent join, join rank check bugs
|
2016-09-05 18:25:16 -04:00 |
|
samczsun
|
c18d771715
|
Unbreak Squid in SSM
|
2016-09-05 18:25:16 -04:00 |
|
Keir Nellyer
|
e2455bbc9d
|
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
|
2016-09-05 20:04:12 +01:00 |
|
cnr
|
ccd81c1820
|
Fix BlockIgniteEvent NPE in MavericksManager
|
2016-09-05 13:42:24 -05:00 |
|
Sam
|
12130d41e6
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
|
2016-09-05 17:59:51 +01: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 |
|
AlexTheCoder
|
a7b0c9de05
|
Fix unnecessary calls to mysql/mssql databases in support server
|
2016-09-05 04:46:13 -05:00 |
|
AlexTheCoder
|
504432d87b
|
Fix titan command not being registered
|
2016-09-05 04:46:01 -05:00 |
|
AlexTheCoder
|
9ce49b10c0
|
Add a command to allow support agents to check for ownership of internal sales packages
|
2016-09-05 04:45:51 -05:00 |
|
AlexTheCoder
|
ffb6073532
|
Fix unnecessary calls to mysql/mssql databases in support server
|
2016-09-04 23:44:54 -04:00 |
|
AlexTheCoder
|
b5771550ad
|
Fix titan command not being registered
|
2016-09-04 23:28:25 -04:00 |
|
AlexTheCoder
|
866c3ee7c9
|
Add a command to allow support agents to check for ownership of internal sales packages
|
2016-09-04 22:11:05 -04:00 |
|
AlexTheCoder
|
29bb2a3895
|
Add an enjin chargeback command and fix punishing in support servers
|
2016-09-04 00:39:44 -05:00 |
|
AlexTheCoder
|
b3478d70e8
|
Update support packages
|
2016-09-04 00:39:44 -05:00 |
|
AlexTheCoder
|
5b80f3b6ac
|
Fix clan banner being removed from support server information
|
2016-09-04 00:39:44 -05:00 |
|
AlexTheCoder
|
e2d3763ec0
|
Add an enjin chargeback command and fix punishing in support servers
|
2016-09-03 15:42:32 -04:00 |
|
Sam
|
34ee62bdc3
|
Fix NPE
|
2016-09-03 20:32:10 +01:00 |
|
AlexTheCoder
|
3088d79cf5
|
Update support packages
|
2016-09-03 15:16:59 -04: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
|
c3c61b8189
|
Merge fix
|
2016-09-03 18:29:18 +01:00 |
|
Sam
|
fc0217f1fd
|
More magic OITQ
|
2016-09-03 18:25:17 +01:00 |
|