Commit Graph

7089 Commits

Author SHA1 Message Date
Dean Herbert f78538fea8
Merge branch 'master' into user-profile-recent 2018-03-07 19:41:52 +09:00
Dan Balasescu fb349e68a3
Merge branch 'master' into api-error-shouldnt-retry 2018-03-07 16:50:14 +09:00
Dan Balasescu 0c154e07ed
Merge branch 'master' into nullable-legacy-id 2018-03-07 16:12:08 +09:00
Dan Balasescu 5fda7881c3
Merge branch 'master' into fix-textbox-arrows 2018-03-07 16:01:44 +09:00
Dean Herbert a71e5ce19c Tidy up 2018-03-07 14:54:54 +09:00
Dean Herbert 4094ffbddd Remove unnecessary comment 2018-03-07 14:54:15 +09:00
Dean Herbert 96ea42d3ba Ensure initial value is set even if that value is zero 2018-03-07 14:51:34 +09:00
Dean Herbert 05a13d4d39 Improve the way bindings are done 2018-03-07 14:50:50 +09:00
Dean Herbert 51a9dd038e Add default bindable values 2018-03-07 14:38:41 +09:00
Dean Herbert fac4cd6a32 Move to overlayContent 2018-03-07 14:20:47 +09:00
Dean Herbert e2f9e237e8 Use GradientHorizontal helper function 2018-03-07 14:07:04 +09:00
Dean Herbert c176e309e1
Merge branch 'master' into volume-control 2018-03-07 14:03:09 +09:00
Dean Herbert e82cadc811 Make LegacyID nullable
The -1 default was getting stored to the database.
2018-03-06 17:40:14 +09:00
Dean Herbert 07bf8549eb Fix arbitrary API request errors getting identified as timeouts 2018-03-06 17:39:34 +09:00
smoogipoo 78d73d4c11 Additional fixes for flow ordering after framework changes 2018-03-06 17:20:58 +09:00
smoogipoo 148551afa2 osu!-side changes in-line with framework layout changes 2018-03-06 14:12:37 +09:00
naoey 9669c5aee3
Make locally used things local and rename method. 2018-03-06 09:33:15 +05:30
Dean Herbert 90828cca8f Fix left and right arrows keys in chat overlay not working
Misplaced override. Resolves ppy/osu-framework#1444
2018-03-06 08:59:40 +09:00
Dean Herbert c4c1b0b6ff Fix merge regression 2018-03-06 01:39:01 +09:00
Dean Herbert 7b18e8a5ca Merge branch 'master' into fix-taiko-conversion 2018-03-06 01:16:47 +09:00
Dean Herbert 41727509d7
Merge branch 'master' into fix-drumroll-nullref 2018-03-05 22:46:33 +09:00
smoogipoo 2a9fb2c2c6 Make NestedHitObjects lazily-constructed 2018-03-05 21:40:26 +09:00
Dean Herbert 02690e5f25 Move to private implementation 2018-03-05 21:27:37 +09:00
Dean Herbert 0d817e8e98 Merge remote-tracking branch 'ppy/master' into fix-skin-performance 2018-03-05 21:23:18 +09:00
Dan Balasescu 25e2844e49
Merge branch 'master' into storyboard-rewind-support 2018-03-05 21:11:00 +09:00
Dan Balasescu 56550e4dd8
Merge branch 'master' into fix-parallax-during-rewind 2018-03-05 20:39:16 +09:00
Dan Balasescu 65d510baf2
Merge branch 'master' into add-internal-legacy-offsets 2018-03-05 20:27:27 +09:00
Dean Herbert 2003887cc8
Merge branch 'master' into clock-fixes 2018-03-05 17:45:08 +09:00
smoogipoo d44dc1a4f9 Fix SliderMultiplier/SliderTickRate parsing inaccuracy 2018-03-05 16:01:05 +09:00
smoogipoo 49b8670dfc Fix beatmap conversion tests not properly constructing decoder 2018-03-05 14:53:57 +09:00
Dean Herbert e46f363fdc Fix failing unit test 2018-03-04 22:46:50 +09:00
Dean Herbert bc0bc8d459 Add legacy timing offsets
These have been in release builds since January, but implemented in a hacky way.

This brings them with a sane implementation.
2018-03-04 21:57:50 +09:00
jorolf ec013dbee8 remove blank line and try to get test case working 2018-03-03 21:55:19 +01:00
jorolf 1cda58fe29 another blank line 2018-03-03 19:51:11 +01:00
jorolf 9293ec635a add license headers and remove blank line 2018-03-03 19:49:38 +01:00
jorolf 8e0a524c4d change colours 2018-03-03 19:31:29 +01:00
jorolf ef63366d91 simplify VolumeMeter 2018-03-03 19:25:34 +01:00
Dean Herbert 30b1447318 Fix skin file path lookup performance
Move path mapping to the resource store, so caching can happen against the component's name rather than the skin path.

Fixes regression of beatmap load time when a custom skin is selected.
2018-03-04 03:19:01 +09:00
jorolf 9a29c53c5e Merge branch 'master' of git://github.com/ppy/osu into volume-control 2018-03-03 19:09:08 +01:00
jorolf 3a420ba826 add the volume overlay 2018-03-03 19:08:35 +01:00
Dean Herbert 66493d200b
Merge branch 'master' into user-profile-recent 2018-03-04 02:45:12 +09:00
Dean Herbert 8273288048 Add xmldoc 2018-03-04 02:12:45 +09:00
Dean Herbert 0e928429d4
Merge branch 'master' into ruleset-replayframes 2018-03-04 01:57:43 +09:00
Dean Herbert 659578e8fa Add rewind support for storyboards 2018-03-04 01:48:31 +09:00
Dean Herbert 26e50043b7 Fix parallax container during rewinds 2018-03-04 00:52:00 +09:00
jorolf bd75422d88 Merge branch 'master' of git://github.com/ppy/osu into volume-control 2018-03-03 14:10:50 +01:00
Dean Herbert 0b2cbf88bb
Merge branch 'master' into clock-fixes 2018-03-02 22:18:32 +09:00
Dean Herbert 06cf9cbd63
Merge branch 'master' into fix-perfectcurve 2018-03-02 21:49:33 +09:00
Dean Herbert bd510e5356 Merge remote-tracking branch 'upstream/master' into clock-fixes 2018-03-02 21:01:53 +09:00
smoogipoo a2c239d5e3 Rename to IBeatmapConverter, move to separate file 2018-03-02 20:19:47 +09:00