1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 19:37:51 +08:00
Commit Graph

18788 Commits

Author SHA1 Message Date
EVAST9919
ea492772cf Merge remote-tracking branch 'refs/remotes/ppy/master' into user_profile_modes 2019-06-08 11:31:28 +03:00
Dean Herbert
3182f88ea8
Merge pull request #4960 from smoogipoo/fix-ios-resources
Update resources for iOS
2019-06-08 16:47:05 +09:00
smoogipoo
d058f77793 Update resources for iOS 2019-06-08 16:36:48 +09:00
Dean Herbert
e73807caab
Update framework (#4949)
Update framework
2019-06-07 21:33:53 +09:00
Dean Herbert
cd4648a647 Update framework 2019-06-07 21:09:59 +09:00
Dan Balasescu
45957bdc82
Merge pull request #4906 from peppy/fail-animation
Add animation on failing
2019-06-07 21:02:30 +09:00
Dan Balasescu
346c4310c3
Merge branch 'master' into fail-animation 2019-06-07 20:48:36 +09:00
Dean Herbert
0e8c12e93f
Remove unnecessary manual autosize calculations in ToolbarRulesetSelector (#4943)
Remove unnecessary manual autosize calculations in ToolbarRulesetSelector
2019-06-07 20:37:40 +09:00
Dan Balasescu
6a06ea2aee
Merge branch 'master' into ruleset_fix 2019-06-07 20:36:29 +09:00
Dean Herbert
b28b59a496
Fix paginated layouts only showing one column even if enough space is available for more (#4946)
Fix paginated layouts only showing one column even if enough space is available for more

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-06-07 20:26:34 +09:00
Dean Herbert
011ccffde7
Add an input source toggle on manual input test scenes (#4945)
Add an input source toggle on manual input test scenes
2019-06-07 20:26:26 +09:00
Dean Herbert
1f0a19deaa
Fix preview tracks muting themselves (#4944)
Fix preview tracks muting themselves
2019-06-07 20:26:12 +09:00
Dan Balasescu
b6896b31c9
Merge branch 'master' into fix-paginated-layout 2019-06-07 20:19:14 +09:00
Dan Balasescu
911328b895
Merge pull request #4947 from peppy/mod-select-overlay-layout
Fix file layout of ModSelectOverlay
2019-06-07 20:18:30 +09:00
Dean Herbert
8f30c9b0a3 Fix file layout of ModSelectOverlay 2019-06-07 15:58:24 +09:00
Dean Herbert
046df743be
Add keyboard shortcuts to actuate mod select buttons (#4841)
Add keyboard shortcuts to actuate mod select buttons

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-07 15:53:42 +09:00
Dean Herbert
7ffc08b187
Merge branch 'master' into master 2019-06-07 15:34:14 +09:00
Dean Herbert
b914bb1e2e Remove key hints for now
A proper design for this will come in the future.
2019-06-07 15:32:48 +09:00
Dean Herbert
0ce5c7468f Use switch and consume/block input 2019-06-07 15:31:23 +09:00
Dean Herbert
2531250f89 Fix paginated layouts only showing one column even if enough space is available for more 2019-06-07 14:58:04 +09:00
Dean Herbert
f9f5dd786d
Fix OsuHoverContainer not updating visual hover state when enabled mid-hover (#4913)
Fix OsuHoverContainer not updating visual hover state when enabled mid-hover

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-07 14:23:16 +09:00
Dean Herbert
60b70c0f45 Use lambda for simple functions 2019-06-07 14:11:21 +09:00
Dean Herbert
1374da7c41 Remove all calls to return user input 2019-06-07 12:54:57 +09:00
Dean Herbert
0fc2c596b6 Add toggle for input priority in manual input tests 2019-06-07 12:53:51 +09:00
Dean Herbert
6f6b134ec8 Remove return user input calls 2019-06-07 12:52:49 +09:00
Dean Herbert
748c0e5c01 Set default state of test to enabled 2019-06-07 12:42:01 +09:00
Dean Herbert
58174425ed Make visual test more visible 2019-06-07 12:37:10 +09:00
Dean Herbert
694f2e3a4f Tidy up test scene's setup usage 2019-06-07 11:59:07 +09:00
Dean Herbert
64d5aa318f Apply rebased changes 2019-06-07 11:45:58 +09:00
Dean Herbert
358a08cf9d Merge branch 'master' into OsuHoverContainer 2019-06-07 11:40:33 +09:00
Dean Herbert
8878fce9a7
Merge pull request #4934 from nyquillerium/fix-cursor
Fix cursor trail appearing glitched when pausing immediately after entering gameplay
2019-06-07 11:34:19 +09:00
Dean Herbert
9f740f69bb Fix preview tracks muting themselves
Closes #4937
2019-06-07 11:21:10 +09:00
Dean Herbert
ff6943e170
Merge branch 'master' into fix-cursor 2019-06-07 10:43:21 +09:00
David Zhao
e2118299e9 update comment 2019-06-07 10:36:36 +09:00
EVAST9919
210437042f Remove useless update calls in ToolbarRulesetSelector 2019-06-07 02:39:36 +03:00
EVAST9919
923f9fb6cd Naming adjustments 2019-06-07 01:43:26 +03:00
EVAST9919
2a303748e3 Merge remote-tracking branch 'refs/remotes/ppy/master' into user_profile_modes 2019-06-07 01:23:10 +03:00
Dean Herbert
b93446688c
Fix sizing of OsuAnimatedButton and OsuClickableContainer (#4898)
Fix sizing of OsuAnimatedButton and OsuClickableContainer
2019-06-07 00:17:39 +09:00
Dean Herbert
60731c132d
Merge pull request #4936 from peppy/update-framework
Update framework
2019-06-06 21:13:21 +09:00
Dean Herbert
8c1a62536c Update framework 2019-06-06 21:13:01 +09:00
Dean Herbert
a228763cf1
Update with framework-side front-to-back changes (#4577)
Update with framework-side front-to-back changes
2019-06-06 21:00:11 +09:00
smoogipoo
6bf6e22149 Update framework 2019-06-06 20:33:03 +09:00
smoogipoo
90966b113b Merge remote-tracking branch 'origin/master' into ftb-prepass 2019-06-06 20:32:38 +09:00
Dan Balasescu
104268cc52
Merge pull request #4935 from peppy/update-readme
Update readme with direct download links
2019-06-06 19:56:47 +09:00
Dean Herbert
2a90af1d4e Update readme with direct download links 2019-06-06 19:15:51 +09:00
Dean Herbert
4633aa83f4
Allow beatmapsets to be sorted by date added (#4914)
Allow beatmapsets to be sorted by date added

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-06 18:39:16 +09:00
Dean Herbert
483049703e
Merge branch 'master' into beatmap-dateadded-sort 2019-06-06 18:26:55 +09:00
David Zhao
ac9a3e54a6 Fix cursor issue with stopped gameplay clock 2019-06-06 18:12:59 +09:00
smoogipoo
4d035afcc6 Add setting to bypass front-to-back 2019-06-06 16:49:42 +09:00
smoogipoo
c7d0fcd42a Update drawnodes 2019-06-06 16:49:35 +09:00