1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 04:22:54 +08:00
Commit Graph

40772 Commits

Author SHA1 Message Date
Bartłomiej Dach
8193691cbc Invert condition to reduce nesting 2021-06-03 14:09:52 +02:00
Bartłomiej Dach
acb4873157 Merge branch 'master' into keyboard_shortcuts 2021-06-03 14:09:48 +02:00
Dean Herbert
d1110d00a0
Merge pull request #12204 from ilsubyeega/drawavatar-use-avatar-url
Use avatar_url from user first instead of a.ppy.sh in DrawableAvatar
2021-06-03 20:13:14 +09:00
Dean Herbert
33ab411e39 Merge branch 'master' into drawavatar-use-avatar-url 2021-06-03 19:36:32 +09:00
smoogipoo
e887807ae7 Apply review fixes 2021-06-03 18:32:05 +09:00
smoogipoo
be03a2d7d2 Fix multiple calls to seek method potentially not working 2021-06-03 17:47:22 +09:00
smoogipoo
c3280083a2 Merge branch 'master' into fix-spectator-frame-conversion 2021-06-03 17:42:01 +09:00
smoogipoo
662bbed5d1 Fix seeking to gameplay too soon 2021-06-03 17:38:51 +09:00
Dan Balasescu
15b43beef1
Merge pull request #11857 from Syriiin/diffcalc/refactor/catch-clockrate-effects
Refactor catch Movement skill to not require explicit clockrate usage
2021-06-03 17:29:27 +09:00
Dan Balasescu
d39eb7eac2
Merge pull request #12952 from peppy/autoplay-pause-support
Externalise autoplay generation from `Player` to allow use of replay playback functions
2021-06-03 17:29:17 +09:00
smoogipoo
3bc81fbb06 Fix spectator tests 2021-06-03 17:27:24 +09:00
smoogipoo
420df124b5 Add framestable-bypassing seek for spectator 2021-06-03 17:27:21 +09:00
Dean Herbert
8b43cfdd7d
Merge pull request #12568 from Pasi4K5/mod-osu-random
Add mod "Random" for osu! ruleset
2021-06-03 17:14:27 +09:00
Dan Balasescu
69009a36b7
Merge branch 'master' into autoplay-pause-support 2021-06-03 16:37:41 +09:00
Dan Balasescu
ccb2fce0fc
Merge pull request #13314 from peppy/test-platform-actions
Add nested `PlatformActionContainer` to allow testing of platform actions in visual tests
2021-06-03 16:33:43 +09:00
Dean Herbert
48687028a3 Merge branch 'test-platform-actions' into keyboard_shortcuts 2021-06-03 15:35:57 +09:00
Dean Herbert
be91203c92 Add nested PlatformActionContainer to allow testing of platform actions in visual tests 2021-06-03 15:35:32 +09:00
Dean Herbert
b917d6d80c Update tests to check for correct platform action keys 2021-06-03 15:34:06 +09:00
Samuel Cattini-Schultz
f51413ead9 Refactor to pass clockrate in constructor rather than deriving from mods 2021-06-03 16:09:42 +10:00
Dean Herbert
e74fe68c96 Use new platform actions instead of hardcoded keys 2021-06-03 15:04:07 +09:00
ekrctb
b321b20e9d Remove OnAdd/OnRemove of HitObjectContainer
Instead, override `AddDrawable`/`RemoveDrawable`.
2021-06-03 15:00:16 +09:00
ekrctb
0ce7baa3f3 Make HitObjectContainer.Clear non-virtual
It just call `Remove` for all entries.
2021-06-03 15:00:16 +09:00
ekrctb
2c9e5b6c7e Replace EntryCrossedBoundary with more useful RemoveRewoundEntry property
It can be used for dynamically added entries.
2021-06-03 15:00:16 +09:00
ekrctb
fe2934db1d Factor out lifetime management logic of HitObjectContainer 2021-06-03 14:57:28 +09:00
Dean Herbert
a91015302e Replace second usage of new function 2021-06-03 14:56:29 +09:00
Dean Herbert
a6cc37eb3b Mark fields readonly 2021-06-03 14:56:21 +09:00
Nathan Alo
d7d0dde5d2 use created storyboard to check for drawables instead 2021-06-03 13:56:14 +08:00
Samuel Cattini-Schultz
7cdef5cb0a Merge branch 'master' into diffcalc/refactor/catch-clockrate-effects 2021-06-03 15:51:03 +10:00
Dean Herbert
4a5d8215f3
Merge branch 'master' into keyboard_shortcuts 2021-06-03 14:47:40 +09:00
Samuel Cattini-Schultz
94701b77cb Add TODO for variable clockrate support in catch difficulty calculator 2021-06-03 15:44:28 +10:00
Dean Herbert
66dd7b7705 Update test logic to allow gameplay to properly continue 2021-06-03 14:38:50 +09:00
Nathan Alo
62b07fb9ce apply suggestions
- Replace the sprite with a solid black box when a storyboard requests it.
- Create a new storyboard instance and exclude the fail layer as well as strip all samples from it
- Do not attempt in creating the storyboard when it isn't needed
2021-06-03 13:27:00 +08:00
Nathan Alo
d00fb21188 prevent scaling container from creating a storyboard background 2021-06-03 13:24:21 +08:00
Dan Balasescu
44b1102241
Merge branch 'master' into autoplay-pause-support 2021-06-03 13:26:00 +09:00
Dean Herbert
a62dd7cca0 Revert "refactor BeatmapBackgroundWithStoryboard to reduce overhead"
This reverts commit 277545bb06.
2021-06-03 12:33:16 +09:00
Dan Balasescu
86a7ab791e
Merge pull request #13308 from peppy/fix-zero-statistics-display
Fix beatmap statistics with value of zero not displaying correctly at song select
2021-06-03 10:53:55 +09:00
Dean Herbert
d6656047e3 Fix beatmap statistics with value of zero not displaying correctly at song select
Closes #13307.
2021-06-03 01:58:51 +09:00
Nathan Alo
277545bb06 refactor BeatmapBackgroundWithStoryboard to reduce overhead
This avoids loading the sprite if its not needed and instead of hiding it, it is removed when the storyboard replaces the background or there is a video.

