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

21629 Commits

Author SHA1 Message Date
Dean Herbert
94dc61150b
Merge branch 'master' into fix-drawable-judgement-animation-loss 2020-11-27 00:43:47 +09:00
Dean Herbert
b1864670a2
Merge pull request #10961 from smoogipoo/better-dho-rewind
Rewind pooled DHOs into better states
2020-11-27 00:42:58 +09:00
Dan Balasescu
220657c2cc
Merge branch 'master' into replay-pausing-support 2020-11-27 00:09:40 +09:00
Dan Balasescu
882fcdb13a
Merge pull request #10975 from peppy/standardise-binding-description-case
Standardise binding description case to sentence casing
2020-11-26 23:54:13 +09:00
smoogipoo
aa4da2a5f8 Add xmldoc on State 2020-11-26 23:42:05 +09:00
Dean Herbert
1e79cb498b Standardise binding description case to sentence casing 2020-11-26 20:07:16 +09:00
Dean Herbert
3346c06aca Rename variable/text to be more verbose as to toggle purpose 2020-11-26 20:04:44 +09:00
Dean Herbert
741902f1b3
Merge pull request #10971 from smoogipoo/fix-timeline-combo-colour
Fix timeline blueprints sometimes not receiving combo colours
2020-11-26 19:47:21 +09:00
Dean Herbert
da6bccc812 Apply beat snap if positional snap doesn't give a time result 2020-11-26 19:20:51 +09:00
Dean Herbert
91592cf32d Expose EditorClock for consumption 2020-11-26 19:20:39 +09:00
Dean Herbert
9811c46e35 Rename application method to better describe what it actually does 2020-11-26 19:16:18 +09:00
ekrctb
05e245d445 Allow non-pooled DHO to be reused 2020-11-26 19:07:09 +09:00
Dean Herbert
0a48dd8f76 Delegate scroll animation to panels themselves 2020-11-26 18:42:51 +09:00
Dean Herbert
ad258e2e52 Update scroll position before applying any panel animations
In the case of automatic scroll requirements (ie. scroll to selected) we
are delegating the animation logic to the panels themselves. In order to
make this work correctly, the scroll operation needs to take effect
before any animation updates are run.
2020-11-26 18:33:41 +09:00
Dean Herbert
6058c66edb Move drawable carousel set movement logic into panels themselves 2020-11-26 18:32:43 +09:00
Dean Herbert
f8db7a9902 Remove ScrollableContent container from carousel
This was causing multiple issues with masking and sizing and really
didn't need to exist in the first place. Also not sure why the pool was
nested inside the scroll container, but it isn't any more. Probably for
the best.
2020-11-26 18:28:54 +09:00
Dean Herbert
02d5b1352b Expose generic version of OsuScrollContainer 2020-11-26 18:25:56 +09:00
smoogipoo
e53f849aa0 Completely separate combo colours from DHOs 2020-11-26 18:14:25 +09:00
smoogipoo
f562854feb Fix timeline objects sometimes not receiving combo colours 2020-11-26 17:22:22 +09:00
Dan Balasescu
aad6cf4ad3
Merge branch 'master' into editor-multiple-object-positional-snap 2020-11-26 17:06:47 +09:00
Dan Balasescu
a0e47ae13f
Merge pull request #10960 from peppy/fix-editor-volume-adjust
Fix volume not being adjustable in the editor using alt-scroll
2020-11-26 15:37:57 +09:00
ekrctb
eae33fe74a Fix format 2020-11-26 14:16:33 +09:00
ekrctb
e43f928588 Use DHO.HitObjectApplied to invalidate computation 2020-11-26 14:07:40 +09:00
ekrctb
f6faf95e33 Revert changes to HitObjectUsageBegan, not use it. 2020-11-26 14:01:46 +09:00
ekrctb
1a6e5bdaba Merge branch 'master' into pool-scrolling 2020-11-26 13:52:52 +09:00
Bartłomiej Dach
8ff1688c4b
Merge branch 'master' into fix-drawable-judgement-animation-loss 2020-11-25 20:11:09 +01:00
smoogipoo
0414e5c550 Add MaximumJudgementOffset to DrawableHitObject, use in more places 2020-11-26 01:12:42 +09:00
smoogipoo
c744db1b57 Rewind pooled DHOs into better states 2020-11-26 00:42:25 +09:00
Dean Herbert
0ddeff648d Fix incorrect index lookup on non-ordered selections 2020-11-25 17:25:54 +09:00
Dean Herbert
d4c6d6275e Fix volume not being adjustable in the editor using alt-scroll
We do this in other places so I think it's fine to handle like this for
now (until we come up with a better global solution).

