UselessToucan
b5e04f6161
Merge branch 'master' into notify_track_completion_failure
2019-02-08 19:37:23 +03:00
Dan Balasescu
7ec0b4ba77
Fix nullref during room creation ( #4228 )
2019-02-08 17:53:01 +09:00
Dan Balasescu
959b1ac845
Fix potential nullref when exiting multiplayer ( #4227 )
...
Fixes https://github.com/ppy/osu/issues/3954
2019-02-08 17:28:00 +09:00
Dan Balasescu
7ee8115eaa
Merge pull request #4220 from HoLLy-HaCKeR/diffcalc-proper-attributes
...
Use correct DifficultyAttributes where possible
2019-02-07 12:42:31 +09:00
Dan Balasescu
5b4933ca60
Merge branch 'master' into diffcalc-proper-attributes
2019-02-07 12:30:55 +09:00
Dan Balasescu
8402c4c4ef
Merge pull request #4221 from Morilli/patch-1
...
Fix typo in README.md
2019-02-07 12:20:26 +09:00
Moritz Bender
6e2ecd5fcc
Fix typo in README.md
2019-02-06 21:59:47 +01:00
HoLLy
ae9d5f999c
Use correct DifficultyAttributes where possible
2019-02-06 21:28:42 +01:00
ProgrammaticNajel
9f8e724a76
Fix background being cut off at the top of the screen ( #4207 )
...
Fix background being cut off at the top of the screen
2019-02-06 18:14:33 +09:00
Dan Balasescu
0d6ce3b8bb
Merge pull request #4213 from ekrctb/vscode-task-restore-fix
...
Fix VSCode Restore task
2019-02-06 12:12:30 +09:00
ekrctb
0e3a087ed3
Fix VSCode Restore task
2019-02-06 12:02:04 +09:00
Dan Balasescu
43d66b2e90
Merge pull request #4209 from peppy/fix-combo-color-fallbacks
...
Fix combo colour fallbacks when skin is not providing any
2019-02-06 11:38:59 +09:00
Dean Herbert
5b1f111922
Rollback other fallthrough regressions
2019-02-05 18:14:43 +09:00
Dean Herbert
8ae2861ed6
Fix class name
2019-02-05 18:09:15 +09:00
Dean Herbert
a6b2e9eb0b
Remove unused pieces of ini
2019-02-05 18:08:27 +09:00
Dean Herbert
2f8f4fac64
Fix combo colour fallbacks when skin is not providing any
2019-02-05 17:54:14 +09:00
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
Roman Kapustin
71efbcf603
Merge remote-tracking branch 'ppy/master' into notify_track_completion_failure
2019-02-03 16:14: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
EVAST9919
3b529b7bda
Enable the sidebar and move "back" button to the key binding overlay
2019-02-03 14:34:04 +03: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
Roman Kapustin
4c866e7940
Add PlaylistItemHandle.HandlePositionalInput override
2019-02-01 22:37:27 +03: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
