h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 19:27:31 +08:00
Code Issues Releases Wiki Activity
55,400 Commits 3 Branches 648 Tags 270 MiB
a9eba27129
Commit Graph

931 Commits

Author SHA1 Message Date
smoogipoo
45e9f16f6b Add initial DrawableRuleset interface 2020-11-10 19:27:08 +09:00
smoogipoo
91c627c22d Revert HOC changes 2020-11-07 00:57:33 +09:00
smoogipoo
248d342a2f Initial Apply()/FreeAfterUse() DHO implementation 2020-11-06 23:02:37 +09:00
Bartłomiej Dach
b7696c85ad Add more xmldocs 2020-11-01 15:23:03 +01:00
Dean Herbert
b4e5311014 Move initial state set inside updateClock 2020-10-30 20:39:25 +09:00
Dean Herbert
1bd461f229 Move clock logic back to inside updateClock method 2020-10-30 20:21:14 +09:00
Dean Herbert
0f997386ae Fix direction and IsRunning not updating on first frame after becoming valid 
The parent clock will not unpause until WaitingForFrames becomes false,
so I've moved the set of that before we start to propagate its values
across. Doesn't fix any visible issue but should make propagation one
game loop faster.
 2020-10-30 15:26:23 +09:00
Dean Herbert
326fd03525 Fix loop not exiting after first valid frame 2020-10-30 15:25:53 +09:00
Dean Herbert
8e6c803900 Avoid running full updateClock loop when waiting on frames 2020-10-30 12:39:11 +09:00
Dean Herbert
87be7d162b
Merge branch 'master' into spectator-replay-watcher 2020-10-30 00:25:17 +09:00
Dean Herbert
335d150a13 Fix aim time being mutated inside update loop 2020-10-29 18:11:50 +09:00
Dean Herbert
2671d371da Move clock retrieval to new correct location 2020-10-29 15:28:39 +09:00
Dean Herbert
3ea27e23e8 Update namespace references 2020-10-29 15:20:10 +09:00
Dean Herbert
db2b00068f Avoid sourcing parent clock when in a paused state 2020-10-29 14:48:56 +09:00
Dean Herbert
d91456dc29 Move initial validity check out of loop for clarity 2020-10-29 14:25:47 +09:00
Dean Herbert
2e5a8b2287 Fix xmldoc to read better in new context 2020-10-29 13:16:31 +09:00
Dean Herbert
09da75b143 Merge branch 'frame-stability-clean-up' into spectator-replay-watcher 2020-10-28 15:34:46 +09:00
Dean Herbert
2b1e79a4e8 Simplify state changes further 2020-10-28 15:32:20 +09:00
Dean Herbert
c9515653b3 Restore previous directionality logic to avoid logic differences 2020-10-28 15:31:57 +09:00
Dean Herbert
77d807d0f5 Merge branch 'frame-stability-clean-up' into spectator-replay-watcher 2020-10-28 15:26:02 +09:00
Dean Herbert
59e9c2639a Remove try-finally 2020-10-28 15:16:56 +09:00
Dean Herbert
a06516c900 Extract out frame stability state into enum for (hopefully) better clarity 2020-10-28 15:15:15 +09:00
Dean Herbert
8c9bda2ded Split out replay update method 2020-10-28 15:14:06 +09:00
Dean Herbert
9b9a41596f Split out frame stability calculation to own method 2020-10-28 15:14:06 +09:00
Dean Herbert
851d45d2eb Add sane pausing logic 2020-10-27 18:58:37 +09:00
Dean Herbert
9e6b0a42ec Allow FrameStabilityContainer to handle waiting-for-data state better (and pause outwards) 2020-10-27 18:58:37 +09:00
Dean Herbert
b8beac27ce Use previous logic for catching-up mode 2020-10-27 17:14:41 +09:00
Dean Herbert
09087faf3b Fix non-matching filename 2020-10-27 14:23:24 +09:00
Dean Herbert
9cfb81589e Use bindable flow instead 2020-10-27 14:10:12 +09:00
Dean Herbert
6853da459d Move sample pausing logic out of FrameStabilityContainer 2020-10-27 13:54:33 +09:00
Bartłomiej Dach
7392876b5f Fix mania crashing due to spectator client handling frames with unconverted beatmap 2020-10-27 00:35:25 +01:00
Dean Herbert
05697dfe68 Add spectator state object support 2020-10-22 17:48:15 +09:00
Dean Herbert
96049c39c9 Add begin/end session logic 2020-10-22 17:48:15 +09:00
Dean Herbert
175fd512b0 Send frames to streaming client from replay recorder 2020-10-22 17:48:15 +09:00
Dean Herbert
411ae38605 Remove unused using 2020-10-20 15:06:31 +09:00
Dean Herbert
267b399f9f Add some simple border styles 2020-10-20 13:59:03 +09:00
Bartłomiej Dach
4267d23d59 Move border to more appropriate namespace 2020-10-19 20:56:34 +02:00
Bartłomiej Dach
5b96f01564 Fix key counter actions displaying out of order 2020-10-18 19:21:36 +02:00
Dean Herbert
e3eaba7b2c Move ISampleDisabler implementation to Player and FrameStabilityContainer 2020-10-14 19:39:48 +09:00
Dean Herbert
0605bb9b8d Fix incorrect parent state transfer 2020-10-05 16:20:29 +09:00
Dean Herbert
ae8bf8cdd4 Fix StabilityGameClock not being updated 2020-10-05 14:27:51 +09:00
Dean Herbert
e4710f82ec Fix sample disabled status not being updated correctly from seek state 2020-10-05 14:27:51 +09:00
Dean Herbert
af7d10afe0 Fix FrameStabilityContainer not re-caching its GameplayClock correctly 2020-10-05 14:27:51 +09:00
Dean Herbert
fd58a24183
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust 2020-09-28 17:45:48 +09:00
Dean Herbert
524c2b678c Forcefully regenerate autoplay on editor changes 2020-09-28 15:48:42 +09:00
Dean Herbert
e8220cf1b6 Allow attaching a replay to a FrameStabilityContainer when FrameStablePlayback is off 2020-09-28 15:47:11 +09:00
Dean Herbert
892d440ed0 Add fallback path for potential null ParentGameplayClock 2020-09-25 13:19:07 +09:00
Dean Herbert
7df8b5bce7 Merge branch 'master' into fix-spinner-rpm-user-rate-adjust 2020-09-25 13:17:03 +09:00
smoogipoo
62c2dbc310 Nest classes + make private 2020-09-24 14:33:43 +09:00
smoogipoo
600b823a30 Fix game texture store being disposed by rulesets 2020-09-24 14:30:18 +09:00
Dan Balasescu
fbaa6675c2
Merge branch 'master' into fix-hit-object-container-unbinding 2020-09-23 12:05:14 +09:00
Dean Herbert
e0a2321822 Reduce complexity of AllHitObjects enumerator when nested playfields are not present 2020-09-22 18:17:04 +09:00
Dean Herbert
3f788da06d Fix SPM changing incorrectly with playback rate changes 2020-09-21 19:39:54 +09:00
Dean Herbert
dd5b15c64f Fix HitObjectContainer not correctly unbinding from startTime fast enough 2020-09-21 18:27:15 +09:00
Dean Herbert
c84452cfbf Update usages 2020-08-06 21:53:20 +09:00
smoogipoo
8f841b47e6 Cancel previous initial state computations 2020-07-24 19:31:08 +09:00
Dean Herbert
fc8c345ad7
Merge branch 'master' into custom-game-storage 2020-07-02 09:55:33 +09:00
Dean Herbert
49aa839872 Update RulesetInputManager to use new method 2020-07-01 18:54:11 +09:00
smoogipoo
85c42456f2 Improve performance of sequential scrolling algorithm 2020-06-30 21:41:27 +09:00
Salman Ahmed
eb64c4752c
Merge remote-tracking branch 'upstream/master' into cache-ruleset-dependencies-for-tests 2020-06-15 11:31:12 +03:00
smoogipoo
f3b5149648 Move some suggestions to warnings, resolve issues 2020-06-03 16:48:44 +09:00
Dean Herbert
cbd563e80b Rename to IHasDuration 2020-05-27 12:38:39 +09:00
Dean Herbert
417e31d77f Rename function for consistency 2020-05-26 10:17:56 +09:00
Dean Herbert
d69111c665 Fix spelling of breadth 2020-05-26 10:17:34 +09:00
Dean Herbert
8fc60d12c9 Add back comments 2020-05-25 22:09:09 +09:00
Dean Herbert
2c16619ecd Move time to position conversion to ScrollingHitObjectContainer 2020-05-25 19:32:39 +09:00
Dean Herbert
f395ef24a4
Merge branch 'master' into editor-position-snap 2020-05-22 16:42:09 +09:00
Bartłomiej Dach
6f388b731e Fix display start time in sequential scroll algorithm 2020-05-21 21:56:59 +02:00
Dean Herbert
b1fd7da824 Merge branch 'master' into editor-position-snap 2020-05-21 15:47:20 +09:00
Dean Herbert
5ad7842b91 Move ScreenSpacePositionAtTime to inside Column implementation 2020-05-21 13:33:02 +09:00
Dean Herbert
ce223a2bd8 Silence hit sounds while seeking 2020-05-21 11:08:06 +09:00
Dean Herbert
44fdf1e6b0
Reword xmldoc 2020-05-10 20:09:41 +09:00
Dean Herbert
c712e98f2b
Merge branch 'master' into publicly-expose-hud 2020-05-10 20:06:28 +09:00
Dan Balasescu
2f12c4126a
Apply suggestions from code review 
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
 2020-05-10 13:49:08 +09:00