Closes #10958.
2020-11-25 16:46:22 +09:00
Dean Herbert
c46d655832 Uncomment incorrectly commented lines 2020-11-25 12:11:44 +09:00
ekrctb
b8a5cd94f7 Invoke HitObjectUsageFinished before removal 2020-11-24 19:46:57 +09:00
Dan Balasescu
4311526c0a
Merge branch 'master' into on-drawable-hitobject-added 2020-11-24 19:23:54 +09:00
ekrctb
e34a205104 Rewrite hit object management, take three 2020-11-24 18:56:05 +09:00
ekrctb
7f6e4d5b21 Delay lifetime computation until loaded 2020-11-24 18:56:05 +09:00
ekrctb
d5f082e5fb Comment about lifetime assumption 2020-11-24 18:56:05 +09:00
ekrctb
ce57e8ddfb Separate Lifetime computation and layout update 2020-11-24 18:56:05 +09:00
ekrctb
cabc8aa63b Revert "Simplify ScrollingHitObjectContainer logic"
This reverts commit b4cc39149c117e6a0e95ee917a67cec8ba723d06.
2020-11-24 18:56:05 +09:00
ekrctb
8f39b54e58 Simplify ScrollingHitObjectContainer logic 2020-11-24 18:56:05 +09:00
ekrctb
5c743adbae Support hit object pooling scrolling playfield 2020-11-24 18:56:05 +09:00
Dean Herbert
d5a4d46c6d
Merge pull request #10842 from EVAST9919/profile-overlay-graph-new
Implement history charts for Profile Overlay
2020-11-24 18:05:17 +09:00
Dean Herbert
c9a41f9dae Make all objects in selection candidates for spatial snapping
Closes #10898.
2020-11-24 17:35:54 +09:00
Dan Balasescu
5d65665b42
Merge pull request #10943 from peppy/editor-setup-scroll-to-file-selector
Scroll editor setup screen to file selector on display
2020-11-24 16:26:25 +09:00
Dan Balasescu
87ce8a53ff
Merge branch 'master' into on-drawable-hitobject-added 2020-11-24 16:09:57 +09:00
Dean Herbert
bd1dad5477 Remove null allowance for now 2020-11-24 15:54:27 +09:00
Dean Herbert
1d82557d9f Avoid blocking global actions when skip overlay is not actually active 2020-11-24 15:42:14 +09:00
Dean Herbert
72b8eef36e Add ability to pause/resume replay playback 2020-11-24 15:41:56 +09:00
Dean Herbert
1682260677 Remove left over logging line 2020-11-24 15:28:03 +09:00
Dean Herbert
ee33f62809 Fix DrawableJudgement not always animating correctly on skin change
If the skin is changed before gameplay has started (at the loading
screen) it is possible for a sequence of events to occur which results
in the animation not being played:

- `SkinReloadableDrawable` runs its BDL load (and calls `OnSkinChanged`
  once)
- User changes skin, triggering `DrawableJudgement`'s skin change
  handling (binding directly on the `SkinSource` locally)
- This will call `PrepareDrawables` and reinitialise the
  `SkinnableDrawable` child hierarchy, then immediately apply the
animations to it.
- The new `SkinnableDrawable` will then get the `SkinChanged` event and
  schedule a handler for it, which will run on its first Update call.
- Any added animations will be lost as a result.

Fixed by binding directly to the `SkinnableDrawable`'s `OnSkinChanged`.
This has the added bonus of not needing to reinitialise the child
hierarchy on skin change (which felt a bit weird in the first place).
2020-11-24 15:23:53 +09:00
Dan Balasescu
57ff150051
Merge pull request #10829 from Joehuu/music-osd-bindings
Add music bindings to on screen display
2020-11-24 14:36:34 +09:00
Joehu
1fd4b04767 Just set music shortcut text locally 2020-11-23 20:43:46 -08:00
Dean Herbert
e36b1051c1 Add spacing between inline comments 2020-11-24 13:15:59 +09:00
Dean Herbert
82640418ba Invert hide logic for readability 2020-11-24 13:12:04 +09:00
Dean Herbert
44ca67c534 Simplify fill logic and add xmldoc 2020-11-24 13:10:11 +09:00
Dean Herbert
37ea65de2a
Merge branch 'master' into profile-overlay-graph-new 2020-11-24 12:52:59 +09:00
Joehu
52f5473cc0 Set global action as a parameter in toast 2020-11-23 15:13:58 -08:00
Bartłomiej Dach
5701b32bae Handle constant graphs better 2020-11-23 22:12:32 +01:00
Bartłomiej Dach
8347ecf494 Simplify row tick creation code 2020-11-23 21:52:47 +01:00
Bartłomiej Dach
7b0d3dfe0c Refactor tick calculation code for readability 2020-11-23 21:38:04 +01:00
Bartłomiej Dach
bb5aa9a9c9 Guard against empty values early 2020-11-23 21:24:37 +01:00
Bartłomiej Dach
e9ffeb8b5d Make missing date check more robust 2020-11-23 21:09:42 +01:00
Dean Herbert
060acb9010
Merge pull request #10935 from bdach/fix-mania-judgement-fade-in
Rewind judgement transforms before clearing
2020-11-23 17:05:04 +09:00
Dean Herbert
5e014fc4fe
Merge pull request #10941 from LumpBloom7/improve-MenuVisualizer
Improve LogoVisualisation looks when MenuGlow colors are used
2020-11-23 15:25:18 +09:00
Dean Herbert
19faa2b9bb Add comment covering intentional call to ClearTransformsAfter 2020-11-23 15:20:59 +09:00
Andrei Zavatski
1b33d30039 Simplify horizontal ticks creation 2020-11-23 08:52:29 +03:00
Andrei Zavatski
42741895e6 Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-overlay-graph-new 2020-11-23 08:41:57 +03:00
Dean Herbert
898e2dae27 Restore kiai time flashing behaviour 2020-11-23 14:27:02 +09:00
Dean Herbert
5662e722ed
Merge pull request #10936 from bdach/fix-follow-points-getting-stuck
Fix legacy follow point animations not playing after a while
2020-11-23 14:14:00 +09:00
Dean Herbert
3ed7868801 Scroll editor setup screen to file selector on display
Previously the file selector would potentially display off-screen,
making for confusing UX.

