11620 Commits

This Branch

This Branch

All Branches

• 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
• 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
• Change SearchableListOverlay to use OsuTabControl strip.
  DrabWeb · 2018-03-29 15:34:53 -03:00
  3d05798d80
• Add optional strip to OsuTabControl.
  DrabWeb · 2018-03-29 15:29:45 -03:00
  f43b009b96
• Merge pull request #2326 from peppy/rider-configuration

  Add rider run/debug configurations

  Dan Balasescu · 2018-03-29 19:27:48 +09:00
  33b38b68cc
• Update framework
  Dean Herbert · 2018-03-29 18:56:36 +09:00
  ce6a61a5b7
• Merge remote-tracking branch 'upstream/master' into rider-configuration
  Dean Herbert · 2018-03-29 18:55:59 +09:00
  487c25c3dd
• Merge pull request #2325 from smoogipoo/fix-mania-sounds

  Fix mania playing the wrong/duplicated sounds on playfield keypress

  Dean Herbert · 2018-03-29 17:46:29 +09:00
  4cc478d9f7
• Force build before run
  Dean Herbert · 2018-03-29 17:17:33 +09:00
  173f79f7b6
• Remove silly stuff
  Dean Herbert · 2018-03-29 17:08:06 +09:00
  49c8bc44ad
• Add rider run/debug configurations
  Dean Herbert · 2018-03-29 16:55:38 +09:00
  5c4b0c2b8d
• FIx mania playfield playing the wrong/duplicated sounds

  Fixes #2266.

  smoogipoo · 2018-03-29 16:13:31 +09:00
  bb7618eb0c
• Make hitobjects sorted by their start times
  smoogipoo · 2018-03-29 16:07:31 +09:00
  187a025d36
• Merge pull request #2321 from peppy/fix-visual-tests

  Make VisualTests/nUnit work again

  Dan Balasescu · 2018-03-29 12:58:56 +09:00
  fcf0b25fa0
• Update framework
  smoogipoo · 2018-03-29 12:47:24 +09:00
  cc35b1ab64
• Add back osu.Desktop versions (used in deploy)
  smoogipoo · 2018-03-29 12:47:17 +09:00
  687c889345
• Add .vscode configurations for ruleset test projects
  smoogipoo · 2018-03-29 12:26:32 +09:00
  d83e4dfd24
• Update framework
  Dean Herbert · 2018-03-28 18:09:18 +09:00
  01116a73a3