Commit Graph

10210 Commits

Author SHA1 Message Date
bb36f457fe Merge branch 'master' into add-ui-scale 2019-01-10 14:25:38 +09:00
e6c2d29a8e Merge branch 'master' into moreOptionsFromSkin.ini 2019-01-10 14:01:52 +09:00
5e4bea9d99 Fix extra newline 2019-01-10 12:11:14 +09:00
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
045ed741b0 Fix API getting stuck in eternal failing state if login request fails 2019-01-09 15:29:27 +09:00
2dc185f249 Display avatars rather than full scores 2019-01-09 15:27:08 +09:00
0bf9e9b86b Merge branch 'master' into lounge-leaderboard 2019-01-09 10:28:55 +09:00
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
415df52c69 Update framework 2019-01-08 21:26:24 +09:00
958840fe17 Merge branch 'master' into fix-sliderbar 2019-01-08 21:23:34 +09:00
6ce08312b2 Merge branch 'master' into fix-match-select-crash 2019-01-08 20:29:55 +09:00
8214faeacc Merge branch 'master' into fix-over-inclusive-channel-search 2019-01-08 19:54:31 +09:00
2a4c91a6ab Remove unused using 2019-01-08 19:26:24 +09:00
122fc2de58 Show room leaderboard instead in the lounge 2019-01-08 19:24:55 +09:00
da98915c0c Fix links not working in partially masked text flow 2019-01-08 18:59:01 +09:00
b17b88d071 Fix null beatmap possibly being selected 2019-01-08 18:06:46 +09:00
cf8bcb7ba2 Add explicit beatmap -> scores relationship rather than relying on cascades 2019-01-08 17:53:43 +09:00
2c44b928d3 Remove unused references 2019-01-08 16:38:34 +09:00
daeba63242 Remove more unused code 2019-01-08 16:37:18 +09:00
38a3ccc817 Use value where applicable 2019-01-08 16:31:44 +09:00
8692be9de3 Fix sliderbar not working correctly with TransferValueOnCommit = true 2019-01-08 16:07:54 +09:00
a2a7aa708f Use better logic for setting slider bar settings 2019-01-08 14:56:42 +09:00
01aa4c2a72 Use TransferOnCommit 2019-01-08 13:48:38 +09:00
199b614eba Fix masking being unapplied incorrectly 2019-01-08 13:36:07 +09:00
440f4703cb Fix toolbar offset not being applied 2019-01-08 12:57:31 +09:00
dd960e6a89 Remove unused variable 2019-01-08 12:50:42 +09:00
647a30279f Merge branch 'master' into moreOptionsFromSkin.ini 2019-01-08 11:46:08 +09:00
276014f591 Merge branch 'master' into update-framework 2019-01-08 11:26:10 +09:00
2fc3e77be7 Merge branch 'master' into letterboxing 2019-01-08 11:26:09 +09:00
11861f4cc9 Merge branch 'master' into moreOptionsFromSkin.ini 2019-01-08 11:26:08 +09:00
881b10a18f Merge remote-tracking branch 'Dragicafit/moreOptionsFromSkin.ini' into moreOptionsFromSkin.ini 2019-01-08 11:01:04 +09:00
7eed3ffe75 Merge branch 'master' into moreOptionsFromSkin.ini 2019-01-08 10:02:06 +09:00
4cee21f356 Make skinning better 2019-01-07 20:12:39 +09:00
8eedef3e86 Move cancellation to safer place 2019-01-07 19:31:05 +09:00
d72412d24d Fix leaderboard not correctly handling cancellation 2019-01-07 19:28:46 +09:00
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
74539b5e5c Merge remote-tracking branch 'upstream/master' into letterboxing 2019-01-07 18:52:48 +09:00
49ba4e5a14 Merge branch 'master' into update-framework 2019-01-07 18:51:54 +09:00
ca98caf84b Merge pull request #4001 from UselessToucan/linq_temp
Use Find instead of FirstOrDefault
2019-01-07 18:50:59 +09:00
f6018294b5 Update framework 2019-01-07 18:50:27 +09:00
13b077c83b Merge remote-tracking branch 'upstream/master' into moreOptionsFromSkin.ini 2019-01-07 18:11:17 +09:00
73c2fcac08 Remove broken SettingsLabel class 2019-01-07 17:03:59 +09:00
4b5fc85875 Use Find instead of FirstOrDefault 2019-01-05 19:35:33 +03:00
4a7c6fb19d Fix PP not display on profile overlay 2019-01-04 16:33:35 +09:00
7d1163a7d2 Remove unnecessary null check 2019-01-04 15:49:23 +09:00
f2ccf70d1b Backdate license header for now 2019-01-04 15:37:27 +09:00
c528a3896d Formatting and naming 2019-01-04 15:34:32 +09:00
4c3310ca80 Remove unnecessary tracked settings (for now) 2019-01-04 15:28:48 +09:00
3a10dd47d5 Add preview for gameplay region 2019-01-04 15:28:35 +09:00
9c7830d83b Size -> scale 2019-01-04 14:58:44 +09:00