3708 Commits

This Branch

This Branch

All Branches

• Make a RulesetDatabase.
  Dean Herbert · 2017-04-17 17:43:48 +09:00
  a4e2f34ee7
• Move SQLite connections out of database classes; make abstract Database.
  Dean Herbert · 2017-04-17 14:37:52 +09:00
  83b083ce64
• Merge remote-tracking branch 'upstream/master' into remove-playmode
  Dean Herbert · 2017-04-17 13:00:53 +09:00
  ce12cc20bd
• Update forgotten submodule.
  Dean Herbert · 2017-04-16 22:40:29 +09:00
  6239eab233
• Merge pull request #637 from Dormanil/CS7-migration

  Explicitly set language version to C# 6.0 for now.

  Dean Herbert · 2017-04-16 20:37:31 +09:00
  ce5d48b86c
• Update framework.
  Dean Herbert · 2017-04-16 20:15:36 +09:00
  fbda181769
• Explicitly set C# 6.0 for now.
  Adrian Kaz Scherzinger · 2017-04-16 06:44:08 +09:00
  60f7879875
• 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
• Remove unused usings.
  smoogipooo · 2017-04-15 05:57:18 +09:00
  0333e1a050
• Add comment.
  smoogipooo · 2017-04-15 05:55:38 +09:00
  3845ab2a72
• Re-implement config value.
  smoogipooo · 2017-04-15 05:52:58 +09:00
  6dbc75283c
• 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 pull request #363 from DrabWeb/song-progress-graph

  Song Progress

  Dan Balasescu · 2017-04-15 01:37:25 +09:00
  v2017.415.0 9927f9aca5
• Trim whitespace.
  Dan Balasescu · 2017-04-15 01:31:42 +09:00
  31ce66bfdc
• Merge branch 'master' into song-progress-graph
  Dan Balasescu · 2017-04-15 01:29:02 +09:00
  3de3b94978
• Merge pull request #633 from peppy/hud-improvements

  Rearrange HUD elements

  Dan Balasescu · 2017-04-14 23:50:08 +09:00
  b247a7c3c3
• Fix errors.
  Dean Herbert · 2017-04-14 20:17:17 +09:00
  52ddc414d5
• Make comma separators optional.
  Dean Herbert · 2017-04-14 20:09:01 +09:00
  ed3956eca5
• Merge remote-tracking branch 'upstream/master' into hud-improvements

  # Conflicts:
  #	osu.Game.Modes.Osu/Scoring/OsuScoreProcessor.cs

  Dean Herbert · 2017-04-14 19:29:59 +09:00
  ac3b435f00
• Merge branch 'master' into song-progress-graph
  Dean Herbert · 2017-04-14 19:24:13 +09:00
  9d753a7798
• Improve test case.
  Dean Herbert · 2017-04-14 19:23:33 +09:00
  627114abec
• Fix unsynchronised tweening.
  Dean Herbert · 2017-04-14 19:20:07 +09:00
  98544a8077
• 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 pull request #631 from peppy/pause-clean-up

  Pause clean up

  Dean Herbert · 2017-04-14 11:22:15 +09:00
  d2fd3f1e0c
• 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
• Merge pull request #629 from peppy/general-fixes

  General fixes

  Dan Balasescu · 2017-04-14 01:05:26 +09:00
  9b44ff3b8e
• Update framework.
  Dean Herbert · 2017-04-14 00:57:57 +09:00
  e62922ba64
• 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
• Give CursorTrail its own clock for the time being.
  Dean Herbert · 2017-04-13 14:14:12 +09:00
  13f057f900
• 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
• Expose AccentColour/GlowColour from hud elements, and set from HudOverlay.
  smoogipooo · 2017-04-13 10:04:12 +09:00
  3054697f98
• Merge branch 'master' into master
  ocboogie · 2017-04-12 15:04:27 -07:00
  7b240d84da
• Merge pull request #574 from Jorolf/details

  Beatmap Details

  Dean Herbert · 2017-04-12 21:19:14 +09:00
  v2017.412.0 37d458e562
• Metric -> Metrics.
  Dean Herbert · 2017-04-12 21:09:39 +09:00
  2c3fa30386
• Better comments.
  Dean Herbert · 2017-04-12 21:08:28 +09:00
  00cd2c8372
• Removed unneeded using
  ocboogie · 2017-04-12 04:54:24 -07:00
  32b87d12b5
• Use formatter to add zeroes.
  smoogipooo · 2017-04-12 20:28:04 +09:00
  2987a57588
• Merge branch 'master' into details
  Dean Herbert · 2017-04-12 20:25:51 +09:00
  157ad17606
• Merge pull request #622 from peppy/sliderbar-improvements

  Add special SliderBar sound behaviour when at extents.

  Dean Herbert · 2017-04-12 20:24:53 +09:00
  cfacfe8294
• Remove unused using.
  Dan Balasescu · 2017-04-12 20:14:12 +09:00
  5bf71aae9c