912 Commits

• Move play modes to Modes namespace.
  Dean Herbert · 2016-11-14 18:03:20 +09:00
  06f4f93918
• Rename GameModes namespace to Screens.
  Dean Herbert · 2016-11-14 17:23:33 +09:00
  0f4538f69f
• Avoid using load to construct the drawable hierarchy whereever possible.
  Thomas Müller · 2016-11-12 18:34:36 +01:00
  ac99e2d488
• Merge branch 'refs/heads/master' into dependency-injection

  # Conflicts:
  #	osu-framework
  #	osu.Game/GameModes/OsuGameMode.cs
  #	osu.Game/GameModes/Play/Player.cs
  #	osu.Game/OsuGame.cs
  #	osu.Game/Overlays/MusicController.cs
  #	osu.Game/Overlays/Options/EditorSection.cs
  #	osu.Game/Overlays/Options/Input/MouseOptions.cs
  #	osu.Game/Overlays/Options/Online/InGameChatOptions.cs
  #	osu.Game/Overlays/Options/SkinSection.cs

  Dean Herbert · 2016-11-12 20:18:26 +09:00
  cc0f61f545
• Update to latest DI stuff
  Drew DeVault · 2016-11-10 17:40:42 -05:00
  0d4560a054
• Get the game running, though not perfectly
  Drew DeVault · 2016-11-10 16:42:29 -05:00
  fe9034323b
• Convert everything to DI pattern
  Drew DeVault · 2016-11-10 16:41:18 -05:00
  ee24cd310c
• Use DI for Player
  Drew DeVault · 2016-11-10 16:38:44 -05:00
  dc03f36793
• Merge pull request #103 from huoyaoyuan/music-controller

  Music controller

  Dean Herbert · 2016-11-10 12:54:56 +09:00
  788c11de10
• Wire up one of the settings to the config

  One step at a time, right

  Drew DeVault · 2016-11-07 22:36:24 -05:00
  1bca78f4b6
• 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
• Fix thread safety issue when accessing files in beatmap (zip) files.
  Dean Herbert · 2016-11-05 18:19:01 +09:00
  8fe63689a4
• Merge branch 'master'
  Huo Yaoyuan · 2016-11-05 16:21:59 +08:00
  2d86cb1e81
• Fix off-by-one colour retrieval.
  Dean Herbert · 2016-11-04 15:43:53 +09:00
  da18e2d4f6
• Add HitObject colours back in the mix.
  Dean Herbert · 2016-11-04 15:43:53 +09:00
  b40ccccbe4
• Fix scale ratio of gamefield.
  Dean Herbert · 2016-11-04 15:43:53 +09:00
  e939746159
• Scale up TestCaseHitObjects so detail is a bit more visible.
  Dean Herbert · 2016-11-04 15:43:53 +09:00
  7e6d5a28b1
• Fix OpenTK reference in osu.Desktop.VisualTests
  Drew DeVault · 2016-11-03 19:06:22 -04:00
  55821a1a2b
• Split up options into subclasses
  Drew DeVault · 2016-11-03 19:06:22 -04:00
  2aa85a4b18
• Implement General options section
  Drew DeVault · 2016-11-03 19:06:22 -04:00
  9f78f8607b
• Merge branch 'master'
  Huo Yaoyuan · 2016-11-03 20:38:34 +08:00
  f2a8cc0c29
• Add async workflow.
  Dean Herbert · 2016-11-01 23:24:14 +09:00
  b86f308af6
• Make prev and next work again.
  Huo Yaoyuan · 2016-10-28 20:08:27 +08:00
  7d14e6e6cf
• Merge remote-tracking branch 'peppy/lets-play' into music-controller
  Huo Yaoyuan · 2016-10-28 19:47:35 +08:00
  b7ada4866e
• Lazy parse beatmap; Don't reload audio track if it hasn't changed.
  Dean Herbert · 2016-10-28 20:24:14 +09:00
  10ef34b805
• Merge remote-tracking branch 'refs/remotes/peppy/lets-play'
  Huo Yaoyuan · 2016-10-28 19:07:29 +08:00
  7e2350cb13
• 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
• Don't reinitialise fake data if we've already populated it.
  Dean Herbert · 2016-10-27 17:38:38 +09:00
  d664c97279
• Imply we are using fake data in description.
  Dean Herbert · 2016-10-27 17:38:23 +09:00
  ace31c68ea
• Use memory database again, local to TestCasePlaySongSelect.
  Dean Herbert · 2016-10-27 17:35:00 +09:00
  a764a97602
• Remove unnecessary directory creation.
  Dean Herbert · 2016-10-27 17:33:17 +09:00
  801e4bbb0d
• 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
• TestCase reset.
  Huo Yaoyuan · 2016-10-27 13:34:51 +08:00
  0da78c19a2
• Transition fixes and clock for VisualTest.
  Huo Yaoyuan · 2016-10-27 13:34:51 +08:00
  b671a33911
• Create MusicController UI class and visual test.
  Huo Yaoyuan · 2016-10-27 13:34:43 +08:00
  e1f6ab1a42
• General cleanup per PR feedback
  Drew DeVault · 2016-10-26 10:52:40 -04:00
  55e5ec6fae
• Merge branch 'master' into song-select
  Drew DeVault · 2016-10-26 10:37:18 -04:00
  157512b45f
• Fix incorrect framework specification for VisualTests.
  Dean Herbert · 2016-10-26 19:11:17 +09:00
  faca23163c
• Add missing reference.
  Dean Herbert · 2016-10-26 10:18:08 +09:00
  7ca5bf951c
• Fix up sqlite
  Drew DeVault · 2016-10-25 19:39:09 -04:00
  ddfa457ad3
• Introduce TestStorage
  Drew DeVault · 2016-10-25 10:44:43 -04:00
  d986d66c2f
• Fix up JSON reference
  Drew DeVault · 2016-10-24 15:02:13 -04:00
  cea660dce5
• Add test data to db for VisualTests

  Also fixes the broken IPC condition

  Drew DeVault · 2016-10-24 14:57:00 -04:00
  063fdd9a2d
• Add test case for song selection
  Drew DeVault · 2016-10-24 11:39:18 -04:00
  bc6e705e2b
• Update nuget package versions.
  Dean Herbert · 2016-10-24 22:46:44 +09:00
  1ce16afa23
• Don't show performance overlay by default in visual tests.
  Dean Herbert · 2016-10-19 19:46:21 +09:00
  093197cba5
• Start to structure flow of information in Player.

  - Allow basic clicking of hitobjects.
  - Break non-osu! game modes temporarily.
  - Fix some issues with RollingCounters.
  - Add the ability to increment counters.

  Dean Herbert · 2016-10-19 19:44:03 +09:00
  43f0409893
• Make the Player class more friendly and add a test case.
  Dean Herbert · 2016-10-19 18:00:35 +09:00
  a1d961dc87
• Add initial implementation of osu! HitCircle.
  Dean Herbert · 2016-10-19 16:19:01 +09:00
  94968a8b7c