JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,232 Commits 1 Branch 0 Tags 481 MiB
17b98888fc
Commit Graph

9232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Thanos Paravantis
839d9263fd Prevent game crash if started with one player 2016-07-13 18:03:38 +03:00
Thanos Paravantis
efce89a7e7 Fix Color Change platforms not removed properly 2016-07-13 17:47:17 +03:00
Thanos Paravantis
2e5d7c023f Fix Tag Master, show bouncing block full score 2016-07-13 17:13:02 +03:00
AlexTheCoder
2034b5536e Update and enable Clans Freezing 2016-07-13 09:42:46 -04:00
LCastr0
2121d736a6 Merge pull request #145 from Mineplex-LLC/develop 
Merge 'develop' into 'project-cosmetics'
 2016-07-13 09:58:14 -03:00
cnr
7df228a8fa Move WinEffectGadget schematics to update folder 2016-07-13 06:36:42 -05:00
Thanos Paravantis
6cef42d7a4 Fix merge issues 2016-07-13 13:36:59 +03:00
Thanos Paravantis
179b59af2c Merge branch 'develop' into thanos-mineware 2016-07-13 13:28:03 +03:00
Thanos Paravantis
943dc88ca4 Modify challenge list, change display messages 2016-07-13 13:23:15 +03:00
cnr
e40abd4859 Merge branch 'thanos-mineware' into develop 2016-07-13 05:04:50 -05:00
Sam
2f6e140b34 Item in hand change (Devourer) 
Changes the item in the NPC's hand for Devourer from OBSIDIAN to a
DIAMOND_CHESTPLATE
 2016-07-12 21:57:37 +01:00
Sam
5382afedda Sharpshooter arrow limit changed to 4 2016-07-12 21:56:25 +01:00
cnr
85db0ad613 Remove global rawr 2016-07-12 15:51:47 -05:00
xXVevzZXx
654ab281ea Add option of "uptimes" to servergroups 2016-07-12 15:44:29 -05:00
Thanos Paravantis
0f3b2da8b7 Fix Bouncing Block, re-add features for testing 2016-07-12 23:02:01 +03:00