smoogipoo
be3b77cf25 Fix potentially skipping hitobject updates 2020-05-08 20:09:59 +09:00
smoogipoo
22dda3fe02 Make ScrollingHitObjectContainer respond to defaults applied events 2020-05-08 18:49:58 +09:00
Lucas A
30dd158c33 Rename property to AllowGameplayOverlays and update XMLDoc accordingly. 2020-05-08 09:37:50 +02:00
Lucas A
83998d5ba5 Trim whitespace. 2020-05-07 09:39:14 +02:00
Lucas A
83be5455d3 Disable the display of HUD through DisplayHud property. 2020-05-07 08:52:36 +02:00
Dean Herbert
064e5004ed
Merge branch 'master' into fix-mania-selection 2020-04-29 17:15:48 +09:00
smoogipoo
1aaab40228 Fix mods affecting mania scroll speed 2020-04-28 19:34:02 +09:00
smoogipoo
da30eafa30 Prevent potential exception 2020-04-28 14:47:45 +09:00
smoogipoo
86ef73aa27 Implement HitObjectContainer.Clear() 2020-04-23 11:16:59 +09:00
Salman Ahmed
97340da2f2 Add null-conditional to acesses in dispose methods 
Such a terrible mistake, the finalizer may be called while the dependencies have an instance but the local itself doesn't have a value yet.
 2020-04-12 02:24:36 +03:00
