Bartłomiej Dach
dd873dbd85
Merge branch 'master' into fix-profile-graph-crash
2020-11-10 12:17:12 +01:00
smoogipoo
6f3f6dc28b
Add hitobject lifetime support
2020-11-10 20:16:52 +09:00
cadon0
539806e9d6
Rewrite - Add empty drawable whenever sprite not found
2020-11-10 23:52:37 +13:00
cadon0
6446074976
Fix paths for storyboard animation sprites
2020-11-10 23:52:37 +13:00
smoogipoo
45e9f16f6b
Add initial DrawableRuleset interface
2020-11-10 19:27:08 +09:00
smoogipoo
757a4b5c31
Add hitobject lifetime model
2020-11-10 19:26:01 +09:00
smoogipoo
88112801eb
Remove result storage from hitobject
2020-11-10 18:56:16 +09:00
Dan Balasescu
ef1036cef1
Merge pull request #10767 from peppy/fix-editor-crash-on-two-mouse-button-click
...
Fix BlueprintContainer triggering assert when left and right mouse button are pressed together
2020-11-10 18:41:58 +09:00
Dan Balasescu
d873229120
Merge pull request #10769 from peppy/fix-mod-select-keys-handle-control
...
Stop mod select overlay hotkeys handling input when control is pressed
2020-11-10 18:37:14 +09:00
smoogipoo
f5076fe3b8
Revert unnecessary change
2020-11-10 18:15:11 +09:00
Dan Balasescu
4e3f6f19f4
Merge pull request #10768 from bdach/force-import-standardised
...
Always store standardised score when populating ScoreInfo
2020-11-10 18:12:35 +09:00
Dean Herbert
833c0b223e
Clamp index to valid bounds
2020-11-10 18:08:12 +09:00
Dean Herbert
2e3dc6fc46
Merge branch 'master' into fix-profile-graph-crash
2020-11-10 18:06:51 +09:00
Dean Herbert
28daff1716
Stop mod select overlay hotkeys handling input when control is pressed
...
Closes https://github.com/ppy/osu/issues/10766 in about the best way we
can for now.
2020-11-10 17:57:59 +09:00
Dan Balasescu
601cc477e5
Merge branch 'master' into fix-editor-crash-on-two-mouse-button-click
2020-11-10 17:42:25 +09:00
Dan Balasescu
86026ad98f
Merge pull request #10764 from peppy/fix-editor-quick-delete-via-left-mouse
...
Fix editor quick delete being triggerable from left mouse button
2020-11-10 17:42:12 +09:00
Dean Herbert
de6fcd1792
Fix BlueprintContainer triggering assert when left and right mouse button are pressed together
2020-11-10 17:16:28 +09:00
Dean Herbert
a012105dac
Fix editor quick delete being triggerable from left mouse button
...
Closes https://github.com/ppy/osu/issues/10629 .
2020-11-10 16:54:37 +09:00
Bartłomiej Dach
109abc0e29
Always store standardised score when populating ScoreInfo
2020-11-10 08:41:00 +01:00
Dean Herbert
5221a34929
Only handle keys which create characters
2020-11-10 16:32:58 +09:00
Dean Herbert
a2ef3aa21a
Force beatmap listing overlay's textbox back on screen when a key is pressed
...
Not the cleanest solution, but works for now. Will eventually be
replaced after the header is updated to reflect the latest designs
(which keeps it on screen in all cases).
Closes https://github.com/ppy/osu/issues/10703 .
2020-11-10 16:26:30 +09:00
Andrei Zavatski
e464e719ef
Merge remote-tracking branch 'refs/remotes/ppy/master' into history-graph
2020-11-10 10:22:57 +03:00
Dean Herbert
6cc0bf17a9
Add explicit lock object and some xmldoc for clarity
2020-11-10 14:31:52 +09:00
Dean Herbert
dc21aebdc7
Merge branch 'master' into fix-bdc-threadsafety
2020-11-10 14:31:51 +09:00
Dean Herbert
85d641c630
Merge pull request #10740 from Game4all/add-multi-statuses
2020-11-10 14:23:26 +09:00
Dean Herbert
4855e43764
Merge pull request #10758 from nbvdkamp/rank-history-json-property-fix
...
Replace rankHistory in JsonProperty with rank_history for consistency
2020-11-10 14:05:25 +09:00
Dean Herbert
582b5454ed
Merge pull request #10759 from Joehuu/disable-watching-yourself
2020-11-10 13:10:54 +09:00
Dean Herbert
4af390a168
Move hierarchy init to load and remove unnecessary field storage
2020-11-10 12:33:07 +09:00
Dean Herbert
de554f9091
Merge pull request #10742 from Morilli/fix-ki-texture-positioning
2020-11-10 12:27:40 +09:00
Joehu
670d6d8719
Make button field readonly
2020-11-09 18:59:54 -08:00
Joehu
c671d97e6f
Disable watch button on the local user
2020-11-09 18:39:35 -08:00
kamp
4303a24a6f
Replace rankHistory in JsonProperty with rank_history
2020-11-10 00:53:24 +01:00
Dean Herbert
37feedae7a
Fix potential crash due to stale index
2020-11-10 07:27:38 +09:00
Dean Herbert
1548c0dc25
Ensure graph hover state is updated after data changes
2020-11-10 07:27:27 +09:00
smoogipoo
0bab5605d1
Merge branch 'master' into dho-apply
2020-11-10 01:30:45 +09:00
smoogipoo
d4d3a6621e
Disable automatic lifetime management
2020-11-10 01:30:25 +09:00
smoogipoo
66ea1572c7
Fix unsafe list manipulation in BeatmapDifficultyCache
2020-11-10 01:10:00 +09:00
smoogipoo
ac47399e6e
Update state after OnApply()
2020-11-10 00:30:23 +09:00
smoogipoo
ec8b726ea8
Re-privatise start time bindable
2020-11-09 21:51:58 +09:00
Lucas A
b8c63e7944
Apply review suggestions.
2020-11-09 13:39:50 +01:00
Dean Herbert
ba137aadc8
Update framework
2020-11-09 20:44:12 +09:00
Dean Herbert
4d6f0a8ea7
Fix API request error handling
2020-11-09 19:42:00 +09:00
Dean Herbert
d99e1ba8dd
Merge branch 'master' into efficient-user-retrieval
2020-11-09 19:41:44 +09:00
Dan Balasescu
33c3b07101
Fix events not being bound correctly
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-11-09 19:06:48 +09:00
Dan Balasescu
a2877fb00a
Merge pull request #10730 from peppy/fix-patcher-no-object-crash
...
Fix legacy patcher crash on no objects present
2020-11-09 18:51:00 +09:00
Morilli
7b0e387dfc
apply different offset based on whether the marker is newStyle or not
2020-11-09 08:20:19 +01:00
Morilli
490fbd1dd8
Fix ki* textures having an incorrect vertical position
2020-11-09 05:54:48 +01:00
Dean Herbert
cfb42037cf
Refactor request string logic to avoid linq usage
2020-11-09 12:23:29 +09:00
Dean Herbert
690e69bcc6
Reforamt for legibility
2020-11-09 12:22:54 +09:00
Dean Herbert
dc69eefa51
Use HashSet instead of ConcurentBag
2020-11-09 11:54:28 +09:00
Dean Herbert
90ce1bd5f0
Add missing async suffix
2020-11-09 10:40:16 +09:00
Lucas A
e44951969f
Use ??= operator instead of null check.
2020-11-08 18:22:19 +01:00
Lucas A
d8d4022119
Precise XMLDoc
2020-11-08 14:39:56 +01:00
Lucas A
48fce8c4b9
Add user activities to multi subscreens.
2020-11-08 13:21:21 +01:00
Lucas A
89b98b5388
Make multiplayer screen handle user activity updates from subscreens.
2020-11-08 13:16:27 +01:00
Lucas A
55070556a7
Move activity setup to BDL.
2020-11-08 12:53:19 +01:00
Lucas A
790a2ca97d
Extract UserActivity logic to OsuGame.
2020-11-08 12:29:52 +01:00
Dean Herbert
42e4df8cc8
Merge branch 'master' into efficient-user-retrieval
2020-11-08 14:35:40 +09:00
Dean Herbert
567cf932f1
Merge pull request #10732 from bdach/editor-exit-stack-overflow
...
Fix crash upon exiting the editor without saving from new beatmap
2020-11-08 12:12:24 +09:00
Bartłomiej Dach
6d4bb4316c
Fix difficulty retrieval for online-sourced beatmaps
2020-11-08 00:12:25 +01:00
Bartłomiej Dach
ddbd6df24d
Unbind bindable lists for general safety
2020-11-07 20:59:57 +01:00
Bartłomiej Dach
e078b78dcc
Ensure callbacks don't fire when restoring default beatmap
2020-11-07 20:59:57 +01:00
Dean Herbert
b0052210b6
Add asserts of HitObjects indices
2020-11-08 00:18:38 +09:00
Dean Herbert
c5b6908e71
Always write [HitObjects] to file
...
I think this is expected. If not, there's an alternative solution.
2020-11-08 00:18:27 +09:00
Dean Herbert
d93cf08570
Merge branch 'master' into dho-apply
2020-11-07 01:18:46 +09:00
smoogipoo
91c627c22d
Revert HOC changes
2020-11-07 00:57:33 +09:00
smoogipoo
b1e039bcec
Prevent overrides from messing with application/freeing
2020-11-07 00:40:26 +09:00
smoogipoo
3a4bd73823
Fix DHOs being freed when not expected
2020-11-07 00:25:26 +09:00
Dean Herbert
f94ac1cbc7
Merge branch 'master' into efficient-user-retrieval
2020-11-07 00:07:29 +09:00
Dean Herbert
84e090583d
Merge pull request #10712 from peppy/move-cache-logic-to-base-impl
...
Move cache and lookup logic to base MemoryCachingComponent class
2020-11-07 00:06:43 +09:00
smoogipoo
7eceda242b
Change derived class to use property
2020-11-06 23:04:28 +09:00
smoogipoo
2d892c7407
Allow Apply() to be called multiple times sequentially
2020-11-06 23:03:29 +09:00
smoogipoo
248d342a2f
Initial Apply()/FreeAfterUse() DHO implementation
2020-11-06 23:02:37 +09:00
smoogipoo
2bef9312d9
Make SkinReloadableDrawable poolable
2020-11-06 22:15:06 +09:00
Dan Balasescu
f230250faf
Merge branch 'master' into editor-slider-control-point-quick-delete
2020-11-06 21:47:37 +09:00
Dean Herbert
4bbd3fe886
Handle null result
2020-11-06 18:37:27 +09:00
Dean Herbert
c3c288145a
Ignore null results for now
2020-11-06 17:55:29 +09:00
Dean Herbert
1ca8b03aa5
Never disable pause button on now playing overlay
2020-11-06 17:26:23 +09:00
Dean Herbert
24be1e183b
Merge branch 'move-cache-logic-to-base-impl' into efficient-user-retrieval
2020-11-06 17:24:36 +09:00
Dean Herbert
c1c3d37720
Remove non-null assert
2020-11-06 17:24:28 +09:00
Dean Herbert
c97c6bbf52
Add and consume user cache class
2020-11-06 17:00:29 +09:00
Dean Herbert
893979b3de
Add exception if attempting to exceed the maximum supported lookup size for one request
2020-11-06 17:00:29 +09:00
Dean Herbert
2457083d8b
Add padding to currently playing view
2020-11-06 17:00:29 +09:00
Dean Herbert
db039da668
Add and consume multi-lookup API endpoint
2020-11-06 17:00:29 +09:00
Dean Herbert
aa252d562a
Rename top user request to make way for new type
2020-11-06 17:00:29 +09:00
Dean Herbert
f51cb0dd14
Add ruleset fallback logic into cache lookup class
2020-11-06 16:58:53 +09:00
Dean Herbert
d3a303e251
Use CheckExists function
2020-11-06 16:57:09 +09:00
Dean Herbert
9bb32f0914
Merge branch 'master' into move-cache-logic-to-base-impl
2020-11-06 16:56:35 +09:00
Dan Balasescu
44c6457c85
Merge branch 'master' into add-spinner-spin
2020-11-06 15:40:40 +09:00
Dean Herbert
c5b172d0dd
Remove synchronous lookup path from BeatmapDifficultyCache
2020-11-06 14:53:15 +09:00
Dan Balasescu
972fc54c2d
Merge pull request #10710 from peppy/user-id-as-int
...
Use int instead of long for user_id fields for now
2020-11-06 14:35:14 +09:00
Dean Herbert
1dcbf15d81
Merge branch 'master' into move-cache-logic-to-base-impl
2020-11-06 14:35:06 +09:00
Dan Balasescu
9ec5f9bff8
Merge pull request #10711 from peppy/rename-cache-classes
...
Rename cache classes in line with their function (and share a base implementation)
2020-11-06 14:34:47 +09:00
Dean Herbert
b69ada64e8
Update BeatmapDifficultyCache to use base implementation logic
2020-11-06 14:31:21 +09:00
Dean Herbert
a2606d31c7
Move lookup/storage/compute logic to base class (and consume in ScorePerformanceCache)
2020-11-06 13:51:41 +09:00
Dean Herbert
517a656899
Move StarDifficulty to own file
2020-11-06 13:51:25 +09:00
Dean Herbert
74ca2faa31
Remove unused using
2020-11-06 13:48:06 +09:00
Dean Herbert
07166ec819
Fix a couple of remaining unnecessary casts
2020-11-06 13:29:47 +09:00
Dean Herbert
0103b12575
Add basic base class to begin to standardise function across caching components
2020-11-06 13:26:39 +09:00
Dan Balasescu
71a1165209
Merge branch 'master' into drawable-hit-object-hit-state-fix
2020-11-06 13:19:25 +09:00
Dean Herbert
14bb079feb
Rename ScorePerformanceManager to ScorePerformanceCache
2020-11-06 13:15:33 +09:00
Dean Herbert
5113d4af8f
Rename BeatmapDifficultyManager to BeatmapDifficultyCache
2020-11-06 13:14:29 +09:00
Dean Herbert
1e1569eb53
Use int instead of long for user_id fields for now
2020-11-06 12:59:46 +09:00
Dean Herbert
d774afd224
Update framework
2020-11-05 22:29:44 +09:00
Dean Herbert
309b1d6334
Merge pull request #10695 from peppy/fix-skinnable-test-scene
...
Fix SkinnableTestScene's autosize propagation
2020-11-05 20:48:36 +09:00
Dean Herbert
a0b3379909
Fix judgement offsets being zero when windows are empty
2020-11-05 18:58:37 +09:00
Dean Herbert
2bbdbfda5c
Merge pull request #10696 from smoogipoo/visibility-adjustment-mod
2020-11-05 18:18:57 +09:00
Dean Herbert
2d50a7b616
Fix a few xmldoc typos
2020-11-05 17:38:02 +09:00
Dean Herbert
019d286ce8
Merge branch 'drawable-hit-object-hit-state-fix' into add-spinner-glow
2020-11-05 17:27:38 +09:00
Dean Herbert
8aa0a698d9
Avoid errors due to second set
2020-11-05 17:26:41 +09:00
Dean Herbert
9c91f16e3a
Update sizing as early as possible in addition to scheduling (to handle any dependent edge cases)
2020-11-05 17:24:59 +09:00
Dean Herbert
8293846afc
Merge branch 'master' into fix-skinnable-test-scene
2020-11-05 17:24:24 +09:00
Dean Herbert
0cadb31947
Merge branch 'master' into drawable-hit-object-hit-state-fix
2020-11-05 17:07:52 +09:00
smoogipoo
9d5b1ec28c
Add removal dates
2020-11-05 17:04:11 +09:00
Dean Herbert
2d0c62dce2
Fix SkinnableTestScene's autosize propagation
...
Regressed with recent DrawableHitObject changes (moving of
RelativeSizeAxes specifications out of constructors).
2020-11-05 16:37:48 +09:00
Dean Herbert
414daab1dc
Fix paused samples potentially getting stuck in a playing state in rapid toggling
...
Closes #10693 . Should be obvious why.
2020-11-05 16:14:23 +09:00
smoogipoo
cc518feca7
Make methods abstract
2020-11-05 16:03:10 +09:00
smoogipoo
a219aa7ba2
Add xmldoc
2020-11-05 15:53:35 +09:00
smoogipoo
628b8be15d
Implement ModWithVisibilityAdjustment
2020-11-05 15:40:25 +09:00
smoogipoo
9a7fcadabc
Use BDL for top-level osu! DHOs
2020-11-05 13:51:46 +09:00
Dan Balasescu
ea2fd831ab
Merge branch 'master' into editor-slider-control-point-quick-delete
2020-11-05 00:38:42 +09:00
Dean Herbert
d19b799f44
Invert boolean logic
2020-11-04 17:53:03 +09:00
Dean Herbert
68b7efe4d5
Change order of execution to be chronological
2020-11-04 17:14:23 +09:00
Dean Herbert
831325978a
Always execute UpdateHitStateTransforms (even for idle)
2020-11-04 17:14:23 +09:00
Dean Herbert
3b6cf95f49
Remove parameter from StartTime method and add obsoleted previous version
2020-11-04 16:39:52 +09:00
Dean Herbert
7f30140b7e
Add new method handling hit state specifically
...
Until now UpdateStateTransforms was applying results offsets to
StartTime. This didn't cover the case of a HitObject with duration,
where the call would be made with `StartTime + hitOffset` rather than
`EndTime + hitOffset`.
To resolve this, a new method has been added which should be used to
handle hit-specific state transforms.
2020-11-04 16:13:14 +09:00
Dan Balasescu
3322c2bbc5
Merge branch 'master' into ios-editor-crash-fix
2020-11-04 15:56:40 +09:00
Dean Herbert
487a5ecdba
Replace all usage of IBindableList.GetBoundCopy
2020-11-04 15:29:14 +09:00
Dan Balasescu
42c543f5b9
Merge branch 'master' into fix-editor-play-after-drag
2020-11-04 14:45:20 +09:00
Dan Balasescu
98c992004b
Merge pull request #10660 from peppy/fix-song-select-first-track-looping
...
Fix looping mode not being set on first track after entering song select
2020-11-04 14:37:27 +09:00
Dan Balasescu
c6779b414e
Merge pull request #10611 from peppy/spectator-listing
...
Add "currently playing" player listing and spectator UI flow
2020-11-04 14:08:11 +09:00
Dean Herbert
cfe3218239
Move scheduler call to inside method itself for added safety
2020-11-04 10:23:06 +09:00
Dean Herbert
29e8e5ab94
Merge branch 'master' into fix-load-async-after-disposal-beatmap-wedge
2020-11-04 10:23:05 +09:00
Dean Herbert
9dc2ca666d
Merge branch 'master' into spectator-listing
2020-11-04 09:30:15 +09:00
Bartłomiej Dach
3bb86ce127
Merge branch 'master' into editor-waveform-opacity
2020-11-03 23:04:19 +01:00
Bartłomiej Dach
13f729916a
Merge branch 'master' into editor-timeline-scroll-mousewheel
2020-11-03 22:27:35 +01:00
Bartłomiej Dach
ddf0d75c38
Don't fall through to seek if handling zoom
2020-11-03 21:49:21 +01:00
Bartłomiej Dach
4b528e80d0
Use AltPressed shorthand
2020-11-03 21:49:04 +01:00
Bartłomiej Dach
211510fe9a
Fix undesirable vertical spacing in currently playing display
2020-11-03 19:12:03 +01:00
Bartłomiej Dach
86d283ebf4
Adjust layout slightly to avoid specifying width twice
2020-11-03 19:03:48 +01:00
Bartłomiej Dach
18428dff8e
Ensure hotkey actions are executable in handler
2020-11-03 18:01:12 +01:00
Dean Herbert
83c004bbde
Add key bindings for flip and reverse patterns
2020-11-03 21:10:31 +09:00
Dean Herbert
9f333ac58a
Add the ability to delete slider control points using shift+right click
...
Closes https://github.com/ppy/osu/issues/10672 .
In two minds about how this should be implemented but went in this
direction initially. The other way would be to add local handling of
Shift-Right Click inside PathControlPointPiece (which is already doing
mouse handling itself).
2020-11-03 20:46:33 +09:00
Dean Herbert
1b2bd6a8c9
Remove redundant base call
2020-11-03 20:10:13 +09:00
Dean Herbert
3e29e468ea
Ensure "start watching" button starts in a disabled state
2020-11-03 20:06:42 +09:00
Dean Herbert
a3c67aabe2
Merge branch 'master' into spectator-listing
2020-11-03 19:56:25 +09:00
Dean Herbert
d788931661
Fix LoadComponentAsync calls potentially occuring after beatmap wedge disposal
...
As seen in https://ci.appveyor.com/project/peppy/osu/builds/36109658/tests .
Also adds cancellation logic for good measure.
2020-11-03 19:53:45 +09:00
Dean Herbert
df9ff76f23
Reduce assert to guard in the outwards direction
2020-11-03 16:49:13 +09:00
Dean Herbert
f701a38e20
Merge branch 'master' into fix-song-select-first-track-looping
2020-11-03 16:48:20 +09:00
Dean Herbert
c2ffc18379
Change editor timeline mouse wheel handling to scroll by default (and zoom with alt held)
2020-11-03 16:30:11 +09:00
