Dean Herbert
|
7cca990be4
|
Merge remote-tracking branch 'upstream/master' into framework-image-changes
|
2018-09-07 18:56:00 +09:00 |
|
Dean Herbert
|
a1780fddc9
|
DrawInfo -> DrawColourInfo
|
2018-09-06 18:02:04 +09:00 |
|
Dean Herbert
|
9f67119ba9
|
Fix potential nullref in IsPresent override
|
2018-09-06 18:01:32 +09:00 |
|
Dean Herbert
|
4ff66bf531
|
Update in line with framework Image changes
|
2018-09-06 13:28:44 +09:00 |
|
Dean Herbert
|
03084aa04b
|
Revert async changes
|
2018-08-31 07:07:10 +09:00 |
|
Dean Herbert
|
68a79f895a
|
Fix mania throwing an exception on start of map
|
2018-08-30 14:58:00 +09:00 |
|
smoogipoo
|
1b279d383f
|
Use GetAsync on all textures
|
2018-08-27 17:26:44 +09:00 |
|
Dean Herbert
|
ffcad6e0f1
|
Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake
# Conflicts:
# osu.Game.Rulesets.Osu.Tests/TestCaseHitCircle.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
|
2018-08-24 15:26:36 +09:00 |
|
smoogipoo
|
d14dad64e8
|
Fix hitobject stacking being applied too early
|
2018-08-21 16:01:28 +09:00 |
|
Dean Herbert
|
1984ae6d0b
|
Merge pull request #3266 from smoogipoo/remove-override
Remove sliderball's ReceiveMouseInput override
|
2018-08-21 13:04:04 +09:00 |
|
smoogipoo
|
34b1abeca3
|
Remove sliderball's input override
|
2018-08-21 12:24:48 +09:00 |
|
Dan Balasescu
|
c4264794e0
|
Merge branch 'master' into relax
|
2018-08-21 12:11:10 +09:00 |
|
Dean Herbert
|
e628e78f24
|
Update uniform usage
|
2018-08-20 13:39:22 +09:00 |
|
Dean Herbert
|
6a4ff19c90
|
Merge branch 'master' into relax
|
2018-08-17 23:17:07 +09:00 |
|
Dean Herbert
|
41f8609e0f
|
Also handle OnScroll
|
2018-08-17 20:13:14 +09:00 |
|
Dean Herbert
|
442f6795bc
|
Block user input
|
2018-08-17 19:33:14 +09:00 |
|
smoogipoo
|
557a2ee39d
|
Add more comprehensive tests
|
2018-08-17 10:04:00 +09:00 |
|
smoogipoo
|
eb6f1ae72c
|
Fix spinners providing one extra combo
|
2018-08-17 09:16:28 +09:00 |
|
Dean Herbert
|
bc22a28fef
|
Clean up logic and variables
|
2018-08-16 18:18:15 +09:00 |
|
Dean Herbert
|
870f6bea47
|
Only process alive objects
|
2018-08-16 18:18:08 +09:00 |
|
Dean Herbert
|
ff0dfa7acf
|
Merge branch 'master' into relax
|
2018-08-16 17:36:24 +09:00 |
|
smoogipoo
|
31f324945e
|
Implement combo offsets
|
2018-08-15 11:47:31 +09:00 |
|
smoogipoo
|
da3e2cfee2
|
Catch/osu! spinners should have combo
|
2018-08-15 11:13:23 +09:00 |
|
Dan Balasescu
|
c1517e1521
|
Merge branch 'master' into judgement-rework
|
2018-08-06 12:30:46 +09:00 |
|
smoogipoo
|
3a7488767c
|
Make HitObject not store the judgement
|
2018-08-06 11:50:18 +09:00 |
|
smoogipoo
|
741ec0021e
|
Rename more judgement-related methods to "result"
|
2018-08-06 11:31:46 +09:00 |
|
smoogipoo
|
ab642b563f
|
CreateJudgementResult -> CreateResult
|
2018-08-06 11:07:41 +09:00 |
|
smoogipoo
|
5fd4ed2f4e
|
Rename judgement-related methods/events + commenting
|
2018-08-06 10:55:25 +09:00 |
|
tgi74000
|
924bf9174c
|
Fix overclick in certain situations
|
2018-08-05 09:58:15 +02:00 |
|
tgi74000
|
b1d1a2400b
|
Remove IUpdatableByHitObject completely
|
2018-08-05 09:52:19 +02:00 |
|
tgi74000
|
07d6a75e23
|
Rename variables to be human readable
|
2018-08-04 00:18:09 +02:00 |
|
tgi74000
|
7310c38df9
|
Add relax mod
|
2018-08-03 14:03:11 +02:00 |
|
smoogipoo
|
2a4994e5ce
|
Make hitobjects only have one judgement + result
|
2018-08-03 15:38:48 +09:00 |
|
smoogipoo
|
8d81e66f88
|
Fix osu score processor crashing
|
2018-08-02 21:07:11 +09:00 |
|
smoogipoo
|
4548d2c87f
|
Make Rulesets.Osu use the new judgement result structure
|
2018-08-02 20:36:38 +09:00 |
|
smoogipoo
|
462f1033c0
|
Migrate Rulesets.Osu to the new judgement system
|
2018-08-02 15:21:23 +09:00 |
|
Dean Herbert
|
3c06655672
|
Split out Special mods into Automation and Conversion
|
2018-07-31 18:00:42 +09:00 |
|
Dean Herbert
|
51506efd1a
|
Merge remote-tracking branch 'upstream/master' into peppy-fix-repeat-arrow-interpolation
|
2018-07-31 16:49:31 +09:00 |
|
Dean Herbert
|
ea6cab498e
|
Add comment
|
2018-07-31 16:47:13 +09:00 |
|
Dan Balasescu
|
04252293a7
|
Merge branch 'master' into fix-repeat-arrow-interpolation
|
2018-07-31 16:21:15 +09:00 |
|
Dean Herbert
|
874b5636e4
|
Merge remote-tracking branch 'upstream/master' into tgi74-more-skinning
|
2018-07-31 16:15:27 +09:00 |
|
Dean Herbert
|
976653fdf9
|
Minor formatting fixes
|
2018-07-31 16:13:52 +09:00 |
|
Dean Herbert
|
132241424d
|
Apply FollowPoint alpha to inner container (should not affect legacy skins)
|
2018-07-31 15:59:06 +09:00 |
|
Dan Balasescu
|
0a7a2c83a8
|
Merge branch 'master' into fix-follow-circle-size
|
2018-07-31 15:41:15 +09:00 |
|
Dean Herbert
|
a98bb057e2
|
Fix follow circle being scaled far larger than it should be
|
2018-07-31 15:27:21 +09:00 |
|
tgi74000
|
36afae5a24
|
Remove the inner followcircle fade, Fade the entire followcircle instead
|
2018-07-30 13:43:02 +02:00 |
|
Dean Herbert
|
21f3ff6e77
|
Fix slider repeat points appearing far too late
|
2018-07-30 18:51:25 +09:00 |
|
Dean Herbert
|
f4cda695e6
|
Improve rotation handling in edge cases
|
2018-07-30 18:50:59 +09:00 |
|
tgi74000
|
c6aabc6d2d
|
Move the FollowCircle border to its own container
|
2018-07-30 10:52:37 +02:00 |
|
Dean Herbert
|
a39188f762
|
Merge remote-tracking branch 'upstream/master' into peppy-fix-repeat-arrow-interpolation
|
2018-07-30 17:29:21 +09:00 |
|