Commit Graph

4154 Commits

Author SHA1 Message Date
Mysticate
8b2b4c2826 Added to MPS 2015-07-19 15:51:34 -04:00
Mysticate
6edc923002 Changed mineplex.com/supporthub > mineplex.com/reports 2015-07-19 15:43:13 -04:00
Morten
c5f7c4fe0e Finalized after QA testing. Pretty much ready to go 2015-07-19 19:50:53 +02:00
Ben Sihota
05c18e6a83 Merge remote-tracking branch 'origin/master' 2015-07-18 19:07:11 -07:00
Shaun Bennett
d94f4f96a7 Observer mode changes 2015-07-18 16:40:50 -05:00
Morten
2cad6223a7 Ubs.. Forgot to actually upload the new kits.. :D 2015-07-18 15:15:53 +02:00
Morten
b986cf968e Added new kits, Changed Compass feature, Fixed a lot of bugs 2015-07-18 15:10:03 +02:00
Mysticate
2dc2b8792c Fixes, updates 2015-07-17 17:01:24 -04:00
Shaun Bennett
1ef6fe3ed6 Observer changes 2015-07-17 15:37:33 -05:00
Jonathan Williams
52dd9df834 Motd changes. 2015-07-17 11:39:01 -05:00
Sarah
8b26ffaecd Improving Team names in SG, SSM and Skywars and disabled friendly fire. 2015-07-17 14:05:27 +02:00
Cheese
5e05530b1d spawn near allies! 2015-07-17 21:28:46 +10:00
Cheese
6ed3f93df7 fixed some scoreboard stuff 2015-07-17 16:17:01 +10:00
libraryaddict
3dcf489ea6 Add 'clan' to the clans command 2015-07-17 17:12:44 +12:00
Sarah
b7ad0035bc Implementing UHC team system to ssm, sg and skywars. 2015-07-17 07:06:49 +02:00
Sarah
5389193cab Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams 2015-07-17 06:31:10 +02:00
Sarah
02a71bff68 another git fix 2015-07-17 06:30:53 +02:00
Sarah
aaae11d426 Git Fix. 2015-07-17 06:29:32 +02:00
Cheese
44102842c9 added some velocity debug 2015-07-17 13:27:55 +10:00
Cheese
cfb4911c25 added ability for teams will fill before moving onto next team 2015-07-17 12:54:53 +10:00
Cheese
63f6adf295 fixed spawn picking 2015-07-17 12:50:34 +10:00
Cheese
3335a7c288 changed skywars teams. forced at 16 teams. 2015-07-17 12:07:09 +10:00
Cheese
558b71f866 fixed thigny 2015-07-17 11:48:14 +10:00
Shaun Bennett
096491f15d Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-07-16 15:51:29 -05:00
Shaun Bennett
2b2e5e5c97 Spelling fixes + Observer mode 2015-07-16 15:51:21 -05:00
libraryaddict
c79117f86a Merge branch 'clans/world-events' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events 2015-07-17 00:30:54 +12:00
libraryaddict
aaee5f01ce Clans: Modifications to map stuff, fix food level depleting too fast 2015-07-17 00:30:34 +12:00
Jonathan Williams
9cf4ff005a Added some debug checks. 2015-07-16 01:26:38 -05:00
Cheese
917839af0e Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-07-16 12:48:10 +10:00
Cheese
ef4a575d28 fixed blocktoss exploits 2015-07-16 12:47:39 +10:00
Shaun Bennett
6a598690b0 Jooq Update, Async Clans calls, Clan name in scoreboard, block toss fix 2015-07-15 21:43:35 -05:00
Morten
d46ac59e10 Added project start 2015-07-16 01:34:57 +02:00
fooify
5d820edd41 remove custom level to fix merge conflicts 2015-07-15 14:34:42 -07:00
Shaun Bennett
05b1e03598 Remove BungeeSigns Module? 2015-07-14 21:57:30 -05:00
Shaun Bennett
40bfa05cd4 Merge remote-tracking branch 'remotes/origin/master' into clans-beta 2015-07-14 21:57:02 -05:00
Shaun Bennett
7f98157890 More work/fixes 2015-07-14 20:38:30 -05:00
Sarah
9eee425792 revert mistake from last commit. 2015-07-14 23:46:56 +02:00
Sarah
e6aec58ece Updating Map source. 2015-07-14 23:14:56 +02:00
Mysticate
1e1cf6403d Added achievements 2015-07-14 13:31:41 -04:00
Sarah
3a2011ee6a Improving Map System: GameTypes can have more mapSources now. 2015-07-14 13:22:59 +02:00
William Burns
d6d7ac93c1 Bugs 2015-07-14 12:20:48 +01:00
William Burns
d36dd26f42 Added ChestLoot for games. Setup chest filling via ChestLoot for SurvivalGames. 2015-07-14 11:56:13 +01:00
Aaron Brock
5f73e50b2a fix 2015-07-14 04:05:06 -04:00
Aaron Brock
6c01e0a9ea Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-14 03:38:52 -04:00
Aaron Brock
ca27591485 Added ChestComponent
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-14 03:36:41 -04:00
Shaun Bennett
ae71de30db Fixes and changes 2015-07-14 01:57:53 -05:00
Sarah
2b10aa2cf9 Improving spawn selection in SkywarsTeams. 2015-07-14 08:19:33 +02:00
Sarah
a224e5937d Merge branch 'EventGameUpdates' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams 2015-07-14 07:11:48 +02:00
Cheese
251e6206af Merge branch 'SSM2PlayerTeams' of ssh://184.154.0.242:7999/min/Mineplex into SSM2PlayerTeams 2015-07-14 14:02:50 +10:00
Cheese
0315f61038 changed team spawn selection 2015-07-14 14:02:35 +10:00