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

16046 Commits

Author SHA1 Message Date
Shane Woolcock
8f2ce6d048 Update framework 2019-01-12 15:55:03 +10:30
Shane Woolcock
a6c54a9675 Merge branch 'master' into samah-ios 2019-01-12 00:16:09 +10:30
Dan Balasescu
dfc903fec2
Merge pull request #4042 from Aergwyn/code-improvements
Remove unnecessary blank lines
2019-01-11 18:51:11 +09:00
Unknown
6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
Dean Herbert
469de26af2
Merge pull request #4035 from peppy/update-framework
Update framework
2019-01-10 22:22:46 +09:00
Dean Herbert
c1656a7608 Update framework 2019-01-10 21:22:42 +09:00
Dean Herbert
6f42b564cf
Merge pull request #3837 from Dragicafit/moreOptionsFromSkin.ini
Various skinning additions and fixes
2019-01-10 19:15:10 +09:00
Dean Herbert
0a24d188b4 Remove TryGetValue as it won't work 2019-01-10 19:01:41 +09:00
Dean Herbert
17bc933db2 Revert unnecessary changes 2019-01-10 19:01:41 +09:00
Dean Herbert
8cd058ed9a
Merge branch 'master' into moreOptionsFromSkin.ini 2019-01-10 18:38:20 +09:00
Dean Herbert
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
Dean Herbert
aa68bbc1d9
Merge branch 'master' into fix-match-select-crash 2019-01-10 15:40:03 +09:00
smoogipoo
3dc3d4cb40 Add test 2019-01-10 15:25:12 +09:00
Dean Herbert
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
Dan Balasescu
778995386f
Merge pull request #4025 from VINXIS/patch-2
Add new rebalances to lazer performance calc
2019-01-10 14:58:56 +09:00
smoogipoo
4578d36a67 Add comment 2019-01-10 14:55:36 +09:00
Dan Balasescu
e5b20de2fb
Merge branch 'master' into patch-2 2019-01-10 14:51:54 +09:00
Dean Herbert
e04da7de1e
Merge pull request #4017 from smoogipoo/lounge-leaderboard
Show match participants in the lounge
2019-01-10 14:36:26 +09:00
Dan Balasescu
d86b1c724a
Merge branch 'master' into patch-2 2019-01-10 14:34:46 +09:00
Dean Herbert
a264b67d58
Merge branch 'master' into moreOptionsFromSkin.ini 2019-01-10 14:33:34 +09:00
Dan Balasescu
cee7604a5e
Merge pull request #4028 from peppy/add-ui-scale
Add UI scale
2019-01-10 14:32:45 +09:00
Dan Balasescu
bb36f457fe
Merge branch 'master' into add-ui-scale 2019-01-10 14:25:38 +09:00
Dan Balasescu
e6c2d29a8e
Merge branch 'master' into moreOptionsFromSkin.ini 2019-01-10 14:01:52 +09:00
Dan Balasescu
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
Dean Herbert
5e4bea9d99 Fix extra newline 2019-01-10 12:11:14 +09:00
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