Commit Graph

11629 Commits

Author SHA1 Message Date
fdb3227fd7 Fix + cleanup testcases 2018-04-06 18:12:44 +09:00
c7abd56fc4 Give editor a custom clock to handle seeking 2018-04-06 18:11:37 +09:00
e120b0edae Merge pull request #2352 from peppy/remove-test-testcase
Remove TestTestCase
2018-04-05 17:13:15 +09:00
37fb207abd Remove TestTestCase
No longer necessary as we have restructured tests considerably.
2018-04-05 16:01:33 +09:00
0b7432d3db Merge pull request #2348 from smoogipoo/fix-catch-auto
Fix osu!catch autoplay missing starts/ends of JuiceStreams
2018-04-04 19:02:11 +09:00
e69951b59f Rename test to signify it's got auto enabled 2018-04-04 18:48:24 +09:00
13747966a0 Merge branch 'master' into fix-catch-auto 2018-04-04 18:30:55 +09:00
ad10bbe0ef Merge pull request #2349 from smoogipoo/editor-no-judgements
Don't display judgements in OsuEditPlayfield
2018-04-04 17:23:03 +09:00
d4cb00e08f Don't display judgements in OsuEditPlayfield 2018-04-04 17:12:41 +09:00
9558554ab9 Merge pull request #2336 from Frontear/colours-for-judgements
Implement Judgement Colours
2018-04-04 16:30:52 +09:00
364c3bca06 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).
2018-04-04 16:24:03 +09:00
d418a4803f Merge branch 'master' into colours-for-judgements 2018-04-04 15:13:52 +09:00
bed46b1f7e Split local variable assignment from construction of children 2018-04-04 15:13:42 +09:00
fc09970bc5 Merge pull request #2331 from DrabWeb/osu-tab-strip
Tab strip
2018-04-04 15:12:44 +09:00
9df525a38d Remove extra whitespace
In general we don't really do this elsewhere in the codebase.
2018-04-04 15:11:16 +09:00
65f0e91734 Use Interpolation function directly for resizing tab strips. 2018-04-04 03:04:26 -03:00
b5d7a5df00 Merge branch 'master' into colours-for-judgements 2018-04-04 15:02:03 +09:00
6dfca4b2fa Merge branch 'master' into osu-tab-strip 2018-04-04 14:20:06 +09:00
30de2671fd Merge pull request #2340 from huoyaoyuan/linq
Use Linq.Append and Prepend.
2018-04-03 13:14:18 +09:00
ddba7254ca Merge remote-tracking branch 'upstream/master' into linq 2018-04-03 13:05:08 +09:00
0065724992 Update framework 2018-04-03 13:05:01 +09:00
8eefddd475 Merge pull request #2339 from smoogipoo/scalablecontainer-size-fix
Fix ScalableContainer irrepairably altering content size
2018-04-03 12:02:56 +09:00
77189073b2 Merge branch 'master' into scalablecontainer-size-fix 2018-04-03 11:29:36 +09:00
25524bf24f Merge pull request #2342 from smoogipoo/fix-formatexception-beatmap
Handle possible FormatException when parsing timing points
2018-04-02 20:20:35 +09:00
fd9480cfb6 Handle timingpoint FormatException 2018-04-02 20:08:40 +09:00
d24d81d8a9 De-pluralize some methods 2018-04-02 20:07:18 +09:00
ad4f38f109 Merge pull request #2308 from johnneijzen/Small-Clean-Up
Set Correct values for addDelayedMovements() function
2018-04-02 14:33:20 +09:00
d7b61b3c09 Merge branch 'master' into Small-Clean-Up 2018-04-02 14:13:15 +09:00
7a2345959e Merge pull request #2288 from FreezyLemon/fix-songselect-exit-notimplemented
Fix Player trying to load DummyWorkingBeatmap and failing
2018-04-02 14:07:40 +09:00
83dcff2907 Merge branch 'master' into fix-songselect-exit-notimplemented 2018-04-02 13:54:06 +09:00
7bcb86dc3c Merge pull request #2335 from peppy/fix-file-extension-matching
Fix skin path being ignored in extension agnostic lookups
2018-04-02 13:53:54 +09:00
32832304a7 Merge branch 'master' into fix-songselect-exit-notimplemented 2018-04-02 13:53:41 +09:00
323534c721 Merge branch 'master' into fix-file-extension-matching 2018-04-02 13:27:14 +09:00
b842f682eb Use Linq.Append and Prepend. 2018-04-02 12:06:34 +08:00
551ba6ac4b Fix ScalableContainer irrepairably altering content size 2018-04-02 13:06:06 +09:00
7fed8d64de Implement Judgement Colours 2018-03-31 04:59:08 +09:00
cc70f7182a Merge pull request #2320 from DrabWeb/beatmap-set-status
Add ranked status and video marker to beatmap overlay and panels
2018-03-30 21:07:05 +09:00
cf3cafd9a9 Merge branch 'master' into beatmap-set-status 2018-03-30 20:55:36 +09:00
c39f056b3b Fix skin path being ignored in extension agnostic lookups
Closes #2295.
2018-03-30 18:06:18 +09:00
7b34c83916 Merge pull request #2333 from Joehuu/hr-on-mania-is-unranked
Revert changes on hard rock mod
2018-03-30 17:54:07 +09:00
824201336a Merge branch 'master' into hr-on-mania-is-unranked 2018-03-30 16:35:00 +09:00
0887dafa2c Revert changes on hard rock mod 2018-03-29 20:36:52 -07:00
e3218250d5 Fix tab strip in BreadcrumbControl, allow strip height to be overriden. 2018-03-29 15:41:27 -03:00
3d05798d80 Change SearchableListOverlay to use OsuTabControl strip. 2018-03-29 15:34:53 -03:00
f43b009b96 Add optional strip to OsuTabControl. 2018-03-29 15:29:45 -03:00
33b38b68cc Merge pull request #2326 from peppy/rider-configuration
Add rider run/debug configurations
2018-03-29 19:27:48 +09:00
ce6a61a5b7 Update framework 2018-03-29 18:56:36 +09:00
487c25c3dd Merge remote-tracking branch 'upstream/master' into rider-configuration 2018-03-29 18:55:59 +09:00
4cc478d9f7 Merge pull request #2325 from smoogipoo/fix-mania-sounds
Fix mania playing the wrong/duplicated sounds on playfield keypress
2018-03-29 17:46:29 +09:00
173f79f7b6 Force build before run 2018-03-29 17:17:33 +09:00