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

16632 Commits

Author SHA1 Message Date
Dan Balasescu
e33277bd76
Merge pull request #4203 from EVAST9919/keybindings-settings-groups
Use sidebar in key bindings overlay
2019-02-05 12:11:29 +09:00
Dan Balasescu
84ab16c7c8
Merge branch 'master' into keybindings-settings-groups 2019-02-05 11:42:53 +09:00
Dean Herbert
a47023b607
Merge pull request #4205 from smoogipoo/fix-background-fade-2
Fix background not being faded correctly
2019-02-04 22:43:10 +09:00
Dean Herbert
216030fe64
Merge branch 'master' into fix-background-fade-2 2019-02-04 22:32:50 +09:00
Dan Balasescu
ea7b56c8b1
Merge pull request #4192 from UselessToucan/fix_song_rearranging_in_music_controller_playlist
Add PlaylistItemHandle.HandlePositionalInput override
2019-02-04 17:05:43 +09:00
smoogipoo
065b0c9076 Fix background not being faded correctly 2019-02-04 17:04:52 +09:00
Dan Balasescu
779477959f
Merge branch 'master' into fix_song_rearranging_in_music_controller_playlist 2019-02-04 15:39:29 +09:00
Dan Balasescu
492f26c709
Merge pull request #3992 from peppy/fix-replay-import-statistics
Fix imported replays having excess statistics
2019-02-04 15:39:19 +09:00
Dan Balasescu
40e4a3f725
Merge branch 'master' into fix-replay-import-statistics 2019-02-04 15:32:29 +09:00
Dan Balasescu
c5ef81dbc3
Merge branch 'master' into fix_song_rearranging_in_music_controller_playlist 2019-02-04 15:17:19 +09:00
Dan Balasescu
74cb5084c4
Merge pull request #4193 from qwewqa/lazer-ppcalc-sliderend-fix
Fix slider tail evaluation in osu difficulty calculator
2019-02-04 14:56:52 +09:00
Dan Balasescu
2d365fbb69
Merge branch 'master' into lazer-ppcalc-sliderend-fix 2019-02-04 14:44:38 +09:00
Kyle Chang
cf91b882c8 Fix slider tail evaluation in osu difficulty calculator
The slider tail circle was already included as a nested hit object and is judged before the end of the slider's actual duration, so using the slider end time leads to an inaccurate travel distance and end position.
2019-02-03 23:49:05 -05:00
Dean Herbert
91d875db0d Remove unused local 2019-02-04 12:56:55 +09:00
Dean Herbert
cd92dddd46 Add per-ruleset mappings 2019-02-04 12:31:05 +09:00
Dean Herbert
2d7c23dd9f Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics 2019-02-04 12:15:53 +09:00
EVAST9919
d6d5bb5ecf remove useless nullcheck 2019-02-03 17:20:35 +03:00
EVAST9919
eeecbfcbe0 Fix warnings 2019-02-03 17:09:04 +03:00
EVAST9919
0035ea036e Merge remote-tracking branch 'refs/remotes/ppy/master' into keybindings-settings-groups 2019-02-03 16:08:32 +03:00
EVAST9919
4b17ca0857 Fix wrong icons 2019-02-03 14:50:03 +03:00
Unknown
ead28e7102 stop logging keyboard events from password textbox 2019-02-03 12:34:38 +01:00
EVAST9919
3b529b7bda Enable the sidebar and move "back" button to the key binding overlay 2019-02-03 14:34:04 +03:00
Nitrous
c24c8543bb
Merge branch 'master' into mod-grow 2019-02-03 13:41:39 +08:00
Dean Herbert
85f3ad4576
Merge pull request #4199 from Joehuu/move-regular-issue-template
Move regular issue template to .github
2019-02-03 14:37:32 +09:00
Joehu
257321b500 Move regular issue template to .github 2019-02-02 12:26:23 -08:00
Dean Herbert
e01f342ab0 wip 2019-02-02 17:11:25 +09:00
Roman Kapustin
4c866e7940 Add PlaylistItemHandle.HandlePositionalInput override 2019-02-01 22:37:27 +03:00
Dean Herbert
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
Dean Herbert
499e06797a
Merge pull request #4114 from peppy/fix-replay-multiplier-text
Fix replay playback speed not being displayed initially
2019-01-31 22:24:42 +09:00
Dean Herbert
ccc6968697
Merge pull request #4092 from peppy/download-tracking-component
Add a download tracking component
2019-01-31 22:24:32 +09:00
Dan Balasescu
9968bdc0e4
Merge branch 'master' into download-tracking-component 2019-01-31 21:18:03 +09:00
Dean Herbert
3da851d93e
Merge branch 'master' into fix-replay-multiplier-text 2019-01-31 21:17:40 +09:00
Dean Herbert
67bb7b4db7
Merge pull request #4188 from peppy/fix-osu-logo
Fix osu! logo potentially appearing during game load in a weird place
2019-01-31 21:17:12 +09:00
Dean Herbert
7ce9a915b7
Merge branch 'master' into fix-osu-logo 2019-01-31 21:08:49 +09:00
Dean Herbert
011d8606c0
Merge pull request #4179 from peppy/reg-screen-focus-fix
Allow deselection of textboxes on registration screen on mobile devices
2019-01-31 21:08:34 +09:00
Dan Balasescu
e59abac347
Merge branch 'master' into fix-osu-logo 2019-01-31 21:08:27 +09:00
Dan Balasescu
b85e119bae
Merge branch 'master' into reg-screen-focus-fix 2019-01-31 21:08:12 +09:00
Dean Herbert
befd40e545
Merge branch 'master' into download-tracking-component 2019-01-31 19:44:30 +09:00
Dean Herbert
f12d74774b Merge remote-tracking branch 'upstream/master' into mod-grow 2019-01-31 19:43:18 +09:00
Dean Herbert
94b505fd7d
Merge pull request #4106 from ekrctb/catch-slider-conversion-tweak
Fix catch slider conversion for last droplets
2019-01-31 19:40:26 +09:00
Dean Herbert
981564d425
Merge branch 'master' into catch-slider-conversion-tweak 2019-01-31 19:40:16 +09:00
Dean Herbert
a5c1ef03f9
Merge branch 'master' into catch-slider-conversion-tweak 2019-01-31 19:27:08 +09:00
Dean Herbert
d1c8ee65a5 Fix osu! logo potentially appearing during game load in a weird place 2019-01-31 19:22:29 +09:00
Dean Herbert
e191609067 Merge remote-tracking branch 'upstream/master' into download-tracking-component 2019-01-31 19:17:48 +09:00
Dean Herbert
c7cf3ef1cd Update licence headers 2019-01-31 19:17:42 +09:00
Dean Herbert
7860b2c3dc
Merge pull request #4173 from peppy/resources-via-nuget
Move osu-resources to nuget
2019-01-31 19:16:30 +09:00
Dean Herbert
7c6512118e Fix importing progress bar not displaying 2019-01-31 19:15:17 +09:00
Dean Herbert
0b8bd520ab Shake in all cases 2019-01-31 19:15:04 +09:00
Dean Herbert
b89694a969 Fix "importing" state display 2019-01-31 19:09:04 +09:00
Dean Herbert
041e3bf823 Handle unbinding better 2019-01-31 19:08:54 +09:00