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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
be194c5493
|
Adding Peace Phase Announcement.
|
2015-07-12 01:00:50 +02:00 |
|
Sarah
|
625f7d3168
|
Some last small changes.
|
2015-07-12 00:45:47 +02:00 |
|
Sarah
|
55a1c311bf
|
Kit improvements and balancing.
|
2015-07-12 00:21:13 +02:00 |
|