Closes #10942.
2020-11-23 13:49:14 +09:00
Dean Herbert
ae609b9d48 Remove unnecessary local variable 2020-11-23 13:35:13 +09:00
Dean Herbert
2ae5a95d77 Change opacity value to match master implementation 2020-11-23 13:35:02 +09:00
Derrick Timmermans
61078e9ae1
Use 0.2f instead of .2f 2020-11-22 18:59:16 +01:00
Derrick Timmermans
ba7ce4c933
Make colour readonly 2020-11-22 18:37:49 +01:00
Derrick Timmermans
458016d17d
Remove AccentColour member variable from LogoVisualisation 2020-11-22 17:36:59 +01:00
Derrick Timmermans
1551402a8d
Change IntroWelcome visualiser to use Colour instead of AccentColour 2020-11-22 17:33:40 +01:00
Derrick Timmermans
b468f061f1
Remove unused using 2020-11-22 17:20:00 +01:00
Derrick Timmermans
cc33b0f2c6
Apply MenuGlow to Visualisation Colour instead of AccentColour 2020-11-22 16:53:53 +01:00
Bartłomiej Dach
827a089810
Merge branch 'master' into change-taiko-ez 2020-11-22 13:29:02 +01:00
Bartłomiej Dach
1c31a4a6b6 Expose animation start time as mutable in interface 2020-11-22 13:11:22 +01:00
Bartłomiej Dach
b62a873502
Merge branch 'master' into remove-default-retry-balue 2020-11-22 10:54:40 +01:00
ekrctb
666112cb5a Address @bdach's minor suggestions 2020-11-22 18:51:16 +09:00
ekrctb
c506b438bf Remove more code and make some methods private 2020-11-22 18:51:16 +09:00
Andrei Zavatski
b745fb681a Fix incorrect static using placement 2020-11-22 04:40:55 +03:00
Andrei Zavatski
4887132947 Adjustments for edge cases support 2020-11-22 04:28:17 +03:00
Andrei Zavatski
f07f8089d6 Adjust monthsPerTick value 2020-11-22 03:58:56 +03:00
Andrei Zavatski
e6c116f0ab Rework horizontal ticks creation 2020-11-22 03:49:00 +03:00
Andrei Zavatski
6e581902cd Simplify column ticks creation 2020-11-22 03:11:38 +03:00
Andrei Zavatski
453f0ba675 Make tick lines thicker 2020-11-22 02:34:29 +03:00
Andrei Zavatski
3cb1d04667 Move dates fill into it's own method 2020-11-22 02:25:12 +03:00
Andrei Zavatski
d4b56aac84 Add missing whitespace 2020-11-22 02:17:54 +03:00
Andrei Zavatski
9d7ddf8343 Merge master with conflicts resolved 2020-11-22 02:13:35 +03:00
Andrei Zavatski
fe4c622041 Make OnUserChanged private 2020-11-21 23:13:46 +03:00
Andrei Zavatski
dbfc839df3 Move missing text to PaginatedProfileSubsection 2020-11-21 23:03:54 +03:00
Andrei Zavatski
11c3ccfcaa Move rulesets property to PaginatedProfileSubsection 2020-11-21 22:49:56 +03:00
Bartłomiej Dach
240c1b0aef Add support for changing animation start time after load 2020-11-21 20:06:30 +01:00
Bartłomiej Dach
9f997db958 Rewind judgement transforms before clearing 2020-11-21 17:56:49 +01:00
Bartłomiej Dach
875f986979 Remove default from base ResultsScreen too 2020-11-21 14:38:38 +01:00
ekrctb
295ca38cda Merge remote-tracking branch 'origin/master' into on-drawable-hitobject-added 2020-11-21 15:25:16 +09:00
ekrctb
4345d8dcb6 Event -> virtual method 2020-11-21 15:20:33 +09:00
ekrctb
281ed49332 Add HasInitialized to DHO
As it turned out, `IsLoaded` is not a reliable way.
2020-11-21 11:19:52 +09:00