1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-19 12:23:01 +08:00
Commit Graph

16588 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
VINXIS
a09615144e
Kill White Space 2019-01-09 01:47:39 -07:00
VINXIS
dfe35f850c
Add rebalances to lazer performance calc 2019-01-09 01:42:48 -07:00
Dean Herbert
045ed741b0 Fix API getting stuck in eternal failing state if login request fails 2019-01-09 15:29:27 +09:00
Dean Herbert
2dc185f249 Display avatars rather than full scores 2019-01-09 15:27:08 +09:00
Dean Herbert
0bf9e9b86b
Merge branch 'master' into lounge-leaderboard 2019-01-09 10:28:55 +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
6ce08312b2
Merge branch 'master' into fix-match-select-crash 2019-01-08 20:29:55 +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
2a4c91a6ab Remove unused using 2019-01-08 19:26:24 +09:00
smoogipoo
122fc2de58 Show room leaderboard instead in the lounge 2019-01-08 19:24:55 +09:00
smoogipoo
da98915c0c Fix links not working in partially masked text flow 2019-01-08 18:59:01 +09:00
smoogipoo
b17b88d071 Fix null beatmap possibly being selected 2019-01-08 18:06:46 +09:00
smoogipoo
cf8bcb7ba2 Add explicit beatmap -> scores relationship rather than relying on cascades 2019-01-08 17:53:43 +09:00
Shane Woolcock
d74aa52e69 Revert to old behaviour if no TrackManager available 2019-01-08 18:35:23 +10:30
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
Shane Woolcock
4bfc7b4384 Update framework references 2019-01-08 17:15:23 +10:30
Shane Woolcock
19693c3e51 Use TrackManager CreateWaveform to fix editor crashes 2019-01-08 17:10:31 +10:30
Shane Woolcock
a267a1a085 Merge branch 'master' into samah-ios 2019-01-08 17:09:26 +10:30
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
647a30279f
Merge branch 'master' into moreOptionsFromSkin.ini 2019-01-08 11:46:08 +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
Dean Herbert
11861f4cc9
Merge branch 'master' into moreOptionsFromSkin.ini 2019-01-08 11:26:08 +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
881b10a18f Merge remote-tracking branch 'Dragicafit/moreOptionsFromSkin.ini' into moreOptionsFromSkin.ini 2019-01-08 11:01:04 +09:00
Dean Herbert
7eed3ffe75
Merge branch 'master' into moreOptionsFromSkin.ini 2019-01-08 10:02:06 +09:00
Dean Herbert
4cee21f356 Make skinning better 2019-01-07 20:12:39 +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