19824 Commits

This Branch

This Branch

All Branches

• Update access of WorkingBeatmap.
  Huo Yaoyuan · 2016-11-06 00:13:45 +08:00
  5eed07db57
• Merge branch 'master'
  Huo Yaoyuan · 2016-11-06 00:11:30 +08:00
  c470140d64
• Merge pull request #136 from Tom94/general-fixes

  Fix wrong initial state of beatmap panels.

  Dean Herbert · 2016-11-05 23:04:37 +09:00
  3c8f94dd0f
• Merge pull request #133 from peppy/hitcircle-revision-2

  Hitcircles v2

  Thomas Müller · 2016-11-05 14:50:35 +01:00
  945856b559
• Fix broken tests.
  Dean Herbert · 2016-11-05 22:48:32 +09:00
  cc140c9634
• Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2
  Thomas Müller · 2016-11-05 14:05:42 +01:00
  7c7e2160ec
• Fix indentation and typo.
  Thomas Müller · 2016-11-05 13:51:52 +01:00
  619d97c642
• Merge pull request #135 from huoyaoyuan/thread-safety

  Add lock on each property of WorkingBeatmap.

  Dean Herbert · 2016-11-05 21:35:30 +09:00
  a859a90b56
• 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 lock object.
  Huo Yaoyuan · 2016-11-05 20:21:08 +08:00
  e69dac7745
• Add lock on each property of WorkingBeatmap.
  Huo Yaoyuan · 2016-11-05 20:01:46 +08:00
  f2b37e1fe7
• Fix wrong initial state of beatmap panels.
  Thomas Müller · 2016-11-05 12:24:15 +01:00
  ba39a9df8e
• Merge pull request #134 from peppy/beatmap-backgrounds

  Add beatmap backgrounds to song select.

  Dean Herbert · 2016-11-05 20:12:39 +09:00
  223a9c6282
• Update framework.
  Dean Herbert · 2016-11-05 20:06:04 +09:00
  76e6931a59
• Add beatmap backgrounds.
  Dean Herbert · 2016-11-05 20:00:14 +09:00
  a11d534067
• Merge pull request #128 from peppy/more-fonts

  Add full Exo font set.

  Dean Herbert · 2016-11-05 18:34:05 +09:00
  060081fecc
• Add full Exo font set and bring song select panels closer to final design.
  Dean Herbert · 2016-11-05 18:22:09 +09:00
  7cc19d74c6
• Merge pull request #132 from peppy/general-fixes

  General fixes & framework update.

  Dean Herbert · 2016-11-05 18:20:45 +09:00
  627cd12a9e
• 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