11636 Commits

This Branch

This Branch

All Branches

• ScrollableTimeline -> TimelineContainer
  smoogipoo · 2018-04-05 19:33:25 +09:00
  f41d31e1db
• Encapsulate zoom logic into a separate class
  smoogipoo · 2018-04-05 19:30:54 +09:00
  9a9ed1d630
• waveformContainer -> zoomedContent
  smoogipoo · 2018-04-05 19:08:10 +09:00
  0141cbebba
• Expose zoom publicly again, re-enable zoom buttons
  smoogipoo · 2018-04-05 19:05:19 +09:00
  8da3c2c52a
• Reduce ctor arguments
  smoogipoo · 2018-04-05 19:04:07 +09:00
  35e116cb12
• Make zoom an int again
  smoogipoo · 2018-04-05 18:41:22 +09:00
  eff5eddbe9
• Re-implement mousewheel zoom
  smoogipoo · 2018-04-05 18:37:51 +09:00
  074dee3a83
• A bit of cleanup
  smoogipoo · 2018-04-05 17:07:41 +09:00
  e3af32ad2f
• Implement half-width overflows
  smoogipoo · 2018-04-05 17:07:00 +09:00
  9bb3e56bb3
• Temporarily remove zoom levels, simplify scrollingtimelinecontainer
  smoogipoo · 2018-04-05 16:12:21 +09:00
  e7aa1d9c38
• Make scrollabletimeline use gridcontainer
  smoogipoo · 2018-04-05 16:07:33 +09:00
  870ce8868c
• Merge pull request #2348 from smoogipoo/fix-catch-auto

  Fix osu!catch autoplay missing starts/ends of JuiceStreams

  Dean Herbert · 2018-04-04 19:02:11 +09:00
  0b7432d3db
• Rename test to signify it's got auto enabled
  Dean Herbert · 2018-04-04 18:48:24 +09:00
  e69951b59f
• Merge branch 'master' into fix-catch-auto
  Dean Herbert · 2018-04-04 18:30:55 +09:00
  13747966a0
• Merge pull request #2349 from smoogipoo/editor-no-judgements

  Don't display judgements in OsuEditPlayfield

  Dean Herbert · 2018-04-04 17:23:03 +09:00
  ad10bbe0ef
• Don't display judgements in OsuEditPlayfield
  smoogipoo · 2018-04-04 17:12:41 +09:00
  d4cb00e08f
• Merge pull request #2336 from Frontear/colours-for-judgements

  Implement Judgement Colours

  Dan Balasescu · 2018-04-04 16:30:52 +09:00
  9558554ab9
• Fix osu!catch autoplay missing starts/ends of JuiceStreams

  Fixes #2328.
  
  Would only happen when ticks and ends were spaced too far apart (or there were no ticks in a juicestream).

  smoogipoo · 2018-04-04 16:24:03 +09:00
  364c3bca06
• Merge branch 'master' into colours-for-judgements
  Dan Balasescu · 2018-04-04 15:13:52 +09:00
  d418a4803f
• Split local variable assignment from construction of children
  Dan Balasescu · 2018-04-04 15:13:42 +09:00
  bed46b1f7e
• Merge pull request #2331 from DrabWeb/osu-tab-strip

  Tab strip

  Dan Balasescu · 2018-04-04 15:12:44 +09:00
  fc09970bc5
• Remove extra whitespace

  In general we don't really do this elsewhere in the codebase.

  Dan Balasescu · 2018-04-04 15:11:16 +09:00
  9df525a38d
• Use Interpolation function directly for resizing tab strips.
  DrabWeb · 2018-04-04 03:04:26 -03:00
  65f0e91734
• Merge branch 'master' into colours-for-judgements
  Dan Balasescu · 2018-04-04 15:02:03 +09:00
  b5d7a5df00
• Merge branch 'master' into osu-tab-strip
  Dan Balasescu · 2018-04-04 14:20:06 +09:00
  6dfca4b2fa
• Merge pull request #2340 from huoyaoyuan/linq

  Use Linq.Append and Prepend.

  Dean Herbert · 2018-04-03 13:14:18 +09:00
  30de2671fd
