Commit Graph

7121 Commits

Author SHA1 Message Date
c70be29eda Move legacy conversion to LegacySkin 2018-03-12 11:30:13 +09:00
1447ca55a3 Add xmldoc, make restrictSize private 2018-03-12 11:02:02 +09:00
d27cf16bf9 Merge remote-tracking branch 'ppy/master' into more-skinning 2018-03-12 10:46:37 +09:00
9c75c392f2 Only check by null instead of sign 2018-03-11 21:27:49 +01:00
a321bcf3af Fix check against LegacyID for non-default rulesets 2018-03-11 20:19:03 +01:00
db2a663234 Use private instead of protected 2018-03-11 01:26:03 +09:00
56730247e3 Merge branch 'fix-unplayable-beatmaps' of github.com:naoey/osu into fix-unplayable-beatmaps 2018-03-09 19:40:00 +05:30
2c0488b1f1 Invert bool, add test, and handle ruleset change. 2018-03-09 19:39:28 +05:30
9ad9fc5aa9 Merge branch 'master' into fix-unplayable-beatmaps 2018-03-09 21:39:48 +09:00
d04f47718f Make song select choose random when initial selection fails.
- Revert TestCasePlaySongSelect to master
2018-03-09 17:36:55 +05:30
25fb527cc7 Remove previous fix and move filtered logic to carousel.
- Add an optional bool parameter to SelectBeatmap to skip selecting
filtered maps
2018-03-09 15:51:00 +05:30
6d91889ca6 Move player-specific configuration bindables back to player 2018-03-08 22:16:47 +09:00
2cb197d0c4 Replace ConfigureBackgroundUpdate with OnEntering 2018-03-08 11:35:00 +03:00
8f3f886805 Merge branch 'master' into PlayerBase 2018-03-08 16:12:12 +09:00
81c1ec2005 Merge branch 'master' into fix-unplayable-beatmaps 2018-03-08 13:02:57 +09:00
70a16667b6 Fix difficulty calculator regression when applying mods 2018-03-08 12:57:36 +09:00
453fd83e01 Merge branch 'master' into user-profile-recent 2018-03-08 00:42:02 +09:00
983cefbe40 Add VisualTest. 2018-03-07 19:08:26 +05:30
3731cbe5eb Removing "mouse wheel disabled" checkbox from visual settings gameplay menu 2018-03-07 14:20:59 +01:00
f78538fea8 Merge branch 'master' into user-profile-recent 2018-03-07 19:41:52 +09:00
05eb678654 Add skin support for judgements 2018-03-07 18:21:05 +09:00
bd952ce370 Allow skinnable drawables to be of non-restricted size 2018-03-07 18:21:05 +09:00
fb349e68a3 Merge branch 'master' into api-error-shouldnt-retry 2018-03-07 16:50:14 +09:00
0c154e07ed Merge branch 'master' into nullable-legacy-id 2018-03-07 16:12:08 +09:00
5fda7881c3 Merge branch 'master' into fix-textbox-arrows 2018-03-07 16:01:44 +09:00
a71e5ce19c Tidy up 2018-03-07 14:54:54 +09:00
4094ffbddd Remove unnecessary comment 2018-03-07 14:54:15 +09:00
96ea42d3ba Ensure initial value is set even if that value is zero 2018-03-07 14:51:34 +09:00
05a13d4d39 Improve the way bindings are done 2018-03-07 14:50:50 +09:00
51a9dd038e Add default bindable values 2018-03-07 14:38:41 +09:00
fac4cd6a32 Move to overlayContent 2018-03-07 14:20:47 +09:00
e2f9e237e8 Use GradientHorizontal helper function 2018-03-07 14:07:04 +09:00
c176e309e1 Merge branch 'master' into volume-control 2018-03-07 14:03:09 +09:00
e82cadc811 Make LegacyID nullable
The -1 default was getting stored to the database.
2018-03-06 17:40:14 +09:00
07bf8549eb Fix arbitrary API request errors getting identified as timeouts 2018-03-06 17:39:34 +09:00
78d73d4c11 Additional fixes for flow ordering after framework changes 2018-03-06 17:20:58 +09:00
148551afa2 osu!-side changes in-line with framework layout changes 2018-03-06 14:12:37 +09:00
9669c5aee3 Make locally used things local and rename method. 2018-03-06 09:33:15 +05:30
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
697ad63d72 Resolve merge conflicts 2018-03-05 22:24:25 +03:00
c4c1b0b6ff Fix merge regression 2018-03-06 01:39:01 +09:00
7b18e8a5ca Merge branch 'master' into fix-taiko-conversion 2018-03-06 01:16:47 +09:00
41727509d7 Merge branch 'master' into fix-drumroll-nullref 2018-03-05 22:46:33 +09:00
2a9fb2c2c6 Make NestedHitObjects lazily-constructed 2018-03-05 21:40:26 +09:00
02690e5f25 Move to private implementation 2018-03-05 21:27:37 +09:00
0d817e8e98 Merge remote-tracking branch 'ppy/master' into fix-skin-performance 2018-03-05 21:23:18 +09:00
25e2844e49 Merge branch 'master' into storyboard-rewind-support 2018-03-05 21:11:00 +09:00
56550e4dd8 Merge branch 'master' into fix-parallax-during-rewind 2018-03-05 20:39:16 +09:00
65d510baf2 Merge branch 'master' into add-internal-legacy-offsets 2018-03-05 20:27:27 +09:00
2003887cc8 Merge branch 'master' into clock-fixes 2018-03-05 17:45:08 +09:00