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 30287a0832b8650d741d
2016-07-14 00:10:37 -05:00
samczsun
7dcf7378ef
Many changes
...
Fix spectator race condition
Refactor out cut clean into modules
Add combat log module
Add antixray module
2016-07-13 21:30:54 -05:00
cnr
a7b30f4f59
Merge branch 'thanos-mineware' into develop
2016-07-13 21:26:25 -05:00
cnr
4343fa3512
Merge branch 'project-cosmetics' into develop
2016-07-13 21:22:41 -05:00
Shaun Bennett
a34ac42093
Amplifiers adjustment - shards only
2016-07-13 19:26:23 -05:00
LCastr0
6af04b5438
Fixes for winroom gadget disable messages
2016-07-13 18:21:08 -03:00
Thanos Paravantis
6082418fc7
Update game tags on the hub game compass
2016-07-13 23:59:37 +03:00
Thanos Paravantis
4e985b85e6
Make final challenge changes
...
- Increase Color Change delay
- Make Tag Master not count for players jumping into the void
2016-07-13 23:59:01 +03:00
Shaun Bennett
369dabffae
Amplifier updates - move to boost shards only
2016-07-13 15:07:24 -05:00
Thanos Paravantis
711a04ffa8
Add Bawk Bawk Battles to hub compass
2016-07-13 21:40:31 +03:00
Thanos Paravantis
3497a4c095
Remove unused debug messages
2016-07-13 19:29:48 +03:00
AlexTheCoder
9c3aee6373
Convert all possible gem vote rewards to treasure shard vote rewards to comply with Mojang EULA
2016-07-13 11:17:24 -05:00
Thanos Paravantis
6c11b718af
Remove suppress warnings annotations
2016-07-13 19:03:39 +03:00
Thanos Paravantis
dab3e09837
Achievement fixes, minor challenge changes
...
- Fishing Day was marked as deprecated.
- Surf Up will no longer track waves in which players were killed.
- Make Bouncing Shadow not count players that lost.
- Tag Master will now select alive players only.
- Removed debug messages.
2016-07-13 18:52:14 +03:00
Thanos Paravantis
ad32f4e2f1
Remove unnecessary new string declaration
2016-07-13 18:05:35 +03:00
