1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 09:42:54 +08:00
Commit Graph

34992 Commits

Author SHA1 Message Date
Dean Herbert
29f3e8e486 Merge branch 'master' into fix-load-too-fast 2020-12-14 17:52:35 +09:00
Dean Herbert
558955d65d
Merge pull request #11167 from Firmatorenio/mania-legacyskin-scoreposition
Adjust mania judgement position in legacy skins according to their ScorePosition setting
2020-12-14 16:36:11 +09:00
Dan Balasescu
c9ba1144ca
Merge pull request #11166 from bdach/taiko-bar-line-pooling
Implement taiko bar line pooling
2020-12-14 16:21:25 +09:00
Dean Herbert
2aecc12370
Merge pull request #11162 from Grrum/selectionRotation
improve selection box rotation UX
2020-12-14 16:19:12 +09:00
Dean Herbert
7041503063 Avoid intermediary delegate 2020-12-14 15:34:32 +09:00
Dan Balasescu
b4a9c0e03c
Merge branch 'master' into taiko-bar-line-pooling 2020-12-14 15:30:09 +09:00
Dean Herbert
1e14504d66
Merge pull request #11169 from ekrctb/catch-x
Split `X` property of `CatchHitObject` to `OriginalX` and `EffectiveX`
2020-12-14 15:12:08 +09:00
Dan Balasescu
84a0354aaf
Merge branch 'master' into catch-x 2020-12-14 14:38:37 +09:00
Dan Balasescu
2507f9039a
Merge pull request #11164 from bdach/legacy-osutk-run-config
Replace now-default SDL rider run config with legacy osuTK config
2020-12-14 14:28:38 +09:00
Dan Balasescu
66f43e523b
Merge pull request #11147 from Xexxar/miss-penalty-curve
Change miss penalty curve for speed and aim pp awarded in the osu! ruleset
2020-12-14 14:25:26 +09:00
Dean Herbert
0d7f53b0b9 Fix gameplay loading too fast the first time entering a beatmap 2020-12-14 14:21:21 +09:00
smoogipoo
a835ca9612 Fix anchors/origins for legacy pieces 2020-12-14 14:20:43 +09:00
Dean Herbert
b81dbfc192 Move shared implementation to a named function 2020-12-14 13:56:46 +09:00
ekrctb
5b5e883904 Remove EffectiveXBindable (setting Value was not handled)
And use orthogonal `OriginalXBindable` and `XOffsetBindable`.
2020-12-14 13:39:07 +09:00
smoogipoo
2e88e283d8 Remove unused using 2020-12-14 13:20:51 +09:00
ekrctb
0ad256a762 Fix comment 2020-12-14 13:18:32 +09:00
ekrctb
d96399ea42 Revert "Remove X setter from CatchHitObject"
This reverts commit 7cbbd74d
2020-12-14 13:18:14 +09:00
smoogipoo
028909353c Revert one more change 2020-12-14 13:15:52 +09:00
smoogipoo
e01b41b7d1 Merge branch 'master' into mania-legacyskin-scoreposition 2020-12-14 13:10:48 +09:00
smoogipoo
1794bfeddb Move offset into legacy mania judgement 2020-12-14 13:07:55 +09:00
ekrctb
7cbbd74df2 Remove X setter from CatchHitObject 2020-12-14 11:38:07 +09:00
ekrctb
f621d977fc Add some more doc comment 2020-12-14 11:32:34 +09:00
ekrctb
36529bdd1b Use OriginalX for CatchHitObject.X instead of EffectiveX
And explicitly implement IHasXPosition interface to prevent use of the X property.
It should be preferred for beatmap conversion purpose.
2020-12-14 11:26:05 +09:00
smoogipoo
ca11eeefdf Merge branch 'master' into mania-legacyskin-scoreposition 2020-12-14 11:25:34 +09:00
ekrctb
089f3bebf5 Add doc comments to catch hit object X properties 2020-12-14 11:15:49 +09:00
ekrctb
cd2db59900 XBindable -> EffectiveXBindable in catch DHO 2020-12-14 11:05:26 +09:00
ekrctb
96f3e0dad8 Replace CatchHitObject.X usage to EffectiveX and OriginalX 2020-12-14 11:03:14 +09:00
ekrctb
c1f3f1c231 Obsolete X getter 2020-12-14 11:03:10 +09:00
ekrctb
8da502da44 Separate asymmetric CatchHitObject.X to EffectiveX and OriginalX 2020-12-14 11:03:03 +09:00
Firmatorenio
6b78045ff1 fix codefactor empty line complaint 2020-12-14 06:57:43 +06:00
Bartłomiej Dach
d275418b25 Rename and simplify test 2020-12-13 23:17:26 +01:00
Bartłomiej Dach
ea09cbddc6 Register bar line pool & use in drawable ruleset 2020-12-13 22:31:33 +01:00
Bartłomiej Dach
c103c3691f Add test for bar line application 2020-12-13 22:31:33 +01:00
Bartłomiej Dach
44dd9a57a8 Add abstract hit object application test scene 2020-12-13 22:31:33 +01:00
Bartłomiej Dach
a8e86a20e1 Unify bar line types & prepare for pooling 2020-12-13 22:31:33 +01:00
Bartłomiej Dach
f83c5fa81d Add backing bindable for major field 2020-12-13 22:12:26 +01:00
Bartłomiej Dach
beee9b89d5 Change bar line SHOC to nested playfield 2020-12-13 22:12:26 +01:00
Firmatorenio
c83c3e92fc apply a private setter in a protected property 2020-12-14 01:53:20 +06:00
Firmatorenio
cf7303e072 dotnet format 2020-12-13 22:54:01 +06:00
Firmatorenio
3741c2339a simplify implementation and adjust the default values 2020-12-13 22:43:36 +06:00
Firmatorenio
2108844319 apply ScorePosition to the judgement container 2020-12-13 22:01:08 +06:00
Firmatorenio
f14e49c72e fetch ScorePosition from the skin 2020-12-13 21:59:04 +06:00
Bartłomiej Dach
acd07017d1 Replace now-default SDL run config with legacy osuTK config 2020-12-13 16:36:09 +01:00
Grrum
635608ee3d
Merge branch 'master' into selectionRotation 2020-12-13 08:01:44 -05:00
Graham Johnson
7d2b77cdbd improve selection box rotation UX 2020-12-13 07:58:58 -05:00
Firmatorenio
60379b09db added a container for the judgements to move up or down 2020-12-13 18:14:41 +06:00
Dean Herbert
94d737e51b
Merge pull request #11159 from bdach/taiko-hits-test-cleanup
Refactor and restore taiko hits test scene to a working state
2020-12-13 16:58:40 +09:00
Bartłomiej Dach
3a3b32186e Make height test steps work better 2020-12-13 00:30:41 +01:00
Bartłomiej Dach
43c0e2191d Apply local fix for strong/colour not being applied correctly 2020-12-13 00:30:41 +01:00
Bartłomiej Dach
76193e2217 Fix miss step not working 2020-12-13 00:30:41 +01:00