Salman Ahmed
a314a6119a Fix CI issues 2020-04-11 05:13:04 +03:00
Salman Ahmed
235d3046c6 Move ruleset dependencies caching to its own container 2020-04-11 04:22:23 +03:00
Dean Herbert
7b2144a1a7 Fix merge mishap 2020-04-03 23:31:46 +09:00
Dean Herbert
3289fa7c66
Merge branch 'master' into better-mania-scrollspeed 2020-04-03 23:25:14 +09:00
smoogipoo
d90db5649d Improve comment slightly 2020-04-03 18:32:07 +09:00
smoogipoo
1ff2cc31d1 Implement more familiar scroll speed options in mania 2020-04-03 18:25:01 +09:00
smoogipoo
b42d1104b7 Fix mania converts scrolling at incorrect speeds 2020-04-03 13:16:01 +09:00
smoogipoo
66486b094c Remove unnecessary dependency, allow null mods 2020-04-01 13:31:17 +09:00
Dean Herbert
2abb8a37df
Merge branch 'master' into show-mod-settings-tooltip 2020-03-29 14:35:04 +09:00
Dean Herbert
07462120e4 Split break tracking into its own component 2020-03-26 15:30:23 +09:00
Dean Herbert
2b1245f63a Improve xmldoc in a couple of places 2020-03-26 12:50:00 +09:00
Dean Herbert
448961b330 Rename incorrect variable 2020-03-24 15:39:01 +09:00
Dean Herbert
388cf5c83a Fix catch positional data being incorrectly recorded 2020-03-24 15:38:54 +09:00
Dean Herbert
022465f546 Add encoding and import support 2020-03-24 14:51:52 +09:00
Dean Herbert
617149fb27 Implement in player 2020-03-23 20:06:18 +09:00
Dean Herbert
14a85a84bf Add proper screen space - gamefield mapping 2020-03-23 20:06:18 +09:00
Dean Herbert
6d48068061 Move replay recorder to final location 2020-03-23 20:04:15 +09:00
Dean Herbert
232c255986 Basic test scene setup 2020-03-23 17:33:02 +09:00
Dean Herbert
a6b153673e Fix icons not updating tooltip text correctly 2020-03-23 14:58:02 +09:00
Dean Herbert
4f9ac7b81e Merge branch 'master' into show-mod-settings-tooltip 2020-03-23 14:57:54 +09:00
Dean Herbert
d8041a0dcb Increase sample concurrency to better match stable 2020-03-22 02:16:28 +09:00
Liam DeVoe
18bf7c913b show mod settings in ModIcon tooltip 2020-03-18 23:43:26 -04:00
smoogipoo
6c28fd21c7 osu-side changes 2020-02-24 20:52:15 +09:00
Bartłomiej Dach
5fde4f2c0c Fix lifetime calculation in overlapping algorithm 
Changes to lifetime calculation in scrolling rulesets introduced in
#7367, which aimed to account for the distance between hit objects'
origin and its edge entering the scrolling area, fixed some issues with
hitobjects appearing abruptly, but also regressed some other scenarios.

Upon investigation, the regression was localised to the overlapping
scroll algorithm. The reason for this was two-fold:

* The previous code used TimeAt() to calculate the time of travel from
  the hit object's edge to its origin. For other algorithms, that time
  can be accurately reconstructed, because they don't have periods of
  time where there are multiple hit objects scrolling at different
  velocities.

  That invariant does not hold for the overlapping algorithm, therefore
  it is possible for different values to be technically correct for
  TimeAt(). However, the only value that matters for the adjustment
  is the one that's indicated by the control point that applies to the
  hit object origin, which can be uniquely identified.

