Commit Graph

16010 Commits

Author SHA1 Message Date
2c2ed1ae47 Merge branch 'master' into profile-header-update 2019-01-10 18:34:39 +09:00
7438fc19c8 Merge pull request #4014 from smoogipoo/fix-match-select-crash
Fix null beatmap possibly being selected
2019-01-10 15:54:57 +09:00
aa68bbc1d9 Merge branch 'master' into fix-match-select-crash 2019-01-10 15:40:03 +09:00
3dc3d4cb40 Add test 2019-01-10 15:25:12 +09:00
930d6382c7 Merge pull request #4016 from smoogipoo/fix-link-flow
Fix links not working in partially masked text flow
2019-01-10 15:19:58 +09:00
778995386f Merge pull request #4025 from VINXIS/patch-2
Add new rebalances to lazer performance calc
2019-01-10 14:58:56 +09:00
4578d36a67 Add comment 2019-01-10 14:55:36 +09:00
e5b20de2fb Merge branch 'master' into patch-2 2019-01-10 14:51:54 +09:00
e04da7de1e Merge pull request #4017 from smoogipoo/lounge-leaderboard
Show match participants in the lounge
2019-01-10 14:36:26 +09:00
d86b1c724a Merge branch 'master' into patch-2 2019-01-10 14:34:46 +09:00
cee7604a5e Merge pull request #4028 from peppy/add-ui-scale
Add UI scale
2019-01-10 14:32:45 +09:00
bb36f457fe Merge branch 'master' into add-ui-scale 2019-01-10 14:25:38 +09:00
e98ef4e164 Merge pull request #4023 from peppy/fix-eternal-failing
Fix API getting stuck in eternal failing state if login request fails
2019-01-10 14:01:40 +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
a09615144e Kill White Space 2019-01-09 01:47:39 -07:00
dfe35f850c Add rebalances to lazer performance calc 2019-01-09 01:42:48 -07: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
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
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
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
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
2ecbb23b63 Merge pull request #3997 from peppy/letterboxing
Add scaling support (aka letterboxing)
2019-01-08 16:52:58 +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
4276805b5a Merge branch 'master' into letterboxing 2019-01-08 11:41:44 +09:00
7bb4a06122 Merge pull request #4006 from peppy/update-framework
Update framework
2019-01-08 11:40:36 +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
74ada4f3a3 Merge pull request #4007 from peppy/fix-leaderboard-nullrefs
Fix leaderboard not correctly handling cancellation
2019-01-08 11:25:42 +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