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 |
|
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 |
|
AlexTheCoder
|
09a535466a
|
Fix clan banner being removed from support server information
|
2016-09-03 11:37:45 -04:00 |
|
AlexTheCoder
|
aabde6ba90
|
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/emergency-support-fixes
|
2016-09-03 11:35:57 -04:00 |
|
Shaun Bennett
|
e57d009341
|
Remove unused import!
|
2016-09-03 01:11:50 -04:00 |
|
Shaun Bennett
|
586a768c7b
|
Fix enjin listener else bug
|
2016-09-03 00:59:15 -04:00 |
|
Shaun Bennett
|
17409d0bd2
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java
|
2016-09-03 00:57:22 -04:00 |
|
Shaun Bennett
|
0ea1d3eca2
|
Fix enjin listener else bug
|
2016-09-03 00:56:36 -04:00 |
|
cnr
|
c9358d8c5a
|
Add power play to support server
|
2016-09-02 19:10:30 -05:00 |
|
LCastr0
|
b335039749
|
Merge pull request #193 from Mineplex-LLC/develop
PPC Changes from Connor
|
2016-09-02 17:32:02 -03:00 |
|
Keir Nellyer
|
a5efacc12f
|
PC-955 Fix closing gui showing incorrect suspect name
|
2016-09-02 14:31:38 +01:00 |
|
cnr
|
2bce540c5d
|
Disable Antihack in the staff server
|
2016-09-02 02:51:34 -05: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 |
|
AlexTheCoder
|
9abbe1bfb9
|
Update support whitelist and op list
|
2016-09-02 00:10:36 -05:00 |
|
cnr
|
f6db5393a3
|
Merge branch 'project-cosmetics' into develop
|
2016-09-02 00:08:23 -05:00 |
|
cnr
|
71b880793f
|
Implement power play logging and initial rewards
|
2016-09-02 00:01:49 -05:00 |
|
AlexTheCoder
|
22ddacd21b
|
Update support whitelist and op list
|
2016-09-01 23:01:34 -04: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 |
|
Keir Nellyer
|
78048ac279
|
PC-947 Add bypass for handling reports created or made against for developer
|
2016-09-01 18:21:50 +01:00 |
|
Keir Nellyer
|
d39dae748c
|
PC-947 Don't allow staff members to handle reports created by or made against them
|
2016-09-01 17:55:36 +01: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 |
|