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

21982 Commits

Author SHA1 Message Date
Dean Herbert
d0e8b1efce Merge remote-tracking branch 'upstream/master' into add-chat-truncation 2019-09-09 12:09:14 +09:00
Dean Herbert
eeebd517f3 Use MaxWidth specification 2019-09-09 12:08:59 +09:00
Dean Herbert
f0b1995c2a
Add android configuration defaults to props (#6033)
Add android configuration defaults to props
2019-09-09 11:17:21 +09:00
LeNitrous
be4f0cc2dd remove null conditional 2019-09-09 06:14:49 +08:00
miterosan
8862cdab9c Also set the default for Platform 2019-09-08 15:33:51 +02:00
miterosan
d790656b7e Revert shortening the condition 2019-09-08 15:33:16 +02:00
LeNitrous
a67a2899a9 move api state check to it's own clause 2019-09-08 16:18:15 +08:00
LeNitrous
3435e2a8d3 open login on enter main menu 2019-09-08 13:36:58 +08:00
miterosan
6581e51d6a Add a default for the configuration into the android props.
This allows building even if no configuration is specified.
2019-09-07 18:03:33 +02:00
iiSaLMaN
be803fa921 Reset score processor before starting the simulation 2019-09-07 18:15:49 +03:00
Dean Herbert
ec7a50b75f Fix already caught osu!catch objects not correctly disappearing 2019-09-08 00:10:31 +09:00
Dean Herbert
fdd3687437 Fix catcher additive sprites staying on screen during rewind 2019-09-08 00:09:24 +09:00
miterosan
c397ab6282 Fix Android Builds. 2019-09-07 17:04:13 +02:00
iiSaLMaN
55b2bc1ed5 Set Health default value to 1 2019-09-07 18:03:04 +03:00
Dean Herbert
7f2d14416a Reset DrawableHitObject lifetimes on state change 2019-09-07 14:44:44 +09:00
Dan Balasescu
f51ff55328
Merge pull request #6020 from peppy/volume-at-pause
Allow global actions to propagate through pause screen
2019-09-06 20:03:52 +09:00
Dan Balasescu
f47f0e797c
Merge branch 'master' into volume-at-pause 2019-09-06 19:47:37 +09:00
Dan Balasescu
ae083ccc1f
Merge pull request #6022 from peppy/fix-drag-out-chat
Fix dragging from inside to outside an overlay incorrectly hiding
2019-09-06 19:45:36 +09:00
Dean Herbert
c6b8f2db77 Update historic licence header 2019-09-06 19:05:50 +09:00
Dean Herbert
374479f837 Add truncatino of long usernames in chat 2019-09-06 19:00:57 +09:00
Dean Herbert
95baae5088 Fix dragging from inside to outside an overlay incorrectly hiding 2019-09-06 18:27:54 +09:00
Dean Herbert
88d0756107 Allow global actions to propagate through pause screen 2019-09-06 17:17:30 +09:00
Dean Herbert
e5c3a906d7
Merge pull request #5637 from iiSaLMaN/stop-counting-to-score-after-fail
Disallow adding to score after the player has failed

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-06 17:11:26 +09:00
Dean Herbert
b89fb5cdf7 Fix failing test 2019-09-06 16:51:30 +09:00
Dean Herbert
6ce36bd39e
Merge branch 'master' into stop-counting-to-score-after-fail 2019-09-06 16:12:53 +09:00
Dean Herbert
a50284a5eb
Merge pull request #6019 from peppy/hit-window-refactor
Refactor HitWindows for legibility
2019-09-06 16:10:04 +09:00
Dean Herbert
75476df1af
Use float types for chat overlay height (#5960)
Use float types for chat overlay height
2019-09-06 16:08:16 +09:00
Dean Herbert
985375d1c6 Remove private field xmldoc 2019-09-06 15:47:01 +09:00
Dean Herbert
b3f61abd49
Use float types for cursor sizes (#5958)
Use float types for cursor sizes
2019-09-06 15:45:44 +09:00
Dean Herbert
4a1c90a048
Remove judgementOccurred from DrawableHitObject (#5986)
Remove judgementOccurred from DrawableHitObject

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-06 15:42:37 +09:00
Dean Herbert
4031f51745 More permissive IsHitResultAllow by default 2019-09-06 15:37:30 +09:00
Dean Herbert
6cdc87bd29 Fix allowed results omissions 2019-09-06 15:37:20 +09:00
Dean Herbert
c379480e7b
Merge branch 'master' into remove-judgement-occurred 2019-09-06 15:32:34 +09:00
Dean Herbert
f925e781a9 Refactor HitWindows for legibility 2019-09-06 15:24:14 +09:00
Dean Herbert
fbdef97498
Fix fallback to default combo colours not working (#6009)
Fix fallback to default combo colours not working
2019-09-06 12:36:39 +09:00
Dean Herbert
404ad3834d
Merge pull request #6008 from peppy/fix-sample-fallback
Add back missing sample fallback to default skin

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-06 12:36:31 +09:00
Dean Herbert
e1c50da05e
Merge pull request #6018 from ppy/dependabot/nuget/Humanizer-2.7.2
Bump Humanizer from 2.6.2 to 2.7.2
2019-09-06 12:18:01 +09:00
Dean Herbert
f4f9519761 Add todo comment 2019-09-06 12:16:20 +09:00
Dean Herbert
bf6f803e69 Nest temporary class 2019-09-06 12:12:27 +09:00
Dean Herbert
7d1f5310d2 Don't implement anything 2019-09-06 12:03:29 +09:00
dependabot-preview[bot]
43aed7fea7
Bump Humanizer from 2.6.2 to 2.7.2
Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.6.2 to 2.7.2.
- [Release notes](https://github.com/Humanizr/Humanizer/releases)
- [Changelog](https://github.com/Humanizr/Humanizer/blob/master/release_notes.md)
- [Commits](https://github.com/Humanizr/Humanizer/compare/v2.6.2...v2.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-06 02:58:58 +00:00
Dan Balasescu
5dbdce17a7
Merge branch 'master' into fix-sample-fallback 2019-09-06 11:27:39 +09:00
Dan Balasescu
d1f04639fc
Merge pull request #6010 from peppy/fix-config-disposal
Dispose config managers ahead of time to avoid database errors
2019-09-06 11:24:54 +09:00
Dean Herbert
50985d1b1d Fix disposal logic 2019-09-06 10:43:19 +09:00
Dean Herbert
d6cdde552d Add comment explaining dispose logic 2019-09-06 01:14:37 +09:00
Dean Herbert
5b094f8e1d Actually register the RulesetConfigCache as a component 2019-09-06 01:13:58 +09:00
Dean Herbert
dafe9da851 Dispose config managers ahead of time to avoid database errors 2019-09-06 00:22:35 +09:00
Dean Herbert
a0aeccf232 Fix fallback to default combo colours not working 2019-09-05 23:24:13 +09:00
Dean Herbert
60c2d113b8 Fix typo 2019-09-05 23:07:03 +09:00
Dean Herbert
0a6c42972c Add back missing sample fallback to default skin 2019-09-05 23:01:35 +09:00