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

15976 Commits

Author SHA1 Message Date
Dean Herbert
4f5c208672 Add UI scale
Limited to (relatively) sane values until we eventually get around to adjusting UI to allow higher extermities.
2019-01-09 19:01:33 +09:00
Dean Herbert
e4ff36a5bc
Merge pull request #4013 from smoogipoo/beatmap-scores-foreignkey
Add explicit beatmap -> scores deletions rather than relying on FK cascades
2019-01-08 21:39:15 +09:00
Dean Herbert
2c94b54c03
Merge pull request #4012 from smoogipoo/fix-sliderbar
Fix sliderbar not working correctly with TransferValueOnCommit = true
2019-01-08 21:37:47 +09:00
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
Dean Herbert
253b10dc1f
Merge pull request #3990 from peppy/fix-over-inclusive-channel-search
Fix searching for "channel" matching all channels
2019-01-08 20:28:50 +09:00
Dan Balasescu
8214faeacc
Merge branch 'master' into fix-over-inclusive-channel-search 2019-01-08 19:54:31 +09:00
smoogipoo
cf8bcb7ba2 Add explicit beatmap -> scores relationship rather than relying on cascades 2019-01-08 17:53:43 +09:00
Dan Balasescu
2ecbb23b63
Merge pull request #3997 from peppy/letterboxing
Add scaling support (aka letterboxing)
2019-01-08 16:52:58 +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
4276805b5a
Merge branch 'master' into letterboxing 2019-01-08 11:41:44 +09:00
Dean Herbert
7bb4a06122
Merge pull request #4006 from peppy/update-framework
Update framework
2019-01-08 11:40:36 +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
Dan Balasescu
74ada4f3a3
Merge pull request #4007 from peppy/fix-leaderboard-nullrefs
Fix leaderboard not correctly handling cancellation
2019-01-08 11:25:42 +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
115caa928c
Merge pull request #4005 from smoogipoo/stacking-indices
Implement stacking by indices
2019-01-07 18:43:08 +09:00
smoogipoo
b57c1af084 Only update stacking if there are hitobjects 2019-01-07 18:15:44 +09:00
smoogipoo
c6c22b352f More verbose exceptions 2019-01-07 18:13:40 +09:00
Dean Herbert
a5f9ae86a8
Merge pull request #4004 from peppy/remove-settings-label
Remove broken SettingsLabel class
2019-01-07 18:07:52 +09:00
smoogipoo
351ab6e9bd Shortcut O(n^2) calculation 2019-01-07 18:01:44 +09:00
smoogipoo
1c5ab6a906 Implement stacking by index 2019-01-07 18:00:59 +09:00
Dean Herbert
73c2fcac08 Remove broken SettingsLabel class 2019-01-07 17:03:59 +09:00
Dean Herbert
5e87a3a7e2
Merge pull request #3998 from peppy/fix-pp-display
Fix PP not display on profile overlay
2019-01-06 22:18:08 +09:00
Roman Kapustin
469a64a7cd The code must not contain multiple blank lines in a row 2019-01-05 21:03:03 +03: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
e596d4fc10
Merge pull request #3813 from UselessToucan/do_not_use_local_user_for_autoplay_score
Handle ModAutoplay during score construction in the Player
2019-01-04 15:56:20 +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