62006 Commits

This Branch

This Branch

All Branches

• Fix thread safety issue when accessing files in beatmap (zip) files.
  Dean Herbert · 2016-11-05 18:19:01 +09:00
  8fe63689a4
• 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
• Add explicit privates.
  Dean Herbert · 2016-11-04 16:12:35 +09:00
  10f2ed4387
• Share Triangles logic.
  Dean Herbert · 2016-11-04 16:11:22 +09:00
  b17d219ace
• Fix regression in hitcircle appearance.
  Dean Herbert · 2016-11-04 16:08:04 +09:00
  108b7092c9
• Fix draw order of hitobjects.
  Dean Herbert · 2016-11-04 15:43:53 +09:00
  9df43c6d33
• Fix off-by-one colour retrieval.
  Dean Herbert · 2016-11-04 15:43:53 +09:00
  da18e2d4f6
• Only add valid hitobjects.
  Dean Herbert · 2016-11-04 15:43:53 +09:00
  b72e9221fd
• Fix input not working.
  Dean Herbert · 2016-11-04 15:43:53 +09:00
  74c655ebfc
• Add HitObject colours back in the mix.
  Dean Herbert · 2016-11-04 15:43:53 +09:00
  b40ccccbe4
• 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 incorrect default values.
  Dean Herbert · 2016-11-04 15:43:53 +09:00
  f5f5aa9eac
• Flush recursively, more transform tidying.
  Dean Herbert · 2016-11-04 15:43:53 +09:00
  a4e2f25065
• Add hit time and the ability for an external operator to block hits.
  Dean Herbert · 2016-11-04 15:43:53 +09:00
  1854160321
• Limit state changes to apply only once.
  Dean Herbert · 2016-11-04 15:43:53 +09:00
  fbaae94ba4
• Part -> Layer.
  Dean Herbert · 2016-11-04 15:43:53 +09:00
  8d4e7038b3
• Scale up TestCaseHitObjects so detail is a bit more visible.
  Dean Herbert · 2016-11-04 15:43:53 +09:00
  7e6d5a28b1
• Fix some warnings.
  Dean Herbert · 2016-11-04 15:40:05 +09:00
  bc53642cab
• Merge pull request #123 from SirCmpwn/options

  Options part one

  Dean Herbert · 2016-11-04 12:42:36 +09:00
  71045169f6
• Block mouse events from hitting things behind options.
  Dean Herbert · 2016-11-04 12:29:05 +09:00
  10e5472624
• Make options semi-transparent.
  Dean Herbert · 2016-11-04 12:28:00 +09:00
  2135b93791
• Fix some events not firing correctly.
  Dean Herbert · 2016-11-04 12:27:43 +09:00
  f3d461e318
• Update submodules
  Drew DeVault · 2016-11-03 23:08:02 -04:00
  a586e5a5ba
• Refactor options header and layout stuff
  Drew DeVault · 2016-11-03 23:01:11 -04:00
  408173319b
• Rework how references are passed about
  Drew DeVault · 2016-11-03 22:43:00 -04:00
  cb40b7079f
• Fix OpenTK reference in osu.Desktop.VisualTests
  Drew DeVault · 2016-11-03 19:06:22 -04:00
  55821a1a2b
• Split out [Sub]sections into seperate files
  Drew DeVault · 2016-11-03 19:06:22 -04:00
  af8e4415c3
• Add remaining options
  Drew DeVault · 2016-11-03 19:06:22 -04:00
  1d8c6db0a7
• Add more options
  Drew DeVault · 2016-11-03 19:06:22 -04:00
  c7fa0a5ab0
• Add Graphics options
  Drew DeVault · 2016-11-03 19:06:22 -04:00
  7e77efcfdc
• Add OsuButton with sane defaults
  Drew DeVault · 2016-11-03 19:06:22 -04:00
  6c0cef894e
• Split up options into subclasses
  Drew DeVault · 2016-11-03 19:06:22 -04:00
  2aa85a4b18
• Tweak style to more closely match osu!next
  Drew DeVault · 2016-11-03 19:06:22 -04:00
  2f990b884e
• Add default values from old osu
  Drew DeVault · 2016-11-03 19:06:22 -04:00
  40e667b2d8
• Import enum from old osu
  Drew DeVault · 2016-11-03 19:06:22 -04:00
  89d3f4c2be
• Add options from old osu
  Drew DeVault · 2016-11-03 19:06:22 -04:00
  dd0cb5da01
• Implement General options section
  Drew DeVault · 2016-11-03 19:06:22 -04:00
  9f78f8607b
• Implement config persistence through BasicStorage
  Drew DeVault · 2016-11-03 19:06:22 -04:00
  2aaff01675
• Use PreLoad on music controller.
  Huo Yaoyuan · 2016-11-03 22:38:10 +08:00
  9e0fbed748
• Merge branch 'master'
  Huo Yaoyuan · 2016-11-03 20:38:34 +08:00
  f2a8cc0c29
• Merge pull request #119 from peppy/async-workflow

  Async Workflow

  Dean Herbert · 2016-11-03 17:08:00 +09:00
  6f16a6a6d4
• Fix ImportBeatmapTest.
  Dean Herbert · 2016-11-03 16:59:16 +09:00
  7a54fdfffb
• Merge remote-tracking branch 'refs/remotes/upstream/master' into async-workflow
  Dean Herbert · 2016-11-03 16:44:49 +09:00
  439204b4fa
• Update framework.
  Dean Herbert · 2016-11-03 16:41:54 +09:00
  046d51e39e
• Merge pull request #121 from Tom94/better-glow

  Use better glow in beatmap selection.

  Dean Herbert · 2016-11-02 16:49:32 +09:00
  5c93ab3ecc
• Update framework.
  Dean Herbert · 2016-11-02 16:47:24 +09:00
  14ff355b18
• Merge remote-tracking branch 'refs/remotes/upstream/master' into better-glow

  # Conflicts:
  #	osu.Game/Beatmaps/Drawable/Panel.cs

  Dean Herbert · 2016-11-02 16:43:35 +09:00
  54dbb0a355