This also only initializes DrawableStoryboard if there are any elements in any layer.
2021-06-02 20:27:12 +08:00
Dean Herbert
cde8de154d Remove unused test property for now 2021-06-02 19:11:09 +09:00
Dan Balasescu
c065f761c7
Merge branch 'master' into legacy-skin-default-fallback 2021-06-02 19:08:52 +09:00
Dean Herbert
e0eb0adb0a Remove unnecessary bind in ReplayPlayer 2021-06-02 18:32:14 +09:00
Dan Balasescu
7b88ba8c63
Merge pull request #13300 from peppy/fix-ios-package-mismatch
Fix iOS props Newtonsoft.Json version not matching osu.Game
2021-06-02 18:15:30 +09:00
Dan Balasescu
ff9b1c19e1
Merge pull request #13298 from peppy/fix-stable-import-no-songs-folder
Fix osu!stable directory selection failing if no `Songs` folder is present at install location
2021-06-02 17:47:05 +09:00
Nathan Alo
3c3ef13632 remove fade 2021-06-02 16:28:22 +08:00
Nathan Alo
e66f6e8f91 fix inspect code issues and cleanup code 2021-06-02 16:12:41 +08:00
Nathan Alo
dde64adcb5 add new background type in BackgroundScreenDefault 2021-06-02 15:51:43 +08:00
Nathan Alo
dec18ef826 implement BeatmapBackgroundWithStoryboard 2021-06-02 15:50:58 +08:00
Nathan Alo
5b436ee436 add beatmap with storyboard source 2021-06-02 15:50:33 +08:00
Dean Herbert
d00cd7be31
Merge pull request #12848 from frenzibyte/remove-hud-component-lookup
Remove HUD skin component lookup in favour of the `MainHUDComponents` target system
2021-06-02 16:45:56 +09:00
Dean Herbert
e76e540ac1 Fix iOS props Newtonsoft.Json version not matching osu.Game 2021-06-02 16:45:25 +09:00