31 Commits

• Merge branch 'master' into stateful-drawables

  Conflicts:
  	osu.Game/GameModes/Menu/Intro.cs

  Dean Herbert · 2016-10-09 22:08:32 +09:00
  25de055802
• Code formatting and slight changes to transitions.
  Dean Herbert · 2016-10-08 23:27:53 +09:00
  926c46dbd4
• Standardise drawable state access and split large nested classes out of MainMenu.ButtonSystem
  Dean Herbert · 2016-10-08 23:27:46 +09:00
  9594b7193c
• Use own Scheduler instead of Game.Scheduler.
  Thomas Müller · 2016-10-08 11:33:24 +02:00
  0c793dfe69
• Unify and smiplify exit logic. Now only OsuGame calls the final Exit.
  Dean Herbert · 2016-10-08 15:54:05 +09:00
  c5228b63cb
• Add the ability to exit the game using escape.
  Dean Herbert · 2016-10-08 15:54:05 +09:00
  c5ac851ba9
• Move BackgroundModes to their own files.
  Dean Herbert · 2016-10-08 15:53:57 +09:00
  d1dfa120d1
• Add intro and begin to create central logic nest.
  Dean Herbert · 2016-10-08 15:53:56 +09:00
  d6042bd689
• Add main menu music back.
  Dean Herbert · 2016-10-08 15:53:53 +09:00
  75c97a62e3
• Improve white-boxed game modes.
  Dean Herbert · 2016-10-05 20:08:58 +09:00
  c0f25a2683
• Add BackgroundMode stack.
  Dean Herbert · 2016-10-05 20:06:55 +09:00
  03aea04a00
• Make Home, Settings and PlayMode buttons work.
  Dean Herbert · 2016-10-04 17:15:03 +09:00
  11403a922a
• Remove unused variable.
  Dean Herbert · 2016-10-01 17:03:47 +09:00
  af91341704
• Use explicit cast to OsuGame rather than in-between derived classes.

  # Conflicts:
  #	osu.Game/GameModes/Menu/MainMenu.cs

  Dean Herbert · 2016-10-01 17:02:57 +09:00
  5afb038025
• Add parallax to ButtonSystem.
  Dean Herbert · 2016-10-01 17:02:20 +09:00
  40e5a449bf
• Adjust scale and outwards transition of ButtonSystem.
  Dean Herbert · 2016-10-01 17:02:01 +09:00
  4ad618abc9
• Add delay for exit process.
  Dean Herbert · 2016-09-30 13:31:05 +09:00
  463f606004
• Add OsuGameMode. Standardise naming of classes.
  Dean Herbert · 2016-09-30 13:30:55 +09:00
  357c94ed8a
• Basic white-boxing of all game modes.
  Dean Herbert · 2016-09-29 23:51:17 +09:00
  154226b9a3
• Fix a few warnings.
  Dean Herbert · 2016-09-29 23:46:27 +09:00
  a69c5b4fc0
• Add basic implementation of VisualTest framework for osu! project.

  Comes with one complimentary test.

  Dean Herbert · 2016-09-24 15:47:17 +09:00
  7bdb2fcfc7
• Remove silly textboxes.
  Dean Herbert · 2016-09-24 00:09:59 +09:00
  c64dfca82e
• Replaced all Add() calls in Load()s with direct Children = new Drawable[] {} settings, for consistency
  Remie Richards · 2016-09-18 20:41:53 +01:00
  314b0dfc04
• Clears out old tests (use the framework tests!), Replaces osu.Game.Graphics.UserInterface references with osu.Framework.Graphics.UserInterface
  Remie Richards · 2016-09-17 21:54:52 +01:00
  4754c0e2d1
• Updates to latest osu-framework, Updates existing Load() methods to use Children = new Drawable[]{} syntax
  Remie Richards · 2016-09-17 21:33:46 +01:00
  1a5c2b5221
• Update naming conventions.
  Dean Herbert · 2016-09-04 18:31:58 +09:00
  23111821f5
• Add sample TextBox and SpriteText to MainMenu for comparison.
  Dean Herbert · 2016-09-01 22:51:03 +09:00
  586aaad2b0
• Remove unnecessary file extension.

  # Conflicts:
  #	osu.Game/GameModes/Menu/MainMenu.cs

  Dean Herbert · 2016-09-01 22:47:48 +09:00
  6e836708bd
• Update SampleManager Get method call.
  Dean Herbert · 2016-09-01 22:47:48 +09:00
  af3e024c7b
• License -> Licence.
  Dean Herbert · 2016-08-26 17:27:49 +09:00
  81f9ce657f
• Initial commit.
  Dean Herbert · 2016-08-26 14:41:47 +09:00
  6cbbeaaac0