6229 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into parallax-requires-position
  Dean Herbert · 2017-03-23 22:52:06 +09:00
  f218066f83
• Update framework.
  Dean Herbert · 2017-03-23 22:42:50 +09:00
  1c404cba5c
• ParallaxContainer should always know the mouse position.
  Dean Herbert · 2017-03-23 22:42:40 +09:00
  0bcb463acf
• Formatting
  DrabWeb · 2017-03-23 09:07:13 -03:00
  0a11d035fe
• More proper fix
  DrabWeb · 2017-03-23 09:05:53 -03:00
  b429d8f1b3
• Merge branch 'master' into song-select-improvements
  Dan Balasescu · 2017-03-23 20:36:18 +09:00
  c533650c26
• Attempt to speed up CI by excluding some file types from analysis.
  Dean Herbert · 2017-03-23 20:34:24 +09:00
  c52ad6c6ee
• Fix nullref.
  smoogipooo · 2017-03-23 20:34:11 +09:00
  c3adbb9b41
• Fix for the fix
  DrabWeb · 2017-03-23 08:32:24 -03:00
  3364801221
• Merge branch 'master' into song-select-improvements
  Dan Balasescu · 2017-03-23 20:25:38 +09:00
  8901d6137e
• Fix bottom square being clipped
  DrabWeb · 2017-03-23 08:13:03 -03:00
  bbca6cf602
• Make readonly.
  smoogipooo · 2017-03-23 19:43:49 +09:00
  60dcf2d14d
• Fix post-merge errors.
  smoogipooo · 2017-03-23 19:43:00 +09:00
  315deb6f12
• Merge branch 'taiko_drumroll_tick_judgements' into taiko_drumroll_drawable
  smoogipooo · 2017-03-23 19:40:14 +09:00
  217fd14595
• Fix post-merge errors.
  smoogipooo · 2017-03-23 19:39:30 +09:00
  a0c0a0fcfe
• Dragging
  DrabWeb · 2017-03-23 07:38:08 -03:00
  938f5eaf58
• Merge branch 'taiko_drumroll_tick_judgements' into taiko_scoreprocessing

  Conflicts:
  	osu.Game.Modes.Taiko/TaikoScoreProcessor.cs

  smoogipooo · 2017-03-23 19:38:00 +09:00
  99cd215f56
• Rename drum roll tick judgement.
  smoogipooo · 2017-03-23 19:36:58 +09:00
  35f1f06ee2
• Pressing back while mod select is visible should close mod select before exiting.
  Dean Herbert · 2017-03-23 19:35:46 +09:00
  63d7c5a5a3
• Merge remote-tracking branch 'origin/master' into taiko_drumroll_tick_judgements

  Conflicts:
  	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj

  smoogipooo · 2017-03-23 19:35:36 +09:00
  11fb404574
• Merge pull request #543 from peppy/rename-judgement-info

  JudgementInfo -> Judgement.

  Dan Balasescu · 2017-03-23 19:34:43 +09:00
  672fda79bd
• Tidy up song select footer and fix depth of mod select vs osu! cookie.
  Dean Herbert · 2017-03-23 19:32:58 +09:00
  8c4fd44a85
• Formatting
  DrabWeb · 2017-03-23 07:24:43 -03:00
  ca2816f9c8
• Implement Taiko score processing.
  smoogipooo · 2017-03-23 19:24:23 +09:00
  322a78830e
• Delete SongProgressGraphColumn.cs
  DrabWeb · 2017-03-23 07:20:16 -03:00
  3923892863
• Merge branch 'song-progress-graph' of https://github.com/DrabWeb/osu into song-progress-graph
  DrabWeb · 2017-03-23 07:15:53 -03:00
  546a3d0914
• Make TaikoHitObject store whether the hit object is a finisher.
  smoogipooo · 2017-03-23 19:14:21 +09:00
  768bc2bb5f
• JudgementInfo -> Judgement.

  There is no case where we use the term "Judgement" without the suffix, so deemed it unnecessary.

  Dean Herbert · 2017-03-23 19:00:18 +09:00
  2cb801317d
• Fix regression of osu! judgement animation.
  Dean Herbert · 2017-03-23 18:56:27 +09:00
  93915ba527
• Cleaning
  DrabWeb · 2017-03-23 06:37:12 -03:00
  0337f18fb9
• some fixing and restyling.
  Dean Herbert · 2017-03-23 18:20:00 +09:00
  b5d661b53a
• Merge branch 'taiko_drumroll_tick_judgements' into taiko_scoreprocessing
  smoogipooo · 2017-03-23 17:58:12 +09:00
  7d3846692a
• Merge branch 'taiko_drumroll_tick_judgements' into taiko_drumroll_drawable

  Conflicts:
  	osu.Game.Modes.Taiko/Judgements/TaikoDrumRollTickJudgementInfo.cs

  smoogipooo · 2017-03-23 17:55:52 +09:00
  71c74ee4c2
• Merge branch 'master' into taiko_drumroll_drawable
  Dan Balasescu · 2017-03-23 17:55:08 +09:00
  2d5bb326f0
• Add DrumRoll tick judgement info.
  smoogipooo · 2017-03-23 17:52:46 +09:00
  0ac33b59e3
• Merge branch 'master' into song-progress-graph
  Dean Herbert · 2017-03-23 17:44:22 +09:00
  4d61424abd
• Merge pull request #541 from smoogipooo/use_more_accentcolour

  Use more accentcolour

  Dean Herbert · 2017-03-23 17:42:50 +09:00
  v2017.323.0 6e42a75fca
• Merge pull request #512 from smoogipooo/taiko_hitobject_drawable

  Base DrawableTaikoHitObject Implementation

  Dean Herbert · 2017-03-23 17:42:34 +09:00
  770188fee1
• Merge branch 'master' into taiko_hitobject_drawable
  Dean Herbert · 2017-03-23 17:36:50 +09:00
  19e438566f
• Merge branch 'master' into use_more_accentcolour
  Dean Herbert · 2017-03-23 17:36:19 +09:00
  d52ac33e7c
• Increase timeout on IPC wait.
  Dean Herbert · 2017-03-23 17:32:57 +09:00
  a61cb078e3
• Merge branch 'master' into taiko_hitobject_drawable
  Dean Herbert · 2017-03-23 17:23:22 +09:00
  96fc8eef30
• Merge pull request #503 from smoogipooo/taiko_conversion

  Taiko conversion

  Dean Herbert · 2017-03-23 17:21:18 +09:00
  76ae3a8a03
• Merge pull request #539 from DrabWeb/beatmap-detail-tabs

  Beatmap detail area

  Dan Balasescu · 2017-03-23 17:20:47 +09:00
  50543a164c
• Change default OsuHitObject combo colour to gray

  This makes it easier to see additive elements in testcases.

  Dean Herbert · 2017-03-23 17:15:39 +09:00
  0785dd8528
• Merge branch 'master' into beatmap-detail-tabs
  Dan Balasescu · 2017-03-23 17:13:02 +09:00
  e9a061c709
• Fix SliderBody's accent colour and thread-safety.
  Dean Herbert · 2017-03-23 17:11:51 +09:00
  4644f6afdb
• Merge branch 'master' into taiko_conversion
  Dean Herbert · 2017-03-23 16:57:23 +09:00
  554b36c6eb
• Fix missing class renames.
  Dean Herbert · 2017-03-23 16:56:42 +09:00
  43032ef694
• Update framework.
  Dean Herbert · 2017-03-23 16:53:39 +09:00
  1766497728