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 |
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 |
|
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 |
|
Mysticate
|
3b00be33ee
|
Merge remote-tracking branch 'origin/master' into BombLobbers
|
2015-07-13 12:15:11 -04:00 |
|
Mysticate
|
df60659786
|
Core edits
|
2015-07-13 12:14:25 -04:00 |
|
Aaron Brock
|
d5a144f377
|
Teams
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-13 07:02:33 -04:00 |
Ben Sihota
|
b1b8fa59f7
|
Update IntelliJ builds
|
2015-07-12 21:11:39 -07:00 |
|
Mysticate
|
616c444c16
|
Added some things and stuff
|
2015-07-12 18:15:33 -04:00 |
|
Mysticate
|
0a09ae29f3
|
Merge remote-tracking branch 'origin/master' into BombLobbers
|
2015-07-12 18:14:25 -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 |
|
Mysticate
|
d0180910e9
|
Added two new kits.
|
2015-07-11 10:25:04 -04: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 |
|
Mysticate
|
0353b8571d
|
Merge branch 'BombLobbers' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into BombLobbers
|
2015-07-10 16:41:29 -04: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 |
|
Mysticate
|
f812fd0530
|
Please push please
|
2015-07-10 16:31:37 -04: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 |
|
Mysticate
|
9e07be51c7
|
Bug fixes
|
2015-07-09 12:03:56 -04:00 |
|
Aaron Brock
|
b4b0d6fa6f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-09 01:30:48 -04:00 |
|
Aaron Brock
|
d6fd7f4dd9
|
sutff
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-09 01:30:28 -04:00 |
|
Mysticate
|
1b3d7f1c20
|
Fixed and added things
|
2015-07-08 23:57:48 -04:00 |
|
Cheese
|
49daf597b5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-09 12:47:57 +10:00 |