1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-13 19:27:31 +08:00
Commit Graph

16301 Commits

Author SHA1 Message Date
Dean Herbert
99c963c56a
Merge branch 'master' into cancel-request-on-disposal 2019-01-17 15:29:49 +09:00
ekrctb
b6fb3a5c05 Cancel request on disposal for RoomInspector 2019-01-17 15:14:30 +09:00
Dean Herbert
0ff76d5f69
Merge pull request #3923 from phosphene47/menu-background-skinning
Menu background skinning
2019-01-17 14:35:17 +09:00
Dean Herbert
2ab0c4632e
Merge branch 'master' into menu-background-skinning 2019-01-17 14:23:03 +09:00
Dean Herbert
474347e566
Merge pull request #4074 from smoogipoo/diffcalc-save-last-strain
Fix final strain section not being saved
2019-01-17 13:36:59 +09:00
Dean Herbert
de5a9ed012
Merge pull request #4069 from peppy/fix-sticking-cursor
Stop cursor from sticking to edges of scaled game window
2019-01-17 12:56:14 +09:00
smoogipoo
1626e9a74e Merge branch 'fix-spinner-strains' into diffcalc-fixes 2019-01-17 12:53:37 +09:00
smoogipoo
a8e9adafdb Fix final section not being saved 2019-01-17 12:51:49 +09:00
Dan Balasescu
824fff5c85
Merge branch 'master' into fix-sticking-cursor 2019-01-17 12:06:00 +09:00
Dan Balasescu
1c932d93c3
Merge pull request #4063 from peppy/update-framework
Update framework and other nuget packages
2019-01-16 19:55:37 +09:00
Dean Herbert
7bcf056872
Merge branch 'master' into update-framework 2019-01-16 19:16:53 +09:00
Dean Herbert
5ff58870b8 Update framework 2019-01-16 19:05:46 +09:00
Dean Herbert
db5f860c2b
Merge pull request #4041 from peppy/fix-skip-button-scaling
Fix scaling of SkipOverlay when UI scale is adjusted
2019-01-16 17:21:55 +09:00
Dean Herbert
3abfaea7ac Stop cursor from sticking to edges of scaled game window 2019-01-16 17:21:26 +09:00
Dan Balasescu
75113db438
Merge branch 'master' into fix-skip-button-scaling 2019-01-16 16:37:37 +09:00
Dan Balasescu
98ec021bcf
Merge branch 'master' into update-framework 2019-01-16 16:22:00 +09:00
Dan Balasescu
89b5707f2b
Merge pull request #4064 from qwewqa/mania-random-mirror-fix
Fix mania autoplay with mirror and random mods
2019-01-16 16:21:13 +09:00
Kyle Chang
bd6c845fc8 Use IApplicableToBeatmap for mirror and random mania mods 2019-01-15 22:51:52 -05:00
Dean Herbert
bfb18b4ffb Update framework and other nuget packages 2019-01-16 10:14:37 +09:00
smoogipoo
e44bc57a3d Fix minDistanceFromEnd using seconds rather than milliseconds
Velocity in stable is defined as distance per SECOND, while lazer defines it as distance per MILLISECOND.
2019-01-15 19:18:56 +09:00
smoogipoo
117c514479 Fix lazy slider calculation inaccuracy
What were we doing... On /b/1221540 stable's repeat points happen 90% through the length of each span! We should use lazer's more accurate calculations.
2019-01-15 19:07:25 +09:00
Dean Herbert
f995d98661
Merge pull request #3969 from UselessToucan/update_tab_item_font
Update tab text font on activation/deactivation
2019-01-15 18:50:32 +09:00
Dean Herbert
7ef127a3bf
Merge branch 'master' into update_tab_item_font 2019-01-15 18:31:16 +09:00
smoogipoo
88d80016aa Fix out of bounds exception during indexing 2019-01-15 10:40:03 +09:00
Shane Woolcock
6c35393d1a Fix TrackManager usage 2019-01-13 23:10:16 +10:30
Shane Woolcock
f70cb81a3f Update framework 2019-01-13 23:07:35 +10:30
Shane Woolcock
d80138d20d Ensure beatmap textures are loaded via CreateTextureLoaderStore 2019-01-12 23:05:49 +10:30
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
e2dd025225 Fix scaling of SkipOverlay when UI scale is adjusted
Closes #4040.
2019-01-11 16:54:42 +09:00
Min
29e8c21c46
Merge branch 'master' into menu-background-skinning 2019-01-11 11:36:20 +09: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
1ff9203f9e
Merge branch 'master' into fix-idle-weirdness 2019-01-10 18:38:48 +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