Commit Graph

3473 Commits

Author SHA1 Message Date
Sarah
c3742ec794 Fixing the too long String bug. 2015-07-24 15:00:49 +02:00
Sarah
609199a6b8 Improving Team names in Team games. 2015-07-24 13:14:41 +02: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
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
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
Sarah
3a2011ee6a Improving Map System: GameTypes can have more mapSources now. 2015-07-14 13:22:59 +02: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
Sarah
304a51de04 Improving TeamSurvivalGames Scoreboard. 2015-07-14 05:44:58 +02:00
Sarah
e72d612379 Implementing the mapSource parameter in GameType and setting up SkywarsTeams and SurvivalGamesTeams. 2015-07-14 05:25:08 +02:00
Cheese
f2cc2a2c86 youtubers wont get kicked by mac 2015-07-14 10:16:42 +10:00
Cheese
cb05049c4a youtubes can turn off vel in hubs 2015-07-14 10:08:41 +10:00
Cheese
5797f6bc00 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-14 09:58:22 +10:00
Cheese
1425875f7c art assets 2015-07-14 09:56:58 +10:00
Jonathan Williams
f652ad8448 Removing ancient projects that are no longer used. 2015-07-13 13:41:57 -05:00
Aaron Brock
d5a144f377 Teams
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-13 07:02:33 -04:00
Sarah
bd3641cdac Updating TeamSmash with team Generation Methods. 2015-07-12 02:51:18 +02:00
Sarah
251accb40a Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams 2015-07-11 18:49:38 +02:00
Sarah
d41fcb1b7b Improving the SSM Team Game. 2015-07-11 18:44:33 +02:00
Aaron Brock
7377094e86 stuff
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-11 03:51:19 -04:00
Aaron Brock
6bacbce463 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-11 02:57:33 -04:00
Aaron Brock
7c571e20d4 Switched to '/' to DIRECTORY_SEPARATOR
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-11 02:54:27 -04:00
Sarah
64915a0b7d Implementing Meteoroids for Game end and changing Kit description. 2015-07-11 04:28:37 +02:00
Jonathan Williams
96a93b6786 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-10 15:32:25 -05:00
Jonathan Williams
7684e1837d Added new support staff to whitelist. 2015-07-10 15:31:38 -05:00
Sarah
5429e3eb76 snowfight kits 2015-07-10 13:17:07 +02:00
Sarah
152523fc3d snowfight update 2015-07-10 13:13:38 +02:00
Cheese
361d090171 server config 2015-07-10 17:38:04 +10:00
Cheese
233d3f0144 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-10 17:31:35 +10:00
Aaron Brock
31d6cbd7ce Meh
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-10 02:46:12 -04:00
Jonathan Williams
581d58c313 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-09 18:34:20 -05:00
Aaron Brock
4b800340d8 Added things...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-09 18:52:40 -04:00
Jonathan Williams
f8b3431305 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-09 11:08:22 -05:00
Jonathan Williams
a20a9ba9e7 Fixed issue and updated bungee motd manager. 2015-07-09 11:07:43 -05:00
Jonathan Williams
77a63f72cc Updated staff server white list. 2015-07-09 11:07:16 -05:00
Jonathan Williams
ecd8e3d7b0 Increased wait time for redis. 2015-07-09 11:07:00 -05:00
Aaron Brock
b4b0d6fa6f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-09 01:30:48 -04:00