TadahTech
|
36f2873e15
|
Map Parser update.
|
2016-07-18 19:00:11 -05:00 |
|
AlexTheCoder
|
5ecfaef413
|
Merge branch 'feature/mavericks-master-builders' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game
|
2016-07-18 16:28:22 -04:00 |
|
AlexTheCoder
|
c58d226680
|
More work on Nether and Runes
|
2016-07-18 16:26:05 -04:00 |
|
Keir Nellyer
|
d9240e1589
|
Invalid PHPDoc made me write bad code :P
|
2016-07-18 19:29:05 +01:00 |
|
Keir Nellyer
|
ca835bb4c6
|
Remove all try...finally clauses as they aren't supported in PHP 5.4
|
2016-07-18 19:08:37 +01:00 |
|
Keir Nellyer
|
976e8788b7
|
Update report message if a player reports another player multiple times
|
2016-07-18 18:37:21 +01:00 |
|
Keir Nellyer
|
103f31afc1
|
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
|
2016-07-18 17:17:11 +01:00 |
|
Keir Nellyer
|
17c7f36b04
|
Fix getInvolvedUsers not getting reporters
|
2016-07-18 14:37:23 +01:00 |
|
Keir Nellyer
|
c89b35f2f1
|
Remove redundant categories array
|
2016-07-18 14:36:21 +01:00 |
|
AlexTheCoder
|
4238a1c385
|
Implement rune system and main nether minibosses
|
2016-07-17 07:14:08 -04:00 |
|
xXVevzZXx
|
370b0693d9
|
fix the server thinking it's the next week
|
2016-07-17 05:20:21 -05:00 |
|
cnr
|
0ae4b0c5e0
|
Temporarily disable anti-xray in UHC
|
2016-07-16 23:08:18 -05:00 |
|
AlexTheCoder
|
98e88d1b77
|
Disable bosses not scheduled for initial releases
|
2016-07-16 22:00:38 -04:00 |
|
AlexTheCoder
|
08850d909f
|
Further work on brood mother boss and nether
|
2016-07-16 21:59:03 -04:00 |
|
LCastr0
|
7c300acaa3
|
No particles for vanished players!
|
2016-07-16 20:00:21 -03:00 |
|
Sam
|
e2af4df44b
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
|
2016-07-16 21:22:57 +01:00 |
|
LCastr0
|
77af9fb5c2
|
Merge pull request #154 from Mineplex-LLC/develop
Merge develop into project cosmetics
|
2016-07-16 14:10:52 -03:00 |
|
Shaun Bennett
|
34f718b2ec
|
Fix improper gem/shard reward handling
|
2016-07-16 06:27:16 -05:00 |
|
Sam
|
30111eb940
|
Duplicate enchantment fix
|
2016-07-16 11:16:57 +01:00 |
|
Sam
|
951e07488a
|
GI changes from testing session
|
2016-07-16 11:15:33 +01:00 |
|
Sam
|
f012e8d4ed
|
Merge from develop
|
2016-07-16 08:41:15 +01:00 |
|
Sam
|
8523d56bbf
|
Merge fix
|
2016-07-16 08:33:41 +01:00 |
|
Keir Nellyer
|
6756d04aa7
|
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
|
2016-07-15 23:56:08 +01:00 |
|
Keir Nellyer
|
3a8722a1a2
|
Remove redundant files and variables
|
2016-07-15 23:54:20 +01:00 |
|
Sam
|
d901fce3ac
|
Experimental Skywars Kits
|
2016-07-15 23:07:17 +01:00 |
|
Keir Nellyer
|
0d9aad37f9
|
Optimise imports
|
2016-07-15 16:31:25 +01:00 |
|
xXVevzZXx
|
728a91da0f
|
adding damage outsid ethe loop
|
2016-07-15 04:57:44 +02:00 |
|
xXVevzZXx
|
3070835662
|
enable armor protection and fix shotguns
|
2016-07-15 04:39:53 +02:00 |
|
xXVevzZXx
|
6c7f2d8b0d
|
fix damage in DM prepare, eating grenades and no health regen
|
2016-07-15 02:28:22 +02:00 |
|
Keir Nellyer
|
f0c2686ca7
|
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
|
2016-07-14 23:01:11 +01:00 |
|
Keir Nellyer
|
16f451efba
|
Add MySQL upgrade scripts
|
2016-07-14 22:59:56 +01:00 |
|
Keir Nellyer
|
da7806147d
|
These brackets don't need to be here
|
2016-07-14 22:39:59 +01:00 |
|
Keir Nellyer
|
7b5adc717d
|
Prevent non-handlers from closing a report
|
2016-07-14 22:16:53 +01:00 |
|
Keir Nellyer
|
1885854bc4
|
Simplify and shorten createReport method
|
2016-07-14 22:06:25 +01:00 |
|
Keir Nellyer
|
209ca20959
|
Rename "reportPlayer" to "createReport" for method name consistency
|
2016-07-14 21:13:06 +01:00 |
|
Keir Nellyer
|
f75806d2dd
|
Ensure messages shown to players are consistent
|
2016-07-14 21:11:43 +01:00 |
|
Keir Nellyer
|
4ed51b5747
|
Fix getProfiles and getReports methods
|
2016-07-14 21:01:49 +01:00 |
|
Keir Nellyer
|
65e8b92c1a
|
Small refactorings (class relocations and renames)
|
2016-07-14 20:15:14 +01:00 |
|
Keir Nellyer
|
15b5198dbb
|
Ensure words are fully capitalised
Previously only the first word was capitalised.
|
2016-07-14 19:25:53 +01:00 |
|
Keir Nellyer
|
7f48151c8c
|
Made handler messages slightly more prettier
|
2016-07-14 19:19:16 +01:00 |
|
cnr
|
d54e47d8ea
|
Check for uptimes field
|
2016-07-14 11:22:10 -05:00 |
|
cnr
|
a0847b8d1a
|
Fix null ServerGroup uptimes value for MPSes
|
2016-07-14 08:08:24 -05:00 |
|
cnr
|
1a2e0df6ca
|
Only allow OPs to use minestrike debug commands
|
2016-07-14 07:28:33 -05:00 |
|
cnr
|
1d1c3ef1be
|
Merge branch 'thanos-mineware' into develop
|
2016-07-14 03:41:00 -05:00 |
|
Thanos Paravantis
|
40345bc93c
|
Fix Bawk Bawk Battles game start
|
2016-07-14 11:23:39 +03:00 |
|
cnr
|
4d0903dba7
|
Fix compile error
|
2016-07-14 03:11:59 -05:00 |
|
Shaun Bennett
|
e28320b361
|
Fix disableCustom not firing properly
|
2016-07-14 02:47:49 -05:00 |
|
cnr
|
7cc44c8bfc
|
Merge branch 'thanos-mineware' into develop
|
2016-07-14 00:22:01 -05:00 |
|
Thanos Paravantis
|
906762e9db
|
Remove debug commands
|
2016-07-14 08:17:36 +03:00 |
|
cnr
|
917b83250d
|
Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing"
This reverts commit 30287a0832, reversing
changes made to b8650d741d.
|
2016-07-14 00:10:37 -05:00 |
|