* Additionally, the offset returned (even if correct) was applied
  externally to the hit object's start time and passed to
  GetDisplayStartTime(). In the overlapping algorithm, the choice of
  control point used in GetDisplayStartTime() is important, since
  the value of the speed multiplier is read within.

  Externally rewinding the hit object's start time meant that in some
  cases the speed multiplier of the *previous* control point is applied,
  which led to hit objects appearing too late if the scrolling rate
  decreased.

Because of the above, modify GetDisplayStartTime() to take the offset
into account in all algorithms, and apply the adjustment correctly
inside of them. The constant and sequential algorithms needed no
adjustment from the previous logic, since:

* the constant algorithm disregarded control points, and
* the sequential algorithm would effectively rewind to time = 0,
  calculate the absolute distance from time = 0 to the hit object start,
  apply the origin offset *to the absolute distance*, and then convert
  back to time, applying all control points in sequence. Due to this
  it was impossible for control points to get mixed up while
  calculating.

As for the overlapping algorithm, the high-level logic is as follows:

* The distance that the origin has to travel is the length of the scroll
  plus the distance from the origin to the object edge.
* The above distance divided by the scroll length gives the relative
  scroll lengths that the object has to travel.
* As one relative scroll length takes one time range, the relative
  travel length multiplied by the time range gives the absolute travel
  time of the object origin.
* Finally, the control point multiplier applicable at origin time is
  applied to the whole travel time.

Correctness of the above is demonstrated by visual tests added before
and headless unit tests of the algorithms themselves. The sequential
scroll algorithm was not covered by unit tests, and remains uncovered
due to floating-point inaccuracies that should be addressed separately.
 2020-02-06 23:13:28 +01:00
smoogipoo
7b2f58eb30 Apply OnRelease method signature refactorings 2020-01-22 13:22:34 +09:00
mcendu
e096688ac8
simplify some stuff 2020-01-16 17:58:47 +08:00
mcendu
970653470c
format 2020-01-15 17:49:45 +08:00
mcendu
5d160376c0
nullable-ize Mod.Icon 2020-01-14 21:22:00 +08:00
mcendu
abdebcfddc
switch to changing Mod property 2020-01-14 20:11:32 +08:00
mcendu
c08fc62e00
expose setter of Mod 2020-01-14 19:59:43 +08:00
Bartłomiej Dach
3621362a48 Merge branch 'master' into scrolling-container-origin-adjust 2019-12-27 16:52:21 +01:00
Bartłomiej Dach
193e41f878 Add origin adjustment for hitobject lifetime 
Visual inspection of taiko gameplay has shown that hitobjects appeared
on screen only when the origin of the hitobject came into the bounds
of the screen, instead of appearing when any visible part of the
hitobject came into the screen bounds.

This behaviour was due to lifetime calculation being based on the origin
of the hitobject and not taking into account the actual object
dimensions. Adjust the lifetime start of the hitobject by subtracting
the time needed to show the part of the hitobject that should already
be visible on screen when the origin comes into frame.
 2019-12-26 20:37:29 +01:00