• Merge remote-tracking branch 'upstream/master' into linq
  Dean Herbert · 2018-04-03 13:05:08 +09:00
  ddba7254ca
• Update framework
  Dean Herbert · 2018-04-03 13:05:01 +09:00
  0065724992
• Merge pull request #2339 from smoogipoo/scalablecontainer-size-fix

  Fix ScalableContainer irrepairably altering content size

  Dean Herbert · 2018-04-03 12:02:56 +09:00
  8eefddd475
• Merge branch 'master' into scalablecontainer-size-fix
  Dean Herbert · 2018-04-03 11:29:36 +09:00
  77189073b2
• Merge pull request #2342 from smoogipoo/fix-formatexception-beatmap

  Handle possible FormatException when parsing timing points

  Dean Herbert · 2018-04-02 20:20:35 +09:00
  25524bf24f
• Handle timingpoint FormatException
  smoogipoo · 2018-04-02 20:08:40 +09:00
  fd9480cfb6
• De-pluralize some methods
  smoogipoo · 2018-04-02 20:07:18 +09:00
  d24d81d8a9
• Merge pull request #2308 from johnneijzen/Small-Clean-Up

  Set Correct values for addDelayedMovements() function

  Dan Balasescu · 2018-04-02 14:33:20 +09:00
  ad4f38f109
• Merge branch 'master' into Small-Clean-Up
  Dan Balasescu · 2018-04-02 14:13:15 +09:00
  d7b61b3c09
• Merge pull request #2288 from FreezyLemon/fix-songselect-exit-notimplemented

  Fix Player trying to load DummyWorkingBeatmap and failing

  Dan Balasescu · 2018-04-02 14:07:40 +09:00
  7a2345959e
• Merge branch 'master' into fix-songselect-exit-notimplemented
  Dan Balasescu · 2018-04-02 13:54:06 +09:00
  83dcff2907
• Merge pull request #2335 from peppy/fix-file-extension-matching

  Fix skin path being ignored in extension agnostic lookups

  Dan Balasescu · 2018-04-02 13:53:54 +09:00
  7bcb86dc3c
• Merge branch 'master' into fix-songselect-exit-notimplemented
  Dan Balasescu · 2018-04-02 13:53:41 +09:00
  32832304a7
• Merge branch 'master' into fix-file-extension-matching
  Dan Balasescu · 2018-04-02 13:27:14 +09:00
  323534c721
• Use Linq.Append and Prepend.
  Huo Yaoyuan · 2018-04-02 12:06:34 +08:00
  b842f682eb
• Fix ScalableContainer irrepairably altering content size
  smoogipoo · 2018-04-02 13:06:06 +09:00
  551ba6ac4b
• Implement Judgement Colours
  Ali Rizvi · 2018-03-31 04:59:08 +09:00
  7fed8d64de
• Merge pull request #2320 from DrabWeb/beatmap-set-status

  Add ranked status and video marker to beatmap overlay and panels

  Dean Herbert · 2018-03-30 21:07:05 +09:00
  cc70f7182a
• Merge branch 'master' into beatmap-set-status
  Dean Herbert · 2018-03-30 20:55:36 +09:00
  cf3cafd9a9
• Fix skin path being ignored in extension agnostic lookups

  Closes #2295.

  Dean Herbert · 2018-03-30 18:06:18 +09:00
  c39f056b3b
• Merge pull request #2333 from Joehuu/hr-on-mania-is-unranked

  Revert changes on hard rock mod

  Dean Herbert · 2018-03-30 17:54:07 +09:00
  7b34c83916
• Merge branch 'master' into hr-on-mania-is-unranked
  Dan Balasescu · 2018-03-30 16:35:00 +09:00
  824201336a
• Revert changes on hard rock mod
  Joseph Madamba · 2018-03-29 20:36:52 -07:00
  0887dafa2c
• Fix tab strip in BreadcrumbControl, allow strip height to be overriden.
  DrabWeb · 2018-03-29 15:41:27 -03:00
  e3218250d5