1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 09:32:55 +08:00
Commit Graph

10132 Commits

Author SHA1 Message Date
Dean Herbert
415df52c69 Update framework 2019-01-08 21:26:24 +09:00
Dean Herbert
958840fe17
Merge branch 'master' into fix-sliderbar 2019-01-08 21:23:34 +09:00
Dan Balasescu
8214faeacc
Merge branch 'master' into fix-over-inclusive-channel-search 2019-01-08 19:54:31 +09:00
smoogipoo
2c44b928d3 Remove unused references 2019-01-08 16:38:34 +09:00
smoogipoo
daeba63242 Remove more unused code 2019-01-08 16:37:18 +09:00
smoogipoo
38a3ccc817 Use value where applicable 2019-01-08 16:31:44 +09:00
smoogipoo
8692be9de3 Fix sliderbar not working correctly with TransferValueOnCommit = true 2019-01-08 16:07:54 +09:00
Dean Herbert
a2a7aa708f Use better logic for setting slider bar settings 2019-01-08 14:56:42 +09:00
Dean Herbert
01aa4c2a72 Use TransferOnCommit 2019-01-08 13:48:38 +09:00
Dean Herbert
199b614eba Fix masking being unapplied incorrectly 2019-01-08 13:36:07 +09:00
Dean Herbert
440f4703cb Fix toolbar offset not being applied 2019-01-08 12:57:31 +09:00
Dean Herbert
dd960e6a89 Remove unused variable 2019-01-08 12:50:42 +09:00
Dean Herbert
276014f591
Merge branch 'master' into update-framework 2019-01-08 11:26:10 +09:00
Dean Herbert
2fc3e77be7
Merge branch 'master' into letterboxing 2019-01-08 11:26:09 +09:00
Dean Herbert
8eedef3e86 Move cancellation to safer place 2019-01-07 19:31:05 +09:00
Dean Herbert
d72412d24d Fix leaderboard not correctly handling cancellation 2019-01-07 19:28:46 +09:00
Dean Herbert
70d644406f Merge remote-tracking branch 'origin/update-framework' into letterboxing
# Conflicts:
#	osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
2019-01-07 18:53:53 +09:00
Dean Herbert
74539b5e5c Merge remote-tracking branch 'upstream/master' into letterboxing 2019-01-07 18:52:48 +09:00
Dean Herbert
49ba4e5a14
Merge branch 'master' into update-framework 2019-01-07 18:51:54 +09:00
Dean Herbert
ca98caf84b
Merge pull request #4001 from UselessToucan/linq_temp
Use Find instead of FirstOrDefault
2019-01-07 18:50:59 +09:00
Dean Herbert
f6018294b5 Update framework 2019-01-07 18:50:27 +09:00
Dean Herbert
73c2fcac08 Remove broken SettingsLabel class 2019-01-07 17:03:59 +09:00
Roman Kapustin
4b5fc85875 Use Find instead of FirstOrDefault 2019-01-05 19:35:33 +03:00
Dean Herbert
4a7c6fb19d Fix PP not display on profile overlay 2019-01-04 16:33:35 +09:00
Dean Herbert
7d1163a7d2 Remove unnecessary null check 2019-01-04 15:49:23 +09:00
Dean Herbert
f2ccf70d1b Backdate license header for now 2019-01-04 15:37:27 +09:00
Dean Herbert
c528a3896d Formatting and naming 2019-01-04 15:34:32 +09:00
Dean Herbert
4c3310ca80 Remove unnecessary tracked settings (for now) 2019-01-04 15:28:48 +09:00
Dean Herbert
3a10dd47d5 Add preview for gameplay region 2019-01-04 15:28:35 +09:00
Dean Herbert
9c7830d83b Size -> scale 2019-01-04 14:58:44 +09:00
Dean Herbert
35a6257642 Delay updates when changes would affect mouse position 2019-01-04 14:55:59 +09:00
Dean Herbert
5a807f2143 Add OSD support 2019-01-04 14:18:29 +09:00
Dean Herbert
3953f829c8 Add letterbox/screen scaling support 2019-01-04 13:36:02 +09:00
Dean Herbert
b6dc6c4a74
Merge branch 'master' into do_not_use_local_user_for_autoplay_score 2019-01-04 13:11:17 +09:00
Dean Herbert
8b25e4c9ee Fix searching for "channel" matching all channels 2019-01-03 12:04:36 +09:00
Dean Herbert
2d405bfc43 Add back options for 3 and 7 day long rooms 2019-01-02 16:33:52 +09:00
FreezyLemon
0047f29ec8 move missing newline to front of "Plays with..." 2018-12-30 22:40:17 +01:00
Dean Herbert
1f2d340914
Merge branch 'master' into fix-room-ordering 2018-12-28 14:07:11 +09:00
Dean Herbert
e6ccf209c7
Merge pull request #3957 from peppy/fix-excessive-cover-loading
Fix covers being loaded even when off-screen
2018-12-28 14:07:01 +09:00
Dean Herbert
0908309232
Merge branch 'master' into fix-room-ordering 2018-12-28 13:35:56 +09:00
Dean Herbert
8c62157d7a
Merge pull request #3943 from smoogipoo/fix-results
Fix ScoreProcessor's population
2018-12-28 13:32:40 +09:00
Dean Herbert
55607634b4 Fix covers being loaded even when off-screen 2018-12-28 13:30:05 +09:00
smoogipoo
72482aff8d Whoops 2018-12-28 01:48:13 +09:00
smoogipoo
a7db0bbb91 Sort rooms based on their API position 2018-12-28 01:45:19 +09:00
Lanyun Hou
f2f1ba8cbe
Fix typo in line 42 2018-12-28 00:43:20 +08:00
smoogipoo
be86281c72 Fix score results not populated 2018-12-28 00:24:02 +09:00
smoogipoo
338b95dd63 Fix none result getting included 2018-12-27 22:48:24 +09:00
Dean Herbert
99ed009838 Fix extra hit result types showing on ranking screen 2018-12-27 22:31:40 +09:00
Dean Herbert
12a93af156
Merge pull request #3939 from smoogipoo/fix-multi-mods
Fix plays with mods not submitting
2018-12-27 22:20:10 +09:00
smoogipoo
a62405d82d Fix plays with mods not submitting 2018-12-27 22:17:03 +09:00