smoogipoo
977fb3d1bf Make processors and break overlay frame-stable 2019-12-26 14:59:49 +09:00
Dean Herbert
a47e5aeead Fix sample lookup not working correctly for custom rulesets 2019-12-26 00:51:44 +09:00
smoogipoo
5664ce3109 Add hitobject container regression test 2019-12-18 18:51:12 +09:00
smoogipoo
df8f8ffd0d Fix potential exception during removal 2019-12-18 12:03:15 +09:00
smoogipoo
bcc19e29f2 Fix editor crashing after re-ordering objects 2019-12-18 02:56:29 +09:00
Dean Herbert
e0ce87adca
Move CreateScoreProcessor() to Ruleset (#7244) 
Move CreateScoreProcessor() to Ruleset
 2019-12-17 22:15:42 +09:00
smoogipoo
49bf8d27d1 Move CreateScoreProcessor() to Ruleset 2019-12-17 20:08:13 +09:00
Huo Yaoyuan
3c39fde7ff CA1065: throw NotSupportedException in properties. 2019-12-17 13:00:05 +08:00
smoogipoo
5861eca80d Make DrawableRuleset take a converted beatmap 2019-12-12 15:58:11 +09:00
smoogipoo
48f1dad4aa Remove abstract ScoreProcessor class 2019-12-11 17:25:06 +09:00
Dean Herbert
f7f4a57c5f Update bindable types in line with framework 2019-12-10 16:48:24 +09:00
Dean Herbert
f181ee1843 Hide the menu cursor while inside the playfield by default 2019-11-29 17:35:11 +09:00
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
Dean Herbert
709ec1404f Centralise End/StartTime retrieval to extension method 2019-11-25 19:09:14 +09:00
andy840119
6126fd9a6b ApplyToDrawableHitObjects should be able to get all the hitobject in nasted Playfield 2019-11-24 10:42:05 +09:00
Andrei Zavatski
eb2f7c1d0a Rename forgotten variable 2019-11-21 20:37:02 +03:00
Andrei Zavatski
0f1a3d97c8 Naming adjustments 2019-11-21 20:34:19 +03:00
Andrei Zavatski
c7c8527f5f Remove OnHighlightedChanged function 2019-11-21 20:22:15 +03:00
Andrei Zavatski
458496206c Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-11-21 18:49:37 +03:00
Huo Yaoyuan
818553027b Merge branch 'master' into sharpen 2019-11-21 23:42:46 +08:00
Dan Balasescu
a7c074ff37
Merge branch 'master' into math_clamp 2019-11-21 11:08:56 +09:00
iiSaLMaN
5391c752b4 Implement IAggregateAudioAdjustments properties for FallbackSampleStore 2019-11-21 03:20:08 +03:00
Berkan Diler
6cab517b2d .NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK. 2019-11-20 13:37:47 +01:00
Huo Yaoyuan
374ef6ff83 Merge branch 'master' into sharpen 2019-11-20 17:30:58 +08:00
Huo Yaoyuan
b1b234c6fb Use paramref. 2019-11-17 20:49:36 +08:00
Huo Yaoyuan
f05b83d7d4 Use typeparamref. 2019-11-17 20:48:23 +08:00
Huo Yaoyuan
e5e8e70704 Use pattern matching. 2019-11-12 19:55:19 +08:00
Andrei Zavatski
fa01e11a6e Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-11-12 08:25:42 +03:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
Andrei Zavatski
e3d8e29cdd Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-11-10 23:38:41 +03:00
Dean Herbert
d089e47a56
Merge branch 'master' into master 2019-11-01 14:15:57 +09:00
smoogipoo
0171b2ae7c Fix scrolling hitobjects expiring too soon 2019-11-01 12:10:03 +09:00
nwabear
e35931fdfc removed blank line 2019-10-26 14:33:59 -05:00
nwabear
9e2e87c8d1 added visual tests 
added small commenting
added xmldoc for CancelResume();
 2019-10-26 14:29:52 -05:00
nwabear
f8354eefc4 Added null check in the CancelResume method 2019-10-25 16:49:18 -05:00
nwabear
b0e21c2749 Fixed Issue #6442 2019-10-25 14:57:49 -05:00
Dean Herbert
51bf600ea7 Use empty hitwindows instead of null 2019-10-09 19:08:31 +09:00
Dean Herbert
aeb62825cd Move out requireMoreUpdateLoops for better consistency 2019-10-04 13:42:06 +08:00
Dean Herbert
ddef7fa3ba Repair behavioural change 2019-10-04 13:32:47 +08:00
Dean Herbert
b28689c774 Fix key counters appearing negative on intense beatmaps 
When `FrameStabilityContainer` decides it needs multiple updates on the same frame, it ends up with an elapsed time of zero. This was interacting badly with the condition used in `RulesetInputManager` to govern playback direction.

I have changed this to use `Rate` as exposed by the frame stable clock.

- Closes #6198.
 2019-10-03 15:01:54 +08:00
smoogipoo
244627ff10 Add comment + test for slider multiplier 2019-09-25 20:12:01 +09:00
smoogipoo
4abe0473b9 Fix relative beat length not considering slider multiplier 2019-09-24 16:49:42 +09:00
smoogipoo
af0c15a93c Fix initial hitobject states not being recomputed correctly 2019-09-24 16:48:39 +09:00
Andrei Zavatski
e7118a9272 Use System mod type for NoMod 2019-09-20 23:47:21 +03:00
Andrei Zavatski
0d43f4e4f9 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-09-20 23:39:44 +03:00
Vperus
ac8fe6045f Fixed typo 
Changed CreateReourceStore() to CreateResourceStore()
 2019-09-20 19:58:39 +03:00
Andrei Zavatski
0cf4db899f Few cleanups 2019-09-19 17:03:52 +03:00
Andrei Zavatski
529a1c3b91 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-09-19 16:46:58 +03:00
Dean Herbert
0cdf125c1e Handle key counter rewinding in a better way 
Use ElapsedFrameTime rather than storing state data
 2019-09-12 15:42:14 +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
Dean Herbert
50985d1b1d Fix disposal logic 2019-09-06 10:43:19 +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
Dean Herbert
6197c7fd31 Add automatic resource mapping for rulesets to their own dll 2019-09-04 20:29:28 +09:00
Andrei Zavatski
04111cc3b7 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-09-04 02:46:23 +03:00
Dean Herbert
4cad55cee6 Move hit windows lookup to DrawableRuleset 2019-09-03 13:05:03 +09:00
Dean Herbert
91e3eeb1c0
Merge branch 'master' into beatmap-mod-selector 2019-09-02 21:35:42 +09:00
smoogipoo
d74e1b9b64 Remove from dictionary on Remove() 2019-09-02 15:06:43 +09:00
smoogipoo
8f8d35bd15 Delay initial hitobject state computation 2019-09-02 15:06:34 +09:00
Dean Herbert
7ca51d3866 Fix resume overlay being drawn below cursor 
Closes #5905.
 2019-09-02 11:20:55 +09:00
smoogipoo
6ab2b20c70 Add an interface for working beatmaps 2019-08-29 19:38:44 +09:00
Dean Herbert
f6ad95018a Centralise default beat length specification 2019-08-28 20:22:16 +09:00
Dean Herbert
6aab7168d4
Merge branch 'master' into relative-beat-lengths 2019-08-27 10:59:52 +09:00
Dean Herbert
07380af877
Merge branch 'master' into scrolling-lifetime-safety 2019-08-26 19:07:05 +09:00
Dean Herbert
0422c19c2f Group lifetime setters together 2019-08-26 19:06:23 +09:00
Dean Herbert
dffb2d6474
Merge branch 'master' into relative-beat-lengths 2019-08-26 18:59:50 +09:00
smoogipoo
fb1cd9e5e7 Add a sane default lifetime end for scrolling hitobjects 2019-08-26 16:47:23 +09:00
smoogipoo
6596d7fc46 Add nullref safety to FrameStablePlayback boolean 2019-08-26 16:33:24 +09:00
smoogipoo
1cfe2b7de8 Fix timing points beyond the end time potentially becoming dominant 2019-08-26 16:31:34 +09:00
smoogipoo
d99c60adc7 Provide a way to scale beat lengths relative to each other 2019-08-26 12:51:13 +09:00
Dean Herbert
acc07c1d65 Remove mod icon offset 2019-08-21 22:18:29 +09:00
Dean Herbert
152df9f3d5 Remove accidental blank line 2019-08-16 20:23:09 +09:00
Dean Herbert
d11b896148 Move FrameStablePlayback handling to early return 2019-08-16 20:21:00 +09:00
Dean Herbert
58d2268b9e Combine conditionals that provide the same behaviour 2019-08-16 19:52:35 +09:00
smoogipoo
8c67f58e2d Disable frame-stable playback in the editor 2019-08-15 18:25:31 +09:00
Andrei Zavatski
b71c776e65 Add web-like hover behavior 2019-08-12 16:20:36 +03:00
Andrei Zavatski
62a91e4aaa Add the ability to override Highlighted action to the ModIcon 2019-08-12 15:20:21 +03:00
Andrei Zavatski
16b6ed846f Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector 2019-08-12 14:46:24 +03:00
Dean Herbert
90b1fe81f3 Update cached usage in line with framework changes 2019-08-09 19:12:29 +09:00
Andrei Zavatski
1d42f0959a ModIcon improvements 2019-08-07 08:46:27 +03:00
Andrei Zavatski
87974850dd Initial implementation 2019-08-07 08:42:43 +03:00
smoogipoo
bc80fa11bb Mode IApplicableToBeatmap application to WorkingBeatmap 2019-08-01 12:41:46 +09:00
smoogipoo
8a64ab0384 Remove generics from IApplicableToBeatmap 2019-08-01 12:39:32 +09:00
Dean Herbert
f1423b8cb5 Add more brackets 2019-07-18 00:03:04 +09:00
smoogipoo
a9286fee07 Recycle slider paths when the parenting slider dies 2019-07-17 16:20:27 +09:00
Dean Herbert
609a82bc94 Update VisibilityContainer usage in line with framework 2019-06-11 15:13:58 +09:00
Dean Herbert
9c214c3f0e Add animation on failing 2019-06-04 16:13:16 +09:00
smoogipoo
3fe61c4a7e Trim whitespace 2019-05-10 18:48:39 +09:00
Dan Balasescu
425154c264
Merge branch 'master' into progress-bar-show-seek 2019-05-10 18:24:15 +09:00
smoogipoo
ad4b4f3422 Use nullable cancellation tokens 2019-05-10 17:42:45 +09:00
Dean Herbert
a44296a6db
Merge branch 'master' into progress-bar-show-seek 2019-05-10 17:27:49 +09:00
Dean Herbert
21ab628f41
Merge branch 'master' into player-load-cancellations 2019-05-10 16:58:36 +09:00
smoogipoo
d25d39b315 Add cancellation to storyboard/hitobject loading 2019-05-10 16:31:09 +09:00
Dean Herbert
9248e6290c Use FrameStabilityClock to denote current position on song progress 2019-05-09 18:09:26 +09:00
Dean Herbert
3bcfc86b9c Allow custom MaxCatchUpFrames to be specified 
Also adjusts the default to allow for smoother seeking.
 2019-05-09 16:39:03 +09:00
Dean Herbert
66594b7a1b Pass GameplayStartTime to FrameStabilityContainer to allow bypassing prior to start 2019-05-09 16:39:03 +09:00
smoogipoo
13b9b04bb8 Apply more cases/fix some existing ones 2019-05-07 13:23:09 +09:00
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections 
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
 2019-05-07 13:20:17 +09:00
smoogipoo
0bd35ab7bb Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
Dean Herbert
60328cf1fb Ensure FrameStabilityContainer's ElapsedTime is zero on initial seek 2019-04-24 15:25:53 +09:00
Dean Herbert
80e1568e97 Fix FrameStabilityContainer performing frame-stable seeks 2019-04-24 15:25:52 +09:00
smoogipoo
6c568d228f Add comment 2019-04-23 13:45:51 +09:00
smoogipoo
6add395288 Fix gameplay cursor being hidden in tests/replays 2019-04-23 13:32:44 +09:00
Dean Herbert
908eee9942 Fix pause tests 2019-04-22 18:29:51 +09:00
smoogipoo
ac2eabc9bf Fix replay rewinding not respecting 60fps playback 2019-04-16 17:47:00 +09:00
smoogipoo
0222424aef Make mods IReadOnlyList<Mod> gamewide 
Prevents potential multiple evaluations of enumerable.
 2019-04-10 17:20:36 +09:00
smoogipoo
7845d542e3 Cache mods as array in DrawableRuleset 2019-04-10 17:20:36 +09:00
smoogipoo
4310f07a5c Rename SelectedMods -> Mods 2019-04-10 12:03:57 +09:00
smoogipoo
c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +09:00
Dean Herbert
184403c7e1
Merge branch 'master' into resume-cursor-2 2019-04-01 14:24:00 +09:00
Dean Herbert
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert
42eaabe24c Fix editor blueprints being misplaced 
Regressed with PlayfieldAdjustmentContainer changes.
 2019-03-31 01:29:37 +09:00
Dean Herbert
6949c233bf Merge remote-tracking branch 'upstream/master' into resume-cursor-2 2019-03-29 15:02:12 +09:00
Dean Herbert
14cef94a53 Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation 2019-03-29 12:59:26 +09:00
Dean Herbert
fed58fba3a Merge remote-tracking branch 'upstream/master' into resume-cursor-2 2019-03-29 12:14:28 +09:00
Dean Herbert
ed0bf59e73
Merge branch 'master' into universal-playfield-adjust 2019-03-29 11:51:44 +09:00
Dan Balasescu
bab7d78130
Remove redundant cast 
Co-Authored-By: peppy <pe@ppy.sh>
 2019-03-29 11:36:40 +09:00
Dean Herbert
785433bb74
Merge branch 'master' into universal-playfield-adjust 2019-03-29 11:25:54 +09:00
Dan Balasescu
d410054ec8
Merge branch 'master' into key-counter-display 2019-03-29 11:22:59 +09:00
Dean Herbert
7715606188
Merge branch 'master' into sprite-icon-compatibility 2019-03-29 11:15:34 +09:00
Dean Herbert
8642886ffa Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust 2019-03-29 00:39:51 +09:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Dean Herbert
3fcbc2eab3 Fix key counter getting overridden 2019-03-27 10:31:21 +09:00
Dean Herbert
15821c7511 Fix cursor adding 2019-03-26 17:04:14 +09:00
Dean Herbert
dde7788c44 Merge branch 'universal-playfield-adjust' into resume-cursor-2 2019-03-26 13:58:48 +09:00
Dean Herbert
fb302e7ad8 Remove using 2019-03-26 13:58:07 +09:00
Dean Herbert
8658de5108 Rename KeyCounterCollection -> KeyCounterDisplay 
Also fix not working
 2019-03-26 13:52:48 +09:00
Dean Herbert
27cb4ce0d1 Remove poop 2019-03-26 13:48:35 +09:00
Dean Herbert
fbc97edc55 Add base cursor class to retrieve true visibility state 2019-03-26 13:41:30 +09:00
Dean Herbert
b4d785c76c Don't update gameplay loop while paused 2019-03-26 13:36:17 +09:00
Dean Herbert
ed3746e166 Make PlayfieldAdjustmentContainer universal 2019-03-26 13:32:44 +09:00
Dean Herbert
b75ea295db Rename KeyCounterCollection -> KeyCounterDisplay 
Also fix not working
 2019-03-26 11:28:43 +09:00
Dean Herbert
82140c38fc Apply CI fixes 2019-03-25 22:00:33 +09:00
Dean Herbert
a642f10131 Remove redundant cast 2019-03-25 21:52:01 +09:00
Dean Herbert
245f463e3f Don't update gameplay loop while paused 2019-03-25 20:31:55 +09:00
Dean Herbert
a23dfb58ad Add base cursor class to retrieve true visibility state 2019-03-25 20:31:55 +09:00
Dean Herbert
06d4856e17 Remove unnecessary CursorTargetContainer 2019-03-25 20:31:55 +09:00
Dean Herbert
c79d187a89 Add final osu! resume screen implementation 2019-03-25 20:31:55 +09:00
Dean Herbert
38e481686f Make PlayfieldAdjustmentContainer universal 2019-03-25 20:31:55 +09:00
Dean Herbert
57b3b7b54b Add back resume overlay 2019-03-25 20:31:55 +09:00
Dean Herbert
a694626cc6 Add proper resume request logic 2019-03-25 20:31:55 +09:00
Dean Herbert
9bf48863b0 Fix DrawableRuleset drawable creation method's name 2019-03-25 00:00:29 +09:00
Dean Herbert
f43e7a880c Merge remote-tracking branch 'upstream/master' into pause-logic-simplification 2019-03-20 15:27:06 +09:00
Dean Herbert
c186629b8a Reorder class 2019-03-20 14:55:38 +09:00
Dean Herbert
936c3e1ed9 Add safety type check to DrawableScrollingRuleset 2019-03-20 11:34:06 +09:00
Dean Herbert
45b8bfcfd3 Better protect not-generic DrawableRuleset 2019-03-20 11:31:03 +09:00
Dean Herbert
7b6d882ce6 Remove double-generic type 2019-03-20 11:29:16 +09:00
Dean Herbert
baea7230bc Rename RulesetContainer to DrawableRuleset 2019-03-19 23:47:31 +09:00
Dean Herbert
68f28326a2 Refactor RulesetContainer for readability 2019-03-19 20:21:31 +09:00
Dean Herbert
9433a97747 Add resume requesting support and fix exit scenarios 2019-03-18 20:33:43 +09:00
Dean Herbert
9ca4d9d4d1
Remove regions 2019-03-18 10:48:44 +09:00
Dean Herbert
771d676ba1 Split RulesetInputManager out to FrameStabilityContainer 2019-03-17 13:30:52 +09:00
Dean Herbert
a73e3d9700 Move cursor construction to BDL 2019-03-08 15:01:45 +09:00
Dean Herbert
2c98ba1c0c Split out consumption and creation into two separate code paths 2019-03-08 14:59:45 +09:00
Dean Herbert
62716851a1 Revert some unnecessary changes 2019-03-06 17:41:54 +09:00
Dean Herbert
7aa30ca3f6 Change method of cursor creation 2019-03-06 17:41:54 +09:00
Dean Herbert
acf518c208 Move cursor inside playfield 2019-03-06 17:41:54 +09:00
Dean Herbert
5411c63093 Fix menu cursor not displaying outside of gameplay scaling area 2019-03-06 17:14:08 +09:00
Dean Herbert
558dbafb71 Use a safer method of setting the clock 2019-03-05 20:14:04 +09:00
Dean Herbert
d5943330b1 Fix potential infinite loop 2019-03-05 20:06:04 +09:00
Dean Herbert
9a9b4efb8d Fix excess line 2019-03-05 16:41:11 +09:00
Dean Herbert
ec063a13db Update RulesetInputManager to support new clock structure more accurately 2019-03-05 16:34:50 +09:00
Dean Herbert
01f1018d02 Tidy up clock logic using DI and a GameplayClock 2019-03-05 13:37:51 +09:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Dean Herbert
c8793911a8 Enable more stringent inspectcode style inspections 2019-02-27 21:25:40 +09:00
smoogipoo
a07d797d75 Merge remote-tracking branch 'Joehuu/master' into use-lifetime-optimization 2019-02-27 12:08:43 +09:00
Dean Herbert
90cae0a69c Simplify RulesetInputManager further 2019-02-23 15:48:34 +09:00
Dean Herbert
6d3c0e3191 Holy sheet 2019-02-23 14:39:55 +09:00
Dean Herbert
0c218eb0d5 Apply new RulesetInputManager logic 
Run UpdateSubTree twice to ensure correctness
 2019-02-23 14:14:41 +09:00
Dean Herbert
3fe4b8fd1c Update variable names 
Also cleans up some weird code
 2019-02-22 17:51:39 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
Dan Balasescu
c9c8cccd68
Merge branch 'master' into use-lifetime-optimization 2019-02-18 15:22:34 +09:00
Dean Herbert
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
ekrctb
8955d5de04 Update hit object result when lifetime is end 2019-01-29 15:25:27 +09:00
ekrctb
504e79b968 Merge branch 'master' into use-lifetime-optimization 2019-01-29 12:15:02 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert
c18ce2c23a Formatting fixes 2019-01-23 14:51:25 +09:00
Dean Herbert
49633b3394 Fix key counter receptor getting overwritten by async load drawables 2019-01-23 14:51:25 +09:00
Dean Herbert
b6dc6c4a74
Merge branch 'master' into do_not_use_local_user_for_autoplay_score 2019-01-04 13:11:17 +09:00