1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 05:02:55 +08:00
Commit Graph

16566 Commits

Author SHA1 Message Date
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
Dean Herbert
b69a19f810 Attach progress immediately 2019-01-31 19:08:45 +09:00
Nitrous
121fb22da3
Merge branch 'master' into mod-grow 2019-01-31 17:59:50 +08:00
LeNitrous
7e2f4af00d remove whitespaces 2019-01-31 17:58:09 +08:00
Dean Herbert
c54a515b3e Change where BindValueChange is immediately run 2019-01-31 18:49:54 +09:00
Dean Herbert
7f2fdac50e Update signatures 2019-01-31 18:47:30 +09:00
Dean Herbert
327a34f12a Merge remote-tracking branch 'upstream/master' into download-tracking-component
# Conflicts:
#	osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs
2019-01-31 18:45:09 +09:00
Dean Herbert
09056fd0d8
Merge branch 'master' into resources-via-nuget 2019-01-31 18:40:45 +09:00
Dean Herbert
9b12803e96
Merge pull request #4181 from smoogipoo/iscreen
Make everything use the IScreen interface
2019-01-31 18:39:44 +09:00
Dean Herbert
ba6176fd03 Fix major regression in scaling behaviour 2019-01-31 18:28:46 +09:00
Dean Herbert
668a39ac6d
Merge branch 'master' into iscreen 2019-01-31 18:19:50 +09:00
Dean Herbert
f85518b175 Don't expose padding 2019-01-31 18:16:28 +09:00
Dean Herbert
b48bb5b792 Move parallax logic out of BackgroundScreenStack 2019-01-31 18:10:33 +09:00
LeNitrous
a8d30f6aee remove unused using 2019-01-31 17:05:50 +08:00
LeNitrous
902be0d059 add grow mod 2019-01-31 17:03:43 +08:00
smoogipoo
bdaff27575 Fix nullref due to screens now being removed from parent 2019-01-31 15:02:07 +09:00
smoogipoo
b90207fa54 Give ScreenTestCase a background stack 2019-01-31 14:55:48 +09:00