225 Commits

• Introduce dependency injection
  Drew DeVault · 2016-11-10 16:38:25 -05:00
  19fd6fe249
• Merge pull request #103 from huoyaoyuan/music-controller

  Music controller

  Dean Herbert · 2016-11-10 12:54:56 +09:00
  788c11de10
• Initial updates to make generic containers work.
  Dean Herbert · 2016-11-07 21:13:56 +09:00
  a61fb5ef5d
• Merge branch 'master'
  Huo Yaoyuan · 2016-11-07 18:58:35 +08:00
  8037f1233f
• Update FontAwesome definitions.
  Dean Herbert · 2016-11-07 17:59:00 +09:00
  f14a35d480
• Smoothen wedged buttons in main menu and the wedges on song select background.
  Thomas Müller · 2016-11-06 19:34:44 +01:00
  90c889a7ce
• Ensure transformations are never used prior to being added to the Drawable tree.
  Thomas Müller · 2016-11-06 11:13:52 +01:00
  103176826f
• Merge branch 'master' of github.com:ppy/osu into better-clocks

  # Conflicts:
  #	osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs

  Thomas Müller · 2016-11-06 10:08:24 +01:00
  32ee20b843
• Remove now obsolete clock usages.
  Thomas Müller · 2016-11-06 10:06:09 +01:00
  5f2bf165a2
• Make use of new timing system in Drawables and Transforms.
  Thomas Müller · 2016-11-06 08:25:21 +01:00
  a6c0fd29f2
• Merge branch 'master'
  Huo Yaoyuan · 2016-11-06 00:11:30 +08:00
  c470140d64
• Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2

  # Conflicts:
  #	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
  #	osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs

  Thomas Müller · 2016-11-05 13:35:15 +01:00
  07e74068e7
• Add beatmap backgrounds.
  Dean Herbert · 2016-11-05 20:00:14 +09:00
  a11d534067
• Bring framework up-to-date.

  # Conflicts:
  #	osu-framework

  Dean Herbert · 2016-11-05 18:18:52 +09:00
  2ee5e2efb7
• Merge branch 'master'
  Huo Yaoyuan · 2016-11-05 16:21:59 +08:00
  2d86cb1e81
• Fix scale more.
  Dean Herbert · 2016-11-04 15:43:53 +09:00
  92b85b251e
• Fix scale ratio of gamefield.
  Dean Herbert · 2016-11-04 15:43:53 +09:00
  e939746159
• Add autoplay toggle (const).
  Dean Herbert · 2016-11-04 15:43:53 +09:00
  788cba6f4d
• Fix some events not firing correctly.
  Dean Herbert · 2016-11-04 12:27:43 +09:00
  f3d461e318
• Merge branch 'master'
  Huo Yaoyuan · 2016-11-03 20:38:34 +08:00
  f2a8cc0c29
• Merge remote-tracking branch 'refs/remotes/upstream/master' into async-workflow
  Dean Herbert · 2016-11-03 16:44:49 +09:00
  439204b4fa
• Improve coodination of startup sequence.
  Dean Herbert · 2016-11-02 01:02:48 +09:00
  3d611dd57b
• Schedule some illegal calls.
  Dean Herbert · 2016-11-02 01:02:34 +09:00
  c78e3efc66
• Move wedgeContainer transition to OnEntering
  Drew DeVault · 2016-11-01 09:22:49 -06:00
  0edfeaaff9
• Add async workflow.
  Dean Herbert · 2016-11-01 23:24:14 +09:00
  b86f308af6
• Fade song select wedges in
  Drew DeVault · 2016-10-31 16:16:11 -06:00
  e5f948dccc
• I knew I forgot something >:(
  Adonais Romero González · 2016-10-29 18:42:40 -05:00
  fd0900eb3c
• Minor improvements to combo counters
  Adonais Romero González · 2016-10-29 18:26:12 -05:00
  ef9d2b5b3c
• Use Any instead of First to avoid potential throw.
  Dean Herbert · 2016-10-29 04:29:43 +09:00
  d8ca11bf0d
• Remove forgotten parens.
  Dean Herbert · 2016-10-29 03:44:27 +09:00
  a2f995ebe0
• Remove forced disposal of WorkingBeatmap.
  Dean Herbert · 2016-10-29 03:31:40 +09:00
  c969e0b4f0
• Add some warning comments.
  Dean Herbert · 2016-10-28 23:35:49 +09:00
  f0e4a252a5
• Tidy shit up; reduce number of unnecssesary events being fired.
  Dean Herbert · 2016-10-28 23:29:21 +09:00
  42ad96778e
• OsuGameMode<-WorkingBeatMap->OsuGameBase.
  Huo Yaoyuan · 2016-10-28 21:03:59 +08:00
  6aba03e1ca
• Avoid accessing the beatmap too early.
  Dean Herbert · 2016-10-28 21:08:32 +09:00
  5dc495e41d
• Lazy parse beatmap; Don't reload audio track if it hasn't changed.
  Dean Herbert · 2016-10-28 20:24:14 +09:00
  10ef34b805
• Add initial game-wide beatmap flow.
  Dean Herbert · 2016-10-28 19:55:48 +09:00
  74f1a9622f
• Only allow osu! mode maps to be played for now.
  Dean Herbert · 2016-10-28 18:07:42 +09:00
  0f5614ffa2
• Update transforms to not accept clock.
  Dean Herbert · 2016-10-28 17:42:00 +09:00
  13b5fb0578
• Move Results to own namespace.
  Dean Herbert · 2016-10-28 16:10:10 +09:00
  0e39c5cc9c
• Add the concept of a "WorkingBeatmap" and make player load beatmaps and audio from SongSelect.
  Dean Herbert · 2016-10-28 14:14:45 +09:00
  feccb7286c
• Minor fixes to player flow.
  Dean Herbert · 2016-10-27 22:27:45 +09:00
  012c29addb
• Don't hard-crash on failing to load a beatmap.
  Dean Herbert · 2016-10-27 20:37:01 +09:00
  d6ed055682
• Rewrite a lot of Song Select to share logic between panels and consolidate logic inside classes where possible.
  Dean Herbert · 2016-10-27 19:52:48 +09:00
  d9dfc324c1
• Add comment about optional database parameter.
  Dean Herbert · 2016-10-27 17:53:47 +09:00
  c828b1bc7b
• Allow Player to load from BeatmapInfo.
  Dean Herbert · 2016-10-27 17:53:37 +09:00
  9074bc3396
• Use memory database again, local to TestCasePlaySongSelect.
  Dean Herbert · 2016-10-27 17:35:00 +09:00
  a764a97602
• Stop using memory database. Load sample data local to TestCase.

  Also makes the connection private.

  Dean Herbert · 2016-10-27 17:08:53 +09:00
  f16cc430f8
• Merge pull request #61 from SirCmpwn/song-select

  Song select

  Dean Herbert · 2016-10-27 13:54:34 +09:00
  debea59bab
• Move BeatmapGroupState to outside class definition.
  Dean Herbert · 2016-10-27 13:42:37 +09:00
  456169f182