1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 22:07:25 +08:00
Commit Graph

34971 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Bartłomiej Dach
acd07017d1 Replace now-default SDL run config with legacy osuTK config 2020-12-13 16:36:09 +01: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
Bartłomiej Dach
34e7a36b38 Fix kiai hit steps not working correctly 2020-12-13 00:30:41 +01:00
Bartłomiej Dach
8292c746ea Leverage hitobject model for strong hit instead of creating own 2020-12-13 00:30:41 +01:00
Dean Herbert
bf2594baa9
Merge pull request #11150 from peppy/update-framework
Update framework
2020-12-12 21:35:53 +09:00
Bartłomiej Dach
51840121b9
Merge branch 'master' into update-framework 2020-12-12 13:02:34 +01:00
Dean Herbert
f20c5a2bda Update framework (again) 2020-12-12 15:29:26 +09:00
Bartłomiej Dach
df198d9006
Merge pull request #11137 from peppy/fix-player-load-stuck-at-empty-screen 2020-12-11 21:22:12 +01:00
Bartłomiej Dach
d457926523
Merge branch 'master' into fix-player-load-stuck-at-empty-screen 2020-12-11 20:49:27 +01:00
Bartłomiej Dach
3ffa03a2c5
Merge pull request #11139 from peppy/fix-single-threaded-seeking 2020-12-11 20:46:54 +01:00
Bartłomiej Dach
01833e8c9b
Merge branch 'master' into fix-single-threaded-seeking 2020-12-11 20:14:28 +01:00
Xexxar
b7872a54b8 small factor rebalance 2020-12-11 10:48:53 -06:00
Xexxar
165c471297 merge branch 'miss-penalty-curve' of https://github.com/Xexxar/osu into miss-penalty-curve 2020-12-11 08:27:31 -06:00
Dan Balasescu
3acaa63373
CI fixes 2020-12-11 23:24:38 +09:00
Xexxar
abc8a2982c swapped ^.75 buff onto speed instead of aim 2020-12-11 08:20:56 -06:00
Xexxar
544160798b cleaned up mistakes and made quality changes 2020-12-11 08:01:45 -06:00
Dan Balasescu
31ae79a140
Merge pull request #11149 from peppy/add-cache-suffix-online-db
Add a simple cache-busting query string to online.db retrieval
2020-12-11 20:20:52 +09:00
Dean Herbert
b5f6baf341 Update framework 2020-12-11 18:03:48 +09:00
Dean Herbert
bd66a3f8c7
Merge pull request #11131 from ekrctb/caught-object-pooling 2020-12-11 18:03:21 +09:00
Dean Herbert
a35060ea7a Add a simple cache-busting query string to online.db retrieval
As we are finally pushing updates for this database, this adds a minimum
level of guarantee that a client will request a new version (without
having to worry about multiple levels of server-side caching).
2020-12-11 17:56:02 +09:00
Dean Herbert
c0d20d8ce4 Add some spacing to interface class 2020-12-11 16:43:00 +09:00
Dean Herbert
2dd5911256 Rename method to better match purpose 2020-12-11 14:44:01 +09:00