4131 Commits

• Fix post-rebase errors.
  smoogipooo · 2017-04-18 09:00:53 +09:00
  786446354e
• Implement Beatmap conversion testing.
  smoogipooo · 2017-04-18 08:57:09 +09:00
  2767fbd81a
• Merge branch 'master' into remove-playmode
  Dean Herbert · 2017-04-17 21:01:10 +09:00
  928550b1a8
• Don't block input in BeatmapInfoWedge.
  Huo Yaoyuan · 2017-04-17 17:08:01 +08:00
  c235a14e3e
• Make a RulesetDatabase.
  Dean Herbert · 2017-04-17 17:43:48 +09:00
  a4e2f34ee7
• Added basic loading screen and test case
  ocboogie · 2017-04-16 20:18:41 -07:00
  78273d76e3
• Fix crash when there's no beatmaps
  ColdVolcano · 2017-04-14 17:48:27 -05:00
  ca1f89f2cf
• Build for real this time
  ColdVolcano · 2017-04-14 17:17:51 -05:00
  2c6327fca9
• Pls AppVeyor don't die
  Javier Flores · 2017-04-14 16:33:58 -05:00
  984c7092a6
• Clean up a few remaining stragglers.
  smoogipooo · 2017-04-15 06:15:55 +09:00
  ddce3c157f
• Better default values + don't set Mode from outside.
  smoogipooo · 2017-04-15 06:14:31 +09:00
  4a149c4ab8
• Add comment.
  smoogipooo · 2017-04-15 05:55:38 +09:00
  3845ab2a72
• Remove PlayMode game-wide.
  smoogipooo · 2017-04-15 05:22:41 +09:00
  0a1376c2db
• Make BeatmapInfo expose Ruleset instead of PlayMode.
  smoogipooo · 2017-04-15 05:01:36 +09:00
  a89af273be
• Move statics to RulesetCollection to avoid conflicts later on.
  smoogipooo · 2017-04-15 04:53:37 +09:00
  59bfc7abad
• Merge remote-tracking branch 'refs/remotes/upstream/master'
  ColdVolcano · 2017-04-14 13:32:55 -05:00
  0a89e7deb8
• Cleanup + AppVeyor fixes
  ColdVolcano · 2017-04-14 13:10:59 -05:00
  b7d61add45
• Show song in MusicController and SongSelect
  ColdVolcano · 2017-04-14 12:59:15 -05:00
  b5fc84087f
• More smoothness when MenuMusic is false
  ColdVolcano · 2017-04-14 12:58:47 -05:00
  2eb73a7c70
• Get MenuMusic and MenuVoice woking
  ColdVolcano · 2017-04-14 12:42:42 -05:00
  2a9f4e6950
• Merge branch 'master' into song-progress-graph
  Dean Herbert · 2017-04-14 19:24:13 +09:00
  9d753a7798
• Encapsulate progress update logic better.
  Dean Herbert · 2017-04-14 18:23:34 +09:00
  ea0631ede8
• Hook up beatmap object density to progress display.
  Dean Herbert · 2017-04-14 17:58:37 +09:00
  acd7a5b254
• Fix SongProgress handling escape.
  Dean Herbert · 2017-04-14 15:27:24 +09:00
  6421f040dd
• Fix incorrect default state. Handle input better.
  Dean Herbert · 2017-04-14 14:40:52 +09:00
  8c41707ac7
• Merge remote-tracking branch 'upstream/master' into song-progress-graph

  # Conflicts:
  #	osu.Game/Overlays/DragBar.cs

  Dean Herbert · 2017-04-14 11:25:00 +09:00
  09195a03a2
• Merge remote-tracking branch 'upstream/master' into peppy/pause-clean-up

  # Conflicts:
  #	osu.Game/Screens/Play/FailOverlay.cs
  #	osu.Game/Screens/Play/PauseOverlay.cs

  Dean Herbert · 2017-04-14 01:07:34 +09:00
  9bf861d0a4
• Add exception for failing.
  Dean Herbert · 2017-04-13 19:13:09 +09:00
  262a2c9f0e
• Use interpolatedSourceClock's IsRunning value for consistency.
  Dean Herbert · 2017-04-13 18:31:23 +09:00
  5f8baf874d
• Fix MosueUp and HighResolution events not being handled by MenuOverlays.
  Dean Herbert · 2017-04-13 13:03:07 +09:00
  1f4e0b0251
• Improve "escape" pressing logic in pause/fail menus.
  Dean Herbert · 2017-04-13 12:40:00 +09:00
  359fea7e25
• Fix thread race conditions on pausing close to a fail.
  Dean Herbert · 2017-04-13 11:41:08 +09:00
  94bf1d65b6
• Merge branch 'master' into master
  ocboogie · 2017-04-12 15:04:27 -07:00
  7b240d84da
• Metric -> Metrics.
  Dean Herbert · 2017-04-12 21:09:39 +09:00
  2c3fa30386
• Removed unneeded using
  ocboogie · 2017-04-12 04:54:24 -07:00
  32b87d12b5
• Merge branch 'master' into details
  Dean Herbert · 2017-04-12 20:25:51 +09:00
  157ad17606
• Some more clean up
  ocboogie · 2017-04-12 04:01:52 -07:00
  6c6ef946bd
• Fixed repeat keys working for retrying
  ocboogie · 2017-04-12 02:50:03 -07:00
  d250dde537
• Fixed repeat keys working for resuming
  ocboogie · 2017-04-12 02:43:42 -07:00
  348dd71406
• remove ??
  Jorolf · 2017-04-12 11:25:32 +02:00
  98ce9e0724
• fails, retries and size not enforced
  Jorolf · 2017-04-12 11:05:10 +02:00
  e285d33f8c
• requested changes
  Jorolf · 2017-04-12 10:52:24 +02:00
  d2affe6867
• Fixed pause and fail screen overlap
  ocboogie · 2017-04-12 00:20:41 -07:00
  8cad09370d
• Match stable search parameters
  ColdVolcano · 2017-04-11 18:07:54 -05:00
  50cb9e0fe7
• condensed some commits because they were small or already reversed
  Jorolf · 2017-04-11 22:48:53 +02:00
  ed2f5d210e
• Merge branch 'master' into details
  Jorolf · 2017-04-11 19:06:58 +02:00
  50b6bcd574
• the power of linq
  Jorolf · 2017-04-11 18:43:48 +02:00
  d4e5f55091
• Merge branch 'master' into leaderboard-api
  Dan Balasescu · 2017-04-12 00:14:24 +09:00
  3b60ca3c1c
• I helped.
  Dan Balasescu · 2017-04-12 00:09:45 +09:00
  bc98e53aff
• fix
  Jorolf · 2017-04-11 14:40:12 +02:00
  9026880495