Bartłomiej Dach
8efab559c8
Remove unused using directives
2019-09-25 01:13:42 +02:00
Bartłomiej Dach
9323df26a1
Decouple bar line hitobjects from generator
...
Introduce an IBarLine interface, which together with generic constraints
helps decouple BarLineGenerator from the actual hitobject types it
creates. Thanks to this, all rulesets that want bar lines can provide
an implementation of IBarLine that also derives from the base hitobject
class.
This allows DrawableBarLines in taiko and mania to be migrated back to
DrawableTaikoHitObject and DrawableManiaHitObject base classes
respectively. This in turn resolves #6215 without code duplication,
since the missing anchoring application is now done in mania's
DrawableBarLine through deriving from DrawableManiaHitObject.
2019-09-25 00:36:27 +02:00
Bartłomiej Dach
a407e267a2
Fix PF/SD legacy mod conversion
...
Upon investigating an user report in #6091 that indicated that viewing
replays using the Perfect mod would also display the Sudden Death mod
icon despite Perfect being the more restrictive of the two, it turned
out that the logic of importing legacy scores was missing that corner
case. A similar case of Double Time/Nightcore mutual exclusion was
handled, but PF/SD was missed.
Add analogous handling of PF/SD legacy mods for all four rulesets,
and additionally cover a tiny fraction of all cases with unit tests.
The most problematic cases (NC+HD and PF+SD) are covered in all four
basic rulesets.
2019-09-15 22:55:25 +02:00
Dean Herbert
624e5644a4
Change osu!catch key trigger to occur on frame before positional change
2019-09-13 23:06:35 +09:00
Dan Balasescu
125b3fda6c
Merge branch 'master' into improve-catch-replay-frames
2019-09-13 19:23:15 +09:00
Dean Herbert
9fc60aeefc
Merge branch 'master' into reset-dho-lifetimes
2019-09-12 19:29:14 +09:00
Dean Herbert
f21e47d6d2
Move expire to DrawableHitObject
2019-09-12 19:29:08 +09:00
Dean Herbert
acdfeef1dc
Improve how osu!catch stores and replays key actions
2019-09-12 18:33:46 +09:00
Dean Herbert
af3bb5a2cd
Centralise and share bar line generation code between rulesets
2019-09-10 13:30:54 +09:00
Dean Herbert
6cdc87bd29
Fix allowed results omissions
2019-09-06 15:37:20 +09:00
Dean Herbert
f925e781a9
Refactor HitWindows for legibility
2019-09-06 15:24:14 +09:00
smoogipoo
5efd455ce4
Fix taiko sample namespace
2019-09-04 12:47:10 +09:00
Dean Herbert
40c61894ef
Update some case sensitive resources lookups in-line with resources
2019-09-04 10:44:24 +09:00
Dean Herbert
05ed9d3802
Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements
2019-09-03 13:07:58 +09:00
Dean Herbert
0261456d5a
Merge branch 'master' into play-to-gameplay
2019-09-03 11:42:15 +09:00
smoogipoo
8302658186
Fix other potential nullref cases that rider missed
2019-09-02 18:31:33 +09:00
smoogipoo
4c150839c0
Fix potential diffcalc hitwindow nullref
2019-09-02 17:38:58 +09:00
smoogipoo
f3656475de
Return null hitwindows for non-time-based objects
2019-09-02 16:10:30 +09:00
Dean Herbert
f9fcf1562f
Merge remote-tracking branch 'upstream/master' into iskincomponent
2019-09-02 14:21:02 +09:00
Dean Herbert
13bb0676b1
Merge branch 'master' into fix-taiko-swell-tick-display
2019-09-02 13:47:04 +09:00
smoogipoo
1df422e591
Hide taiko swell ticks
2019-09-02 13:30:55 +09:00
smoogipoo
5b685c4cd2
Fix swell ticks having non-zero time offsets
2019-09-02 13:25:39 +09:00
Dean Herbert
70e417533f
Update naming
2019-08-30 15:13:29 +09:00
Dean Herbert
a15828ab25
Introduce the concept of SkinComponents
...
Removes reliance on string lookups and better defines elements for introduction into database
2019-08-30 14:55:52 +09:00
smoogipoo
6ab2b20c70
Add an interface for working beatmaps
2019-08-29 19:38:44 +09:00
Dean Herbert
720908ba22
Merge pull request #5865 from peppy/fix-osu-hitobject-fade-in
...
Fix osu! approach circles fading in too late
2019-08-28 20:25:49 +09:00
Dean Herbert
9a98f39f06
Share logic with other rulesets (and make default)
2019-08-28 18:12:47 +09:00
smoogipoo
7cc92e2fad
Make taiko proxy containers use LifetimeManagementContainer
2019-08-28 13:20:28 +09:00
smoogipoo
3723c441d2
Merge remote-tracking branch 'origin/master' into fix-taiko-proxy-rewind
...
# Conflicts:
# osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
2019-08-27 17:42:45 +09:00
smoogipoo
2b22fd799d
Use constant value for offset
2019-08-27 15:33:53 +09:00
smoogipoo
bc7a81e733
Add initial fade transform
2019-08-27 15:33:53 +09:00
smoogipoo
dba3679817
Fix DrawableSwell not proxying its content in time/correctly
2019-08-27 15:33:28 +09:00
smoogipoo
b85e62a6e2
Fix taiko proxies being removed on rewind
2019-08-27 15:24:49 +09:00
iiSaLMaN
0eef398ca7
Remove redundant using directive
2019-08-27 05:19:21 +03:00
iiSaLMaN
cd68d030bd
Remove unnecessary UpdateState overrides
2019-08-27 05:04:34 +03:00
iiSaLMaN
843da26dba
Use transform management for taiko hit objects
2019-08-27 05:03:56 +03:00
smoogipoo
d4a296f911
Slight refactoring
2019-08-26 17:45:12 +09:00
smoogipoo
fd4c6e08ca
Merge remote-tracking branch 'origin/master'
2019-08-26 17:37:06 +09:00
Dean Herbert
48716f8f2b
Update framework
2019-08-21 13:29:50 +09:00
Desconocidosmh
77e9e89fec
Refactoring
2019-08-19 20:45:23 +02:00
Desconocidosmh
9bd844bf4d
Make comment more informative
2019-08-19 19:54:22 +02:00
Desconocidosmh
9732f5d622
Add Swell to GetNextObject() check
2019-08-19 17:28:32 +02:00
Desconocidosmh
eb83e36e0f
Make TaikoAutoGenerator unpress sooner
2019-08-19 17:15:08 +02:00
Desconocidosmh
b3556403aa
Make GetNextObject() a virtual method
2019-08-19 16:18:25 +02:00
Desconocidosmh
aa3651f65e
Change the logic so the last button gets unpressed instead of staying pressed forever
2019-08-15 19:45:10 +02:00
Desconocidosmh
386d788813
Change if-else to ternary if
2019-08-15 18:32:45 +02:00
Desconocidosmh
ba539abac7
Refactoring
2019-08-14 21:05:24 +02:00
Desconocidosmh
e567e81981
Refactoring
2019-08-14 20:10:52 +02:00
Desconocidosmh
f849b4ce54
Make autoplay unpress sooner, if needed
2019-08-14 19:49:32 +02:00
smoogipoo
8a64ab0384
Remove generics from IApplicableToBeatmap
2019-08-01 12:39:32 +09:00
Dean Herbert
c3b81bef4a
Flip default to the preferred method going forward
2019-07-22 15:55:38 +09:00
Dean Herbert
9bed0094de
Merge remote-tracking branch 'upstream/master' into android
2019-07-02 19:40:50 +09:00
Unknown
665da09ed7
disable HD for taiko
2019-07-01 09:45:14 +02:00
Dean Herbert
60ea3d4e1a
Fix skinning support for combobreak
2019-06-30 21:58:30 +09:00
Shane Woolcock
17d103181c
Merge branch 'master' into android
2019-06-18 20:05:14 +09:30
HoLLy
7e9f5a0939
Add Skills to DifficultyAttributes
2019-05-29 11:22:51 +02:00
tangalbert919
6fd1eb5e08
Merge remote-tracking branch 'upstream/master' into android
2019-05-08 08:15:03 -05: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
Dean Herbert
d40177f97c
Merge branch 'master' into drawnode-composability
2019-04-27 18:41:19 +09:00
smoogipoo
aeae759fcd
Rename method + add xmldoc
2019-04-22 18:08:15 +09:00
smoogipoo
4edb17a88a
Make hp work + cleanup
2019-04-22 18:02:49 +09:00
smoogipoo
b59f23d094
Implement hp increase for taiko
2019-04-22 17:04:46 +09:00
smoogipoo
0222424aef
Make mods IReadOnlyList<Mod> gamewide
...
Prevents potential multiple evaluations of enumerable.
2019-04-10 17:20:36 +09:00
smoogipoo
c584967eb1
Remove mods from workingbeatmap
2019-04-09 12:59:32 +09:00
smoogipoo
772bef91fa
Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
...
# Conflicts:
# osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
2019-04-08 23:01:12 +09:00
Dean Herbert
f1952c0816
Update font awesome usage
2019-04-02 19:55:24 +09:00
smoogipoo
a56e29347f
Adjust namespaces
2019-04-02 14:51:28 +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
3e8952b087
Merge pull request #4521 from peppy/hitobject-drawable-representation
...
Fix DrawableRuleset drawable creation method's name
2019-03-29 14:08:23 +09:00
Dean Herbert
c72705217a
Merge branch 'master' into framed-replay-handler-fixes
2019-03-29 12:59:51 +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
785433bb74
Merge branch 'master' into universal-playfield-adjust
2019-03-29 11:25:54 +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
09a7950a3b
Fix handlers for other rulesets
2019-03-28 15:09:06 +09:00
Dean Herbert
de80fc0eac
Update icon usage to match framework changes
2019-03-27 19:29:27 +09:00
Dean Herbert
ed3746e166
Make PlayfieldAdjustmentContainer universal
2019-03-26 13:32:44 +09:00
Dean Herbert
39df8cce19
Fix incorrect usage of InternalChildren
...
Could cause overwriting of components added by base DrawableHitObjcet class (such as samples)
2019-03-25 13:48:55 +09:00
Dean Herbert
9bf48863b0
Fix DrawableRuleset drawable creation method's name
2019-03-25 00:00:29 +09:00
tangalbert919
00c659a5ca
Merge all changes from 2019.321.0 to android
2019-03-20 11:00:27 -05:00
Dean Herbert
7b6d882ce6
Remove double-generic type
2019-03-20 11:29:16 +09:00
Dean Herbert
3b7a76aa4e
Fix typo
2019-03-20 11:22:34 +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
tangalbert919
e865ac2086
Merge remote-tracking branch 'origin/master' into android
2019-03-17 09:39:34 -05:00
Dean Herbert
1617e2a729
Merge branch 'master' into mania-judgemetns
2019-03-13 18:17:42 +09:00
David Zhao
527b77b07d
Make all inheritors of drawablejudgement use new method
2019-03-12 19:52:44 +09:00
Albert Tang
7f30fce3fe
Merge branch 'master' into android
2019-03-08 10:39:24 -06:00
Dean Herbert
48e54c84c1
Merge branch 'master' into mod-wind
2019-03-08 20:23:02 +09:00
Dean Herbert
1f44dde96b
Fix autoplay tests not working
2019-03-07 18:34:56 +09:00
tangalbert919
1e6cb3e7d8
Merge remote-tracking branch 'upstream/master' into android
2019-03-05 17:56:13 -06:00
LeNitrous
c271a3a781
remove ruleset specific mods
2019-03-04 17:36:44 +08:00
LeNitrous
ecc2c28a62
mod rule changes
2019-03-03 16:22:00 +08: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
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
smoogipoo
7e41fbc29b
Remove LegacyDifficultyCalculator
2019-02-21 13:12:37 +09:00
Dean Herbert
2c76a039ca
Remove unnecessary folder reference
2019-02-20 10:46:25 +09:00
smoogipoo
5ff890434c
Add beatmap argument
2019-02-19 17:57:29 +09:00
smoogipoo
c264a9cc74
Fix mods not being populated
2019-02-19 17:46:40 +09:00
smoogipoo
0ef15f5bd5
Update with PopulateAttributes() removal
2019-02-19 17:45:16 +09:00
smoogipoo
7ba0d090fc
Fix post-merge errors
2019-02-19 16:40:52 +09:00
smoogipoo
7f4643a83d
Adjust naming
2019-02-18 14:55:39 +09:00
smoogipoo
46b979a412
Fix colour changes not being reset
2019-02-18 14:55:20 +09:00
smoogipoo
cb17cbcdc4
Fix taiko nullrefing
2019-02-18 14:54:35 +09:00
smoogipoo
25d85b6eb4
Implement new difficulty calculator for Rulesets.Taiko
2019-02-18 14:54:21 +09:00
smoogipoo
a8faa942a6
Implement new difficulty calculator structure
2019-02-18 14:49:43 +09:00
smoogipoo
aa0bb7ca11
Add taiko difficulty calculator tests
2019-02-15 14:44:26 +09:00
tangalbert919
7349a6c527
Merge remote-tracking branch 'upstream/master' into android
2019-02-12 20:41:54 -06:00
HoLLy
ae9d5f999c
Use correct DifficultyAttributes where possible
2019-02-06 21:28:42 +01:00
Dean Herbert
2d7c23dd9f
Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics
2019-02-04 12:15:53 +09:00
tangalbert919
80006109a2
Merge remote-tracking branch 'upstream/master' into android
2019-01-29 18:13:43 -06:00
LeNitrous
03e57d0423
fix codefactor warnings and derive ModWindUp and ModWindDown to ModTimeRamp
2019-01-26 20:15:19 +08:00
LeNitrous
0f8c5bcbd7
actually the last whitespace
2019-01-26 13:50:27 +08:00
LeNitrous
73dbf5712d
add license headers
2019-01-26 13:43:27 +08:00
LeNitrous
1427c9f576
trim whitespaces
2019-01-26 13:11:08 +08:00
LeNitrous
c6e26a92ec
add wind up and wind down mods
2019-01-26 12:15:45 +08:00
Dean Herbert
014ea972d9
Merge remote-tracking branch 'origin/master' into samah-ios
2019-01-25 11:51:44 +09:00
Dean Herbert
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09:00
tangalbert919
5835ccc04c
Merge changes up to 2019.108.0
2019-01-08 17:53:57 -06:00
Shane Woolcock
a267a1a085
Merge branch 'master' into samah-ios
2019-01-08 17:09:26 +10:30
Dean Herbert
8edec10e5f
Merge branch 'master' into fix-replay-import-statistics
2019-01-08 11:26:12 +09:00
tangalbert919
47268898be
Expose internals for Android test projects
2019-01-06 00:04:25 -06:00
Roman Kapustin
4b5fc85875
Use Find instead of FirstOrDefault
2019-01-05 19:35:33 +03:00
Dean Herbert
aec3753863
Fix imported replays having excess statistics
2019-01-03 14:01:20 +09:00
Shane Woolcock
32ffcb9865
Merge branch 'master' into samah-ios
...
# Conflicts:
# osu.Game/osu.Game.csproj
2018-12-29 20:09:00 +10:30
Shane Woolcock
a83bee9461
Add ruleset visual tests
2018-12-29 20:05:37 +10:30
smoogipoo
b64932f6db
Implement hit windows
2018-12-27 22:39:15 +09:00
Ivan Pavluk
d8b409f81f
Merge branch 'master' of https://github.com/pavlukivan/osu
2018-12-12 17:18:32 +07:00
Ivan Pavluk
28b033bd99
Autodetect LowestSuccessfulHitResult
2018-12-12 17:15:59 +07:00
Ivan Pavluk
77e0d7ed8e
Fix formatting
2018-12-12 07:57:37 +00:00
Ivan Pavluk
e49e2fda9e
Rename SuccessfulHitResult->LowestSuccessfulHitResult
2018-12-12 13:24:58 +07:00
Ivan Pavluk
a2d1c2c096
Fix formatting
2018-12-10 05:05:03 +00:00
Ivan Pavluk
839e177d2a
Docstring change
2018-12-10 04:59:35 +00:00
Ivan Pavluk
8457324044
SuccessfulHitWindow->SuccessfulHitResult
2018-12-10 09:04:12 +07:00
Ivan Pavluk
94f01b6678
Remove unused using directives
2018-12-06 20:05:03 +07:00
Ivan Pavluk
394c038c33
Removed unnecessary JudgementResult casts
2018-12-06 19:52:16 +07:00
Ivan Pavluk
407f9d2e78
Comment cleanup
2018-12-06 19:33:42 +07:00
Ivan Pavluk
cb2444e01c
Remove Meh from TaikoHitWindows
2018-12-06 19:04:54 +07:00
Ivan Pavluk
8cae549541
Remove unused TaikoScoreProcessor constants
2018-12-06 15:58:03 +07:00
Ivan Pavluk
1b6658f4ee
Move HealthIncreaseFor to Judgement
2018-12-06 15:09:42 +07:00
Ivan Pavluk
b5277de3f4
Remove extra newline
2018-12-06 14:08:32 +07:00
Ivan Pavluk
6d7e71c003
Fix switch stetement order 2
2018-12-05 16:28:36 +07:00
Ivan Pavluk
6c38db04ee
Fix switch statement order in taiko judgements
2018-12-04 21:48:22 +07:00
Ivan Pavluk
f2b806d303
Remove swell miss HP from TaikoScoreProcessor
2018-12-04 21:36:43 +07:00
Ivan Pavluk
1975e11fcc
Yet Another Whitespace Fix
2018-12-04 21:28:36 +07:00
Ivan Pavluk
7d692939fc
Fixed being able to miss taiko objects by hitting them too early
...
Revamped taiko HP system
2018-12-04 21:20:44 +07:00
Ivan Pavluk
fbb7dc4507
Merge branch 'master' into master
2018-12-01 00:38:24 +07:00
smoogipoo
8eff49bccd
Remove User from Replay
2018-11-30 18:25:14 +09:00
Dean Herbert
831cd3ed59
ScoreInfo scoreInfo -> ScoreInfo score
2018-11-30 15:18:52 +09:00
Ivan Pavluk
743598a1ac
Decrease taiko swell HP drain
2018-11-30 01:33:04 +07:00
Ivan Pavluk
6b07d4581a
Fixed too strong HP drain
2018-11-30 01:07:15 +07:00
Ivan Pavluk
4184f17709
...Revert AffectsHP->AffectsHp, add HP abbrev
2018-11-29 23:12:02 +07:00
Ivan Pavluk
13a166a645
rename TaikoJudgement.AffectsHP to AffectsHp
2018-11-29 22:26:23 +07:00
Ivan Pavluk
d30ab4f77c
fixed whitespace
2018-11-29 22:12:01 +07:00
Ivan Pavluk
2ca9864301
Fixed taiko swell hp and scoring
2018-11-29 22:05:13 +07:00
Ivan Pavluk
a378c50544
Fix TaikoDrumRollJudgement visibilityy
2018-11-29 09:47:12 +07:00
Ivan Pavluk
ce1e6d93e4
Update TaikoScoreProcessor.cs
2018-11-29 09:45:57 +07:00
Ivan Pavluk
00a243f7f2
Add license header
2018-11-29 09:19:41 +07:00
Ivan Pavluk
17337e05a1
Fixed whitespace
2018-11-29 09:06:40 +07:00
Ivan Pavluk
36b458bdee
Fixed #3777
2018-11-29 08:56:19 +07:00
smoogipoo
b8e60afa69
Move replays to an wrapping Score class
2018-11-28 18:45:17 +09:00
smoogipoo
219929eb47
Score -> ScoreInfo
2018-11-28 18:33:01 +09:00
smoogipoo
2ee181daf7
Re-namespace replay-related classes
2018-11-28 17:20:37 +09:00
smoogipoo
09b79d736b
Remove unused usings
2018-11-28 16:33:42 +09:00
smoogipoo
5fd6e6ca77
Re-namespacing
2018-11-28 16:12:57 +09:00
smoogipoo
f27bd3ef3e
OpenTK -> osuTK
2018-11-20 17:14:59 +09:00
smoogipoo
08ffa18936
Fix nullref
2018-11-19 17:05:51 +09:00
Dean Herbert
a57f98ed4d
Merge branch 'master' into fix-taiko-lifetimes
2018-11-19 08:41:19 +09:00
jorolf
80bd98bb9d
apply suggestions
2018-11-15 17:38:38 +01:00
smoogipoo
e207dd728b
Fix taiko proxies not receiving the correct lifetimes
2018-11-15 20:26:12 +09:00
jorolf
f0f7b15edc
remove unused using
2018-11-15 00:45:27 +01:00
jorolf
41a0f9896e
Merge branch 'master' into flashlight-mod
2018-11-15 00:35:42 +01:00
jorolf
7d2958b7b0
split shader, remove unnecessary clutter and fix some bugs
2018-11-15 00:33:13 +01:00
smoogipoo
d8e7ad8241
Fix post-rebase issues
2018-11-12 17:36:19 +09:00
smoogipoo
10543cf1b6
Move rest of ScrollingPlayfield into ScrollingRulesetContainer
2018-11-12 17:34:35 +09:00
smoogipoo
ad45bc7666
Move scroll direction to scrollinginfo
2018-11-12 17:34:35 +09:00
smoogipoo
7f0f143a1b
Move IScrollAlgorithm to ScrollingRulesetContainer + use DI
2018-11-12 17:34:35 +09:00
smoogipoo
aee7a80e71
ScrollAlgorithm -> ScrollVisualisationMethod
2018-11-12 17:26:37 +09:00
jorolf
023924396d
Move flashlight code from OsuModFlashlight to ModFlashlight and implement other modes and break time
2018-11-11 18:38:12 +01:00
smoogipoo
f66a9f4f1e
Rename IScrollChangeVisualiser -> IScrollAlgorithm
2018-11-08 14:04:21 +09:00
smoogipoo
a4caaf56ef
Merge remote-tracking branch 'origin/master' into fix-slider-samples
...
# Conflicts:
# osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
# osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
2018-11-05 16:38:28 +09:00
smoogipoo
70f1d17b7e
Merge remote-tracking branch 'origin/master' into editor-mask-placement
...
# Conflicts:
# osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
# osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
# osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
# osu.Game/Rulesets/UI/RulesetContainer.cs
2018-10-16 17:28:16 +09:00
smoogipoo
47be95ce0b
Fix slider nodes using the wrong samples
2018-10-16 17:10:24 +09:00
Dean Herbert
468f7fd1ea
Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework
2018-10-12 19:25:08 +09:00
Dean Herbert
e09e38148b
Merge branch 'master' into fix-scroll-speeds
2018-10-12 18:25:24 +09:00
Dean Herbert
841b2e8692
Merge branch 'master' into consistent-terminology-format
2018-10-10 19:19:36 +09:00
smoogipoo
ff559a3a1b
Merge remote-tracking branch 'origin/master' into playfield-scaling-rework
...
# Conflicts:
# osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
# osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-10-05 10:40:16 +09:00
smoogipoo
d0007c047a
PlayfieldLayer -> PlayfieldAdjustmentContainer
2018-10-05 10:39:18 +09:00
smoogipoo
540a010fbb
Implement an intermediary EditRulesetContainer
2018-10-03 15:36:24 +09:00
Dan Balasescu
0f51007867
Merge branch 'master' into judgement-cleanup
2018-10-02 09:37:04 +09:00
smoogipoo
08bd363827
Adjust taiko scrolling speed
2018-10-01 18:15:55 +09:00
Hanamuke
b983e20067
Merge branch 'master' into AR_Catch
2018-09-30 16:01:55 +02:00
Kyle Chang
88b0c234cc
Move judgement text to internal container
2018-09-30 04:01:33 -04:00
smoogipoo
3479bfa409
Rename variable
2018-09-28 17:18:34 +09:00
smoogipoo
5f61faa2d9
Fix multiple hits in the same frame pressing multiple hitobjects
2018-09-25 18:37:25 +09:00
smoogipoo
0bc2bcaf14
Remove GetAspectAdjustedSize() and PlayfieldArea
2018-09-21 15:14:49 +09:00
smoogipoo
368ceec47c
Simplify creation of a playfield
2018-09-21 14:35:50 +09:00
Hanamuke
309d8c8cb4
CI
2018-09-19 18:43:39 +02:00
Hanamuke
e7d78b94ae
Remove ScrollingVisualisation from settings
2018-09-19 18:30:25 +02:00
Joehu
f99eff1192
Use consistent terminology format
2018-09-15 07:30:11 -07:00
Dean Herbert
03084aa04b
Revert async changes
2018-08-31 07:07:10 +09:00
smoogipoo
1b279d383f
Use GetAsync on all textures
2018-08-27 17:26:44 +09:00
smoogipoo
2bc827fa0c
Fix taiko beatmap conversion attempting to make strong swells
2018-08-22 11:32:00 +09:00
smoogipoo
7c3556baf8
Throw exception when Swell.IsStrong is set
2018-08-15 09:12:29 +09:00
smoogipoo
8be5a606bf
Fix swells possibly being strong hitobjects
2018-08-14 18:33:07 +09:00
smoogipoo
b045f5c9b6
Adjust filename
2018-08-14 14:32:06 +09:00
smoogipoo
1a35506386
Cleanup strong hit construction
2018-08-14 14:29:49 +09:00
smoogipoo
732dfde8ed
DrawableStrongHandler -> DrawableNestedStrongHit
2018-08-14 14:28:40 +09:00
smoogipoo
7971d06df1
Remove AlwaysPresent
2018-08-14 14:27:47 +09:00
smoogipoo
5c4c2dff09
Fix strong hits not being visualised
2018-08-06 13:01:27 +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
5fd4ed2f4e
Rename judgement-related methods/events + commenting
2018-08-06 10:55:25 +09:00
smoogipoo
38263714a1
Cleanups
2018-08-03 16:56:46 +09:00
smoogipoo
412e4ff681
Fix display of swells
2018-08-03 16:49:24 +09:00
smoogipoo
e6775c7a16
Fix playfield display
2018-08-03 16:46:03 +09:00
smoogipoo
19c541dbf5
Migrate swells to use nested hitobjects for ticks
2018-08-03 16:35:29 +09:00
smoogipoo
e8a140930e
Migrate drum roll to use nested hitobjects for strong hits
2018-08-03 16:35:12 +09:00
smoogipoo
4494853446
Migrate DrawableDrumRoll to use a nested hitobject for strong hits
2018-08-03 16:20:08 +09:00
smoogipoo
fdf889359f
Migrate DrawableHit to use a nested hitobject for strong hits
2018-08-03 16:19:37 +09:00
smoogipoo
2dff04392e
Re-implement strong judgements via hitobject
2018-08-03 16:12:12 +09:00
smoogipoo
fa3c919e2e
Fix up taiko judgement creation
2018-08-03 16:11:38 +09:00
smoogipoo
0da6c8c1a7
Remove unnecessary local variables
2018-08-02 22:20:07 +09:00
smoogipoo
a0887a600f
Fix swells showing hit circles on intermediate judgements
2018-08-02 21:08:06 +09:00
smoogipoo
35b4ab5456
Introduce the concept of a "MainResult"
2018-08-02 21:07:40 +09:00
smoogipoo
9c2122c0ca
Make Rulesets.Taiko use the new judgement result structure
2018-08-02 20:36:19 +09:00
smoogipoo
1b7b6f341c
Migrate Rulesets.Taiko to the new judgement system
2018-08-02 16:09:04 +09:00
Dean Herbert
3c06655672
Split out Special mods into Automation and Conversion
2018-07-31 18:00:42 +09:00
Dean Herbert
d868d81b59
Merge branch 'master' into centralise-judgement-display
2018-07-23 02:58:49 +09:00
Dean Herbert
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
smoogipoo
1139f0dbf2
Centralise method of disabling playfield judgements
2018-07-20 17:04:33 +09:00
ekrctb
c6816a6cf3
Fix potential quadratic complexity in taiko autoplay
2018-07-17 17:00:28 +09:00
Dan Balasescu
64cde1ebad
Merge branch 'master' into use-switch-over-if
2018-07-17 16:44:57 +09:00
Dean Herbert
9f933187e9
Apply review feedback
2018-07-17 16:33:08 +09:00
smoogipoo
827c5c4939
Remove scroll direction from ScrolingPlayfield constructor
2018-07-17 15:14:03 +09:00
Dean Herbert
825941aff1
Use switch with type matching in place of if-else where possible
2018-07-17 14:35:09 +09:00
Roman Kapustin
2a72062c33
Perhaps the '??' operator works in a different way than it was expected. Its priority is lower than priority of other operators in its left part.
2018-06-26 00:53:31 +03:00
Dean Herbert
22138d39ca
Merge branch 'master' into more-diffcalc-attributes
2018-06-25 19:53:22 +09:00
Dean Herbert
d4d9d20147
Merge branch 'master' into fix-taiko-rewind
2018-06-25 18:08:27 +09:00
Dean Herbert
5e6634cd00
Merge branch 'master' into fix-taiko-rewind
2018-06-25 17:10:53 +09:00
Dean Herbert
d7133f059d
Fix incorrect implementation
2018-06-25 16:53:12 +09:00
Dean Herbert
63448dc9dc
Merge branch 'master' into master
2018-06-25 16:33:08 +09:00
smoogipoo
185789bc7f
Remove unused variable
2018-06-25 16:13:15 +09:00
Dan Balasescu
26d9e3cc10
Merge branch 'master' into fix-taiko-rewind
2018-06-25 16:08:52 +09:00
smoogipoo
70e9f7cb8d
Always proxy taiko hits when hit
2018-06-25 15:55:09 +09:00
nl-tatatat
09b2025fad
Update TaikoRulesetContainer.cs
...
Remove code that I am almost 100% sure that makes barlines every 1/1 instead of 4/1.
2018-06-24 04:48:38 -05:00
ekrctb
d6084c0b30
Adapt to new input handling changes
2018-06-22 18:10:27 +09:00
Dean Herbert
566d125658
Change order of default initialisation to look better in settings
2018-06-21 14:28:40 +09:00
smoogipoo
48989df6eb
Make sure that 0 SR is returned when there are no hitobjects
2018-06-21 12:04:14 +09:00
Dan Balasescu
bf11a61d52
Merge branch 'master' into more-diffcalc-attributes
2018-06-21 09:26:50 +09:00
Tom Arrow
d753df65a5
Remove default bindings for right actions
2018-06-19 18:04:53 +02:00
Dean Herbert
5b344525e1
Move proxy state check to base class
2018-06-18 00:27:18 +09:00
smoogipoo
4575319102
Privatise the proxied content
2018-06-17 17:56:46 +09:00
smoogipoo
99ef44eca2
Merge remote-tracking branch 'origin/master' into fix-taiko-proxies
2018-06-17 17:54:50 +09:00
Dean Herbert
f9a7e761e4
Merge branch 'master' into more-diffcalc-attributes
2018-06-15 18:29:20 +09:00
Dean Herbert
a6437c005c
Merge branch 'master' into diffcalc-rework
2018-06-15 18:02:18 +09:00
Dean Herbert
30f7837b03
Merge branch 'master' into fix-taiko-hitexplosions
2018-06-15 17:52:53 +09:00
smoogipoo
01dd2d7919
Move taiko difficulty attributes to TaikoDifficultyCalculator
2018-06-14 16:26:51 +09:00
smoogipoo
8f7334874c
Fix up performance calculators
2018-06-14 16:04:48 +09:00
smoogipoo
33c7ce1bec
Adjust TaikoDifficultyCalculator in-line with changes
2018-06-14 15:47:42 +09:00
Joehu
b182635aae
Fix taiko nightcore regression
2018-06-12 20:21:37 -07:00
smoogipoo
0f9c05d1e6
Fix taiko swells not properly rewinding
2018-06-11 22:32:08 +09:00
Dan Balasescu
1b12820de9
Restore a removed comment
2018-06-11 21:54:11 +09:00
smoogipoo
22dfe46572
Make taiko hitobject properly unproxy when rewound
2018-06-11 21:46:45 +09:00
smoogipoo
b6fb01440b
Fix taiko hit states not being reverted on rewind
2018-06-11 20:44:26 +09:00
smoogipoo
8f3215f5a0
Make sure taiko hitexplosions expire and get removed
2018-06-11 20:42:04 +09:00
smoogipoo
83ff47ec80
Rewrite difficulty mod combinations
2018-06-06 16:20:17 +09:00
smoogipoo
8274623ad6
Cleanup multi mod constructions
2018-06-06 14:07:50 +09:00
smoogipoo
2ccffb9ac4
Add difficulty calculation mod types
2018-06-03 10:59:56 +09:00
smoogipoo
215cc9fba7
Change all performance calculators to use int hitwindows
...
Has a pretty large (>6) effect on pp for some maps.
2018-05-25 20:07:14 +09:00
smoogipoo
765a50d007
Remove 0.5 offsets
...
Checked up against DB values + server-side build versions, and these 0.5s don't seem to exist. Brings calculations more in-line with osu!stable.
2018-05-25 20:05:53 +09:00
Dean Herbert
8e784d9104
Merge branch 'master' into fix-conversion-hitwindows
2018-05-18 11:59:16 +09:00
Dean Herbert
14d67e0b1e
Merge branch 'master' into fix-taiko-slider-multiplier
2018-05-18 11:39:24 +09:00
smoogipoo
3091d3a014
Implement the taiko performance calculator
2018-05-17 17:56:44 +09:00
smoogipoo
450d54eea9
Fix taiko difficulty calculator never considering mods
2018-05-17 17:56:37 +09:00
smoogipoo
b9ed976954
Fix taiko slider multiplier being applied twice
2018-05-17 14:44:30 +09:00
smoogipoo
f67d263596
Move ruleset-specific hitwindows to post-converted hitobjects
2018-05-17 13:35:15 +09:00
smoogipoo
397d93660a
Don't deep-clone beatmapinfo/control points
2018-05-17 13:17:33 +09:00
Dean Herbert
0e0cc8bb69
Merge branch 'master' into namespace-cleanup
2018-05-15 18:10:48 +09:00
smoogipoo
803200ff6a
Apply similar changes to other rulesets
2018-05-15 17:40:19 +09:00
smoogipoo
995fda9b6f
Move base classes to osu.Game.Rulesets.Difficulty namespace
2018-05-15 17:38:08 +09:00
Dean Herbert
e39af1c906
Merge branch 'master' into convert-object-hitwindows
2018-05-15 17:33:27 +09:00
smoogipoo
7d027098ec
Fix drumroll completions always giving GREAT judgements
...
Due to requiredgoodhits/requiredgreathits being calculated prior to nested hitobjects.
2018-05-14 14:13:07 +09:00
smoogipoo
6e1d651087
Merge remote-tracking branch 'origin/master' into convert-object-hitwindows
2018-05-14 11:17:39 +09:00
smoogipoo
faa82f17cc
Pass original hitobject HitWindows during conversion
2018-05-11 15:30:50 +09:00
smoogipoo
7eb64ab590
Remove object counts from mania/taiko/catch
2018-05-07 15:51:08 +09:00
smoogipoo
accffda532
Add taiko statistics
2018-05-07 15:51:08 +09:00
smoogipoo
4ecdea8b2e
Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer
2018-05-07 10:17:54 +09:00
smoogipoo
03a5df84c6
Initial rework of beatmap conversion process
2018-04-19 22:04:12 +09:00
smoogipoo
66b3b295e7
Use IBeatmap wherever possible
2018-04-19 20:44:38 +09:00
tgi74000
9b36cf2066
Review changes
2018-04-16 14:14:40 +02:00
tgi74000
b23b0a445b
Add support for replay mods
2018-04-13 15:41:35 +02:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
Dean Herbert
acbdbcc3df
Update AssemblyInfo in line with framework changes
2018-04-06 13:17:26 +09:00
Dan Balasescu
824201336a
Merge branch 'master' into hr-on-mania-is-unranked
2018-03-30 16:35:00 +09:00
Joseph Madamba
0887dafa2c
Revert changes on hard rock mod
2018-03-29 20:36:52 -07:00
smoogipoo
187a025d36
Make hitobjects sorted by their start times
2018-03-29 16:07:31 +09:00
Dean Herbert
9aae568bbe
Tidy up csproj further
2018-03-28 15:19:56 +09:00
Dean Herbert
9667d54ecb
Add missing licence headers
2018-03-28 14:48:08 +09:00
Dean Herbert
0026b94cd3
Consolidate and move ruleset test projects
2018-03-28 14:41:25 +09:00
Dean Herbert
1a8aa87469
Make everything better
2018-03-27 18:56:54 +09:00
Dean Herbert
b290d2d039
Move NUnit includes to individual projects
2018-03-27 15:07:09 +09:00
smoogipoo
dd5bbbbd9f
Define testable projects
2018-03-26 19:11:23 +09:00
smoogipoo
5159127bce
Fix SQLite failing to initialize on test projects
2018-03-26 18:07:09 +09:00
smoogipoo
35ef9d99c6
Only compile with net461 in visual studio
2018-03-26 15:44:55 +09:00
smoogipoo
96901b6498
Add msbuild/dotnet build + launch targets
2018-03-26 10:52:54 +09:00
smoogipoo
31920f1866
Fix ruleset resources not getting included in build
2018-03-25 02:12:01 +09:00
smoogipoo
d28de89e50
Add net461 target to test projects for nunit discovery
...
Nunit "by design" will not run tests for NETStandard projects (see: https://github.com/nunit/dotnet-test-nunit/issues/122#issuecomment-329531632 ).
2018-03-25 01:35:50 +09:00
smoogipoo
c29f7a4333
Merge remote-tracking branch 'origin/master' into netstandard
2018-03-24 14:49:46 +09:00
Dean Herbert
cb3d0db555
Move combo colours completely out of HitObjects
2018-03-20 15:50:12 +09:00
smoogipoo
20acc601bb
Fix up breaking taiko changes
2018-03-16 16:10:09 +09:00
Dean Herbert
7e7f8ed7a2
Merge branch 'master' into drawable-composite-hit-object
2018-03-16 15:53:16 +09:00
Dean Herbert
a42035f494
Make DrawableHitObject a CompositeDrawable
...
No reason for it to be a container.
2018-03-15 13:41:06 +09:00
Joseph Madamba
d122aa80e4
Edit mods description, multiplier, and code
2018-03-13 20:07:03 -07:00
Dean Herbert
b62ed004f2
Remove judgements when deciding a new judgement for a HitObject
...
Generally happens when rewinding.
2018-03-07 19:14:42 +09:00
Dean Herbert
e82cadc811
Make LegacyID nullable
...
The -1 default was getting stored to the database.
2018-03-06 17:40:14 +09:00
Dean Herbert
7b18e8a5ca
Merge branch 'master' into fix-taiko-conversion
2018-03-06 01:16:47 +09:00
smoogipoo
2a9fb2c2c6
Make NestedHitObjects lazily-constructed
2018-03-05 21:40:26 +09:00
smoogipoo
df84b23847
Fix possible nullref when there are 0 drumroll ticks
2018-03-05 21:19:40 +09:00
smoogipoo
7ce3e60722
Fix drumrolls giving GOOD judgements too one tick too late
2018-03-05 21:19:36 +09:00
smoogipoo
c013f83267
Restore IgnoreAttribute
2018-03-05 17:01:27 +09:00
smoogipoo
88c33e31e8
Add slider conversion testcases
2018-03-05 16:01:45 +09:00
smoogipoo
63155f169e
Fix incorrect taiko slider conversions due to beatlength adjustments
...
Fixes ppy/osu#2152 .
2018-03-05 15:12:15 +09:00
Dean Herbert
0e928429d4
Merge branch 'master' into ruleset-replayframes
2018-03-04 01:57:43 +09:00
smoogipoo
a2c239d5e3
Rename to IBeatmapConverter, move to separate file
2018-03-02 20:19:47 +09:00
smoogipoo
71755f5363
Prettyfy some JSON
2018-03-02 20:12:29 +09:00
smoogipoo
820a852caf
Remove unnecessary .osu properties
2018-03-02 18:37:38 +09:00
smoogipoo
cdca7371a3
Replace testcases with a basic test suite
2018-03-02 18:20:33 +09:00
smoogipoo
1f21ccffb0
Add lenience to start times
2018-03-02 18:20:12 +09:00
Dan Balasescu
4aff659272
Merge branch 'master' into beatmap-conversion-testcases
2018-03-02 16:04:32 +09:00
smoogipoo
3d5fefae8c
Add TestFixtureAttribute to all tests
2018-03-02 15:34:31 +09:00
smoogipoo
6fff6da751
Ignore broken testcases
2018-03-02 14:01:34 +09:00
smoogipoo
573d6d1b5f
Allow multiple mappings to be generated for a single hitobject
2018-03-02 13:13:01 +09:00
smoogipoo
4e363664fd
Add beatmap parameter to beatmapconverter creation
2018-03-02 13:13:01 +09:00
smoogipoo
b2827d82d4
Add a taiko beatmap conversion test case
2018-03-02 13:13:01 +09:00
smoogipoo
195b6642e6
Reimplement important frames
2018-03-01 02:28:15 +09:00
smoogipoo
cf42d5bbd5
Remove mostly-unused Score parameter
2018-03-01 02:28:14 +09:00
smoogipoo
c9c65cab53
CreateReplayFrame -> CreateConvertibleReplayFrame
2018-03-01 02:28:14 +09:00
smoogipoo
222ae70062
Populate rulesets with their replay frames
2018-03-01 02:28:14 +09:00
smoogipoo
a3c7755ade
Implement a conversion process for ReplayFrames
2018-03-01 02:28:14 +09:00
Dean Herbert
b9f8ed3123
Merge branch 'master' into taiko_legacy_rep
2018-02-26 13:27:37 +09:00
Dean Herbert
4a52df2dd4
Apply review
2018-02-24 23:07:02 +09:00
Dean Herbert
768e0a4e2a
Add SkinnableSound class
...
Tidy things up, move logic out of SampleInfo.
2018-02-24 22:47:14 +09:00
smoogipoo
bea9bf9dd4
Merge remote-tracking branch 'origin/master' into taiko_legacy_rep
2018-02-23 14:40:32 +09:00
smoogipoo
3fdb6845da
Revert unneeded change
...
This was already correct as per osu-stable.
2018-02-23 14:40:25 +09:00
Dean Herbert
6ceabfe19e
Add basic hitsound skinning
2018-02-23 13:38:12 +09:00
tgi74000
426343f136
Fix legacy Taiko replays having reversed inputs
2018-02-21 15:05:51 +01:00
smoogipoo
5faec5c2f1
Add a separate property to control playfield area
2018-02-21 20:54:33 +09:00
smoogipoo
cd2c9a9de6
Adjust xmldoc and rename to GetAspectAdjustedSize
2018-02-19 17:04:18 +09:00
Dan Balasescu
9f7736fab3
Merge branch 'master' into restore-ruleset-tests
2018-02-14 22:48:29 +09:00
smoogipoo
b500b76407
Merge branch 'master' into update-branch
2018-02-08 23:35:48 +09:00
smoogipoo
46284c61ae
Return HitResult.None instead of null
2018-02-08 14:25:59 +09:00
smoogipoo
3d167c40ae
Remove now unneeded Math.Abs call
2018-02-08 14:15:58 +09:00
smoogipoo
beaecbafbd
Merge branch 'master' into unified-hitwindows
2018-02-08 13:22:44 +09:00
smoogipoo
ccc948a0b9
Update framework (testing)
2018-02-08 12:45:51 +09:00
Dean Herbert
dfc344b47a
Update OpenTK version
2018-02-06 13:47:54 +09:00
Dean Herbert
6b35ef7063
Update OpenTK version
2018-02-05 16:13:30 +09:00
smoogipoo
9225e883c1
Add + use HalfHitWindow
2018-02-02 20:29:50 +09:00
smoogipoo
9bc4bf33a6
Use HitWindows for taiko
2018-02-02 18:53:30 +09:00
Dean Herbert
1cc7c23982
Hits -> JudgedHits
2018-02-01 18:08:15 +09:00
Dean Herbert
888d2362fd
Merge branch 'master' into fix-taiko-fastforwarding
2018-01-31 18:30:15 +09:00
FreezyLemon
8f0ab2040f
Add Jetbrains.Annotations NuGet package
2018-01-26 12:46:28 +01:00
smoogipoo
92df704fbd
Fix up taiko not having any important frames
2018-01-25 21:37:38 +09:00
smoogipoo
d37844c068
Clean up off-by-one offsets from repeat-related properties
2018-01-23 13:37:25 +09:00
smoogipoo
c309cc9454
Privatise OnJudgements as much as possible
2018-01-16 15:37:32 +09:00
smoogipoo
8c5ef0a330
Remove base OnJudgement from Playfield to properly accomodate nested playfields
2018-01-15 20:48:57 +09:00
smoogipoo
bfdfb52666
Fix a few usages of AllJudged possibly not being correct
2018-01-15 15:28:08 +09:00
smoogipoo
9d00e5bb7d
Make ScrollingHitObjectContainer handle nested hitobjects
2018-01-11 15:08:30 +09:00
smoogipoo
3a869edf36
Add a flag to disable user scroll speed adjustments
2018-01-11 12:44:39 +09:00
smoogipoo
6255aaab68
Per-hitobject lifetime management
2018-01-10 19:17:43 +09:00
smoogipoo
86b5591583
Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite
2018-01-10 18:02:49 +09:00
Dean Herbert
58626e3b30
Allow rulesets to create their own instantiation info
2018-01-10 17:04:07 +09:00
Dean Herbert
b8bb0a52e3
Move mod implementations to individual files
2018-01-09 14:08:18 +09:00
Dean Herbert
37d393bca0
Update licence headers
2018-01-05 20:21:19 +09:00
smoogipoo
36e9232472
Merge master into netstandard
2018-01-05 00:42:48 +09:00
smoogipoo
add68ff068
Fix swells not stopping at the hit position
2018-01-04 21:45:29 +09:00
smoogipoo
4fee76ba0b
Fix drumroll lengths
2018-01-04 20:56:28 +09:00
smoogipoo
a7aab21a29
Re-namespace files
2018-01-04 19:22:15 +09:00
smoogipoo
651e24e3cc
Implement proper scrolling directions
2018-01-04 19:17:40 +09:00
smoogipoo
f34131f8f4
Initial game-wide replacement of scrolling playfields
2018-01-04 18:50:17 +09:00
Aergwyn
ccb69d16d9
move HitResult in Scoring namespace to replace HitCount
2017-12-30 21:23:18 +01:00
Dean Herbert
2ca10b28c6
Use a non-broken opentk library
2017-12-29 15:42:51 +09:00
Dean Herbert
02f4705178
Merge branch 'master' into proper-taiko-hitsounds
2017-12-27 23:13:30 +09:00
Dean Herbert
3f73a9a693
Add better sample fallback logic
...
Also adds support for null channels at InputDrum level.
2017-12-27 21:44:04 +09:00
smoogipoo
7a793eaded
Merge master into netstandard
2017-12-27 20:48:53 +09:00
smoogipoo
de353ee6af
Merge branch 'master' into proper-taiko-hitsounds
2017-12-27 14:59:26 +09:00
Dean Herbert
7dcd325a91
Merge branch 'master' into autoplay-drumroll-tick-fix
2017-12-27 14:19:25 +09:00
smoogipoo
5b529511ec
Update OpenTK nuget package
...
Fixes the recent AppVeyor errors
2017-12-27 13:18:34 +09:00
smoogipoo
9fa0cfd250
Fix taiko autoplay hitting drumroll ticks with the rims instead of centres
...
Fixes #1772 .
2017-12-27 13:06:36 +09:00
smoogipoo
519ef72adf
Lookup by control point time rather than control point
...
Under some situations, such as when there are no control points, ControlPointInfo will return to us a newly-constructed controlpoint with every call to SamplePointAt, which will fail on this key lookup.
Between this and overriding GetHashCode, I think this is the more proper fix for this.
2017-12-27 13:03:46 +09:00
smoogipoo
0c4e4012f8
Taiko drumroll ticks should just play the playfield samples
2017-12-26 19:57:40 +09:00
smoogipoo
9690591593
Make taiko use namespaced hitsounds
...
This is a temporary solution for now that uses DrawableHitObject.SampleNamespace for the override. We will not want to do this going forward, and instead have the rulesets add their custom resource stores to the games', but that requires deciding where/when to apply/remove such resource stores, and is probably left to skinning.
2017-12-26 19:55:56 +09:00
smoogipoo
c74561b3d4
Add test case for InputDrum
2017-12-26 19:33:28 +09:00
smoogipoo
35d7fa8a81
Cleanup things that are now not needed with these changes
2017-12-26 14:18:38 +09:00
smoogipoo
14162b5d46
Make InputDrum handle all Normals/Claps, hitobjects all others
2017-12-26 14:18:23 +09:00
smoogipoo
affdd81563
Remove unused usings
2017-12-25 17:29:44 +09:00
smoogipoo
ac8b345bfe
Make TaikoPlayfield use the new DrumSampleMapping
2017-12-25 17:29:20 +09:00
smoogipoo
8bfdee586b
Rename SwellSampleMapping -> DrumSampleMapping
2017-12-25 17:29:04 +09:00
smoogipoo
d288d8a51f
Remove SampleInfoList
2017-12-25 15:40:01 +09:00
smoogipoo
844e39a9f6
Make Swells play samples while they're being hit
2017-12-25 15:04:22 +09:00
smoogipoo
8529eb1d3a
Make strong hit misses not count as misses
2017-12-25 14:49:39 +09:00
Dean Herbert
298ac5468f
Fix regressions
2017-12-23 17:24:28 +09:00
Dean Herbert
cd8e8c8323
Actually save changes
2017-12-23 16:52:23 +09:00
Dean Herbert
a30400ad29
Use a class instead of Tuple
2017-12-23 16:49:29 +09:00
Dean Herbert
9ca03c0209
Simplify and tidy sample retrieval
...
Less static weirdness
2017-12-23 16:46:02 +09:00
Dean Herbert
5026c7a95e
SoundControlPoint -> SampleControlPoint
2017-12-23 16:34:34 +09:00
Dean Herbert
46865bbacd
Merge remote-tracking branch 'upstream/master' into taiko-hitsounds-fix
...
# Conflicts:
# osu.Game/Audio/SampleInfo.cs
2017-12-23 14:50:35 +09:00
Dean Herbert
1fa9dac1bb
Merge remote-tracking branch 'origin/master' into taiko-hitsounds-fix
2017-12-23 14:20:16 +09:00
smoogipoo
6a29f6020a
Make HitObjects construct nested hit objects
2017-12-22 21:42:54 +09:00
smoogipoo
ac1d27e925
Fix possible nullref exceptions
2017-12-21 23:02:46 +09:00
smoogipoo
d80079a73a
Merge remote-tracking branch 'origin/master' into beatmap-serialization
2017-12-21 20:15:01 +09:00
smoogipoo
cb7e192aff
Determine SampleInfo defaults in DrawableHitObject
2017-12-21 16:02:33 +09:00
Dean Herbert
020d272636
Make all TestCases public
2017-12-20 21:51:00 +09:00
Dean Herbert
08727266e7
Merge branch 'master' into add-ruleset-shortname
2017-12-11 15:41:11 +09:00
FreezyLemon
4a723f7382
Added the "Service Include" tag that is used by Visual Studio's test explorer to the .csproj files
2017-12-08 11:05:00 +01:00
Dean Herbert
679134c030
Add ShortName to rulesets
2017-12-08 18:55:25 +09:00
FreezyLemon
4b3cf0773d
Various CI adjustments
2017-12-08 09:52:58 +01:00
FreezyLemon
9d3d9bcdc8
Corrected the return values for taiko DrawableHit and DrawableHitStrong (OnPressed == true if new Judgement occurs and is a hit)
2017-12-08 09:42:10 +01:00
FreezyLemon
61a6a2919e
Fixed multiple critical bugs and changed allSamples to a normal Dictionary for faster access
2017-12-08 09:41:13 +01:00
FreezyLemon
40e750f309
Added sample preloading and playing
2017-12-08 08:32:16 +01:00
FreezyLemon
9e3d439f0a
Merge branch 'master' of https://github.com/ppy/osu into taiko-hitsounds-fix
2017-12-08 08:30:02 +01:00
FreezyLemon
229c9b5b4e
First basic implementation of IKeyBindingHandler for the playfield so it can handle taiko hitsounds
2017-12-07 23:11:34 +01:00
FreezyLemon
43c270ea49
Rolled back the bad earlier implementation
2017-12-07 21:18:51 +01:00
smoogipoo
a30270658d
Merge remote-tracking branch 'origin/master' into netstandard
2017-12-01 18:50:28 +09:00
smoogipoo
36be171c29
Fix up/clean up csprojs for C#7 support
2017-11-30 02:06:03 +09:00
smoogipoo
a0c3349935
Add LangVer.props and osu.Game.props for common csproj properties
2017-11-30 00:45:37 +09:00
smoogipoo
267bb75458
Merge remote-tracking branch 'Aergwyn/master' into netstandard
2017-11-29 23:45:29 +09:00
FreezyLemon
e3232dd754
Added if to ignore more (for our purposes) useless keydowns
2017-11-29 06:51:00 +01:00
FreezyLemon
c00fb47236
Added hitsound handling to the TaikoRulesetContainer so every KeyDown can play a hitsound (instead of the DrawableHitObjects)
2017-11-29 06:28:08 +01:00
FreezyLemon
3e8db8c5e1
Enabled strong taiko hitobjects playing samples again.
...
Also removes the first hitsound from the strong hitobject so only the "hitfinish" sound gets played.
2017-11-29 06:27:25 +01:00
FreezyLemon
bc3f11fdb8
Added PlaysSamples property to prevent certain DrawableHitObjects from playing their samples on hit. Also added this to TaikoObjects so their hitsounds won't be played (will be done by the TaikoRulesetContainer)
2017-11-29 06:24:13 +01:00
smoogipoo
7db7fb91dd
Ignore ruleset testcases from CI
2017-11-28 21:45:24 +09:00
smoogipoo
a9cc156d7a
Merge remote-tracking branch 'origin/master' into performance-calculator
2017-11-28 21:38:26 +09:00
Dan Balasescu
a4b67b2559
Fix CI
2017-11-24 12:56:52 +09:00
Dean Herbert
288c21dfec
Move TestCase descriptions to attributes
...
Depends on https://github.com/ppy/osu-framework/pull/1186 .
2017-11-23 16:09:32 +09:00
smoogipoo
de7c571be3
Merge remote-tracking branch 'origin/master' into netstandard
2017-11-22 19:46:17 +09:00
smoogipoo
f9ad4b6acb
Make categoryDifficulties return doubles to improve decimal accuracy
2017-11-21 19:55:09 +09:00
smoogipoo
0f8d4a455a
Merge remote-tracking branch 'origin/master' into performance-calculator
2017-11-21 19:18:06 +09:00
smoogipoo
1b27ce6198
Cleanup + renaming
2017-11-21 17:09:22 +09:00
smoogipoo
b3bf6e7bee
Merge master into netstandard
2017-11-21 16:39:21 +09:00
smoogipoo
756f6f2d16
Remove net461 targets
2017-11-20 10:10:28 +09:00
smoogipoo
067c018422
Cleanups
2017-11-19 17:31:35 +09:00
smoogipoo
d2ab0621f3
Make osu.Game + rulesets compile with netstandard
2017-11-19 13:46:51 +09:00
smoogipoo
bf44b3d0ef
Cleanups
2017-11-17 16:54:50 +09:00
smoogipoo
38fe95d94a
Add basic display for pp in TestCasePerformancePoints
2017-11-17 14:37:19 +09:00
smoogipoo
95fd323c6b
Fix ManiaDifficultyCalculator possibly failing due to nullref
2017-11-17 14:37:06 +09:00
smoogipoo
ac6213d1fa
CI fixes
2017-11-17 14:26:33 +09:00
smoogipoo
7892eefd68
Fix up mod application + beatmap/hitobject references
2017-11-17 14:23:52 +09:00
smoogipoo
62155e6dd5
Make DifficultyCalculator support mod applications
...
Fixes https://github.com/ppy/osu/issues/476 .
2017-11-17 12:36:07 +09:00
smoogipoo
f461f03b08
Make osu! compile with framework changes
2017-11-16 14:51:31 +09:00
Dean Herbert
bd2de89918
Why weren't these fixed previously
2017-11-10 19:26:25 +09:00
smoogipoo
3f20caa543
Make taiko stop crashing for now
2017-11-02 23:31:50 +09:00
smoogipoo
5c2b1d4be2
Update xmldoc
2017-11-02 21:58:29 +09:00
smoogipoo
e2b6003f98
Make taiko use the new "Final" field
...
Ensures that the first hit on HitStrongs is _always_ non-final unless it was a miss. The second hit is always final.
2017-11-02 21:55:50 +09:00
smoogipoo
fe00ac7e41
Make DrawableHitObject/ScoreProcessor support rewinding
2017-11-02 21:21:07 +09:00
Dean Herbert
b877177b83
Merge branch 'master' into bugfix-nofail-scoreprocessor
2017-10-24 08:14:54 +09:00
Dean Herbert
bbc5c05055
Disable ruleset-level tests for now
2017-10-23 21:25:54 +09:00
Jacob Odgård Tørring
9b54e834d9
Implements virtual Failcondition in scoreprocessor and enforces nofail in UpdateFailed
2017-10-22 20:32:59 +02:00
Dean Herbert
36af0dc809
Update app config for rulesets
2017-10-19 14:59:11 +09:00
Dean Herbert
5d5ea5fb2e
Fix all remaining db structure issues
2017-10-19 14:05:11 +09:00
Dan Balasescu
31b26e1d0a
Merge branch 'master' into back-to-desktop
2017-10-14 16:18:28 +09:00
Dean Herbert
179542daf1
Standardise AssemblyInfos
2017-10-14 15:02:20 +09:00
Dean Herbert
c5046f6b3c
Add back osu.Desktop project
...
While it was nice having less projects to deal with, it meant hacks to get around circular dependencies between rulesets and osu.Game. For now, let's just restore the osu.Desktop project and call it a day.
This allows for the project to build again with default visual studio settings.
2017-10-14 14:33:05 +09:00
Dean Herbert
cd722e4abb
Fix beatmap author being stored in two different places
2017-10-14 11:39:55 +09:00
Dean Herbert
d5892cf54e
Add a bool to specify whether judgements should be visible for certain DrawableHitObjects
2017-10-09 20:17:05 +09:00
Franc[e]sco
5e751ea0ec
Only convert chords into strong hits for mania -> taiko
2017-10-01 00:15:23 +02:00
Dean Herbert
e0911f014e
Fix ruleset target path for release builds
2017-09-19 22:50:36 +09:00
Dean Herbert
99b512cce5
Output ruleset assemblies to the game folder rather than adding special logic
2017-09-19 19:27:14 +09:00
Dean Herbert
1f20c5eb69
Optimise project references
2017-09-19 16:07:00 +09:00
Dean Herbert
8fa76557db
Avoid unnecessary dll copies
2017-09-19 16:06:59 +09:00
Dean Herbert
6db705a3a8
Update relative paths
2017-09-19 16:06:58 +09:00
Dean Herbert
6d3d485565
And then everything became one
2017-09-19 16:06:58 +09:00
Dean Herbert
b78c516b74
Merge branch 'master' into scoring-revamp
2017-09-13 20:47:14 +09:00
Dean Herbert
fb7740a3ab
Update all dependencies in line with framework
2017-09-13 20:25:40 +09:00
smoogipooo
5e32d95ad2
Remove Ruleset's CreateScoreProcessor method
2017-09-13 16:37:05 +09:00
smoogipooo
093d82ac45
Set depths from playfield add methods instead of DrawableHitObject
2017-09-13 16:17:01 +09:00
smoogipooo
e146bcacf1
Make BasePortion and ComboPortion constants
2017-09-13 16:13:27 +09:00
smoogipooo
05ac23f99a
Remove AffectsAccuracy for now
2017-09-13 15:44:03 +09:00
smoogipooo
ba3e44cd71
Simplify standardized scoring to BasePortion (raw scoring) + ComboPortion (highest combo)
2017-09-13 15:17:32 +09:00
smoogipooo
7b44ad300f
Remove accurateHits, make Accuracy once again tied to comboScore
2017-09-13 00:33:01 +09:00
smoogipooo
b5f48c2368
Add storeResults as a parameter to Reset
...
Whether to store the current state of the ScoreProcessor for future use.
2017-09-12 22:27:27 +09:00
smoogipooo
d0774c7bc6
ComputeTargets -> SimulateAutoplay + improve xmldoc
2017-09-12 21:16:47 +09:00
smoogipooo
3e3618d724
More cleanups
2017-09-12 21:12:57 +09:00
smoogipooo
abab2a4878
Revamp score processing to once more unify scoring methods
2017-09-12 21:05:50 +09:00
smoogipooo
0b94939474
Make Accuracy = 1, Health = 1 the default for ScoreProcessor
2017-09-12 20:53:26 +09:00
smoogipooo
3af8345068
Add AffectsAccuracy to Judgement
2017-09-12 19:39:44 +09:00
smoogipooo
3ef65a1e5d
Cleanup TaikoPlayfield a bit
2017-09-12 18:49:31 +09:00
smoogipooo
fb05552ac4
Fix one more case of incorrect offset.
2017-09-12 18:36:31 +09:00
Dean Herbert
f32d444d68
Remove generics from Playfield (fixes catch)
2017-09-12 18:19:28 +09:00
Dean Herbert
1194e46ef1
Merge remote-tracking branch 'upstream/master' into judgement-revamp
2017-09-12 17:46:21 +09:00
smoogipooo
27e3c9e778
Remove usings.
2017-09-12 11:51:19 +09:00
smoogipooo
d6bf5c38b7
Move Kiai bool to HitObject.
2017-09-12 10:01:07 +09:00
smoogipooo
58c875bdca
Merge remote-tracking branch 'origin/master' into blending-equations
...
# Conflicts:
# osu-framework
2017-09-11 15:02:12 +09:00
Dean Herbert
b01233eddc
Fix CI issues
2017-09-11 14:48:01 +09:00
Dean Herbert
5ce76d8023
Merge remote-tracking branch 'upstream/master' into judgement-revamp
2017-09-11 14:36:51 +09:00
Dean Herbert
7170fbd087
Target .NET 4.6.1
2017-09-11 12:39:00 +09:00
smoogipooo
cde22865b9
Merge remote-tracking branch 'origin/master' into blending-equations
...
# Conflicts:
# osu-framework
2017-09-11 02:42:23 +09:00
MrTheMake
a7f874e5b6
Merge branch 'master' into leaderboard-scores
2017-09-07 18:25:33 +02:00
smoogipooo
19db7a8f72
Update in line with framework changes.
2017-09-07 22:46:21 +09:00
smoogipooo
0cc443e618
Remove all generic judgements.
2017-09-06 18:05:51 +09:00
smoogipooo
29941019a5
Hacky way to make osu! and taiko work again.
2017-09-06 17:44:51 +09:00
smoogipooo
ac8ec31b61
Make judgements able to be "added" plus make everything compile and run.
2017-09-06 17:02:13 +09:00
Dean Herbert
84c22df3f5
Combine Judgement.HitResults into one.
2017-09-06 17:01:48 +09:00
Tom
1e10d977f9
Accuracy starts at 100% instead of 0%
2017-09-05 15:39:27 +02:00
Dean Herbert
a7e6efd34f
Rename keys -> actions
2017-08-24 20:30:18 +09:00
Dean Herbert
a7a7e0323f
Update autoplay and replay handling to result in actions, not keys
2017-08-24 15:36:42 +09:00
Dean Herbert
6f8e85c2e1
Merge branch 'master' into fix_taiko_sizing
2017-08-22 23:19:41 +09:00
smoogipooo
d080a7e970
Determine size of ScrollingContainer a bit better to avoid taiko weirdness
2017-08-22 20:53:19 +09:00
smoogipooo
909cae5861
CI fixes.
2017-08-22 14:21:28 +09:00
smoogipooo
68c7226d12
Fix cherry pick issues.
2017-08-22 14:18:17 +09:00
smoogipooo
88151eff3f
Fix dofficulty calculators not working and make mania set the correct key count for non-mania specific maps.
2017-08-22 14:07:39 +09:00
Dean Herbert
7903f49d27
Merge branch 'master' into action-key-counter
2017-08-21 17:47:19 +09:00
Dean Herbert
4ea82694bd
Merge branch 'master' into fix-taiko-barlines
2017-08-21 16:53:47 +09:00
Dean Herbert
52dadad1e1
Merge branch 'master' into fix-taiko-barlines
2017-08-21 16:46:25 +09:00
Dean Herbert
8c84732a40
Merge branch 'master' into fix-taiko-drumroll-conversion
2017-08-21 16:35:31 +09:00
Dean Herbert
ea450fecf5
Merge branch 'master' into action-key-counter
2017-08-21 16:25:44 +09:00
smoogipooo
6a7e868a2e
Make taiko major bar line triangles show up again. Fixes #1081
2017-08-21 15:36:01 +09:00
smoogipooo
7a5708ce92
Further support for null judgements.
2017-08-21 15:35:16 +09:00
Dean Herbert
16e96888ab
Update KeyCounterCollection to support action-based buttons
2017-08-21 12:39:22 +09:00
smoogipooo
0970439e34
Fix TaikoBeatmapConverter attempting to convert taiko-specific drum rolls to hits. Fixes #1149
2017-08-21 12:05:56 +09:00
smoogipooo
6a7b410bc3
Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147
2017-08-21 11:58:54 +09:00
Dean Herbert
8364339617
Adjust with proposed formatting
2017-08-20 23:47:07 +09:00
Dean Herbert
325eaa8671
Add mouse buttons defaults for taiko
2017-08-20 22:26:33 +09:00
Dean Herbert
a18b2bd5f0
Hook everything up
2017-08-20 22:21:16 +09:00
Dean Herbert
ec08b2940d
Add taiko default keys
2017-08-20 21:56:37 +09:00
Dean Herbert
59fc6cbed7
Add action support to InputDrum
2017-08-20 21:51:56 +09:00
Dean Herbert
ff84eb219b
Add action support to taiko
2017-08-20 21:38:09 +09:00
MrTheMake
6d401b5f21
Merge branch 'master' into leaderboard-scores
2017-08-19 00:00:40 +02:00
MrTheMake
81289db33b
CI fix, fixed nullref and removed abstraction of GetAutoplayMod
2017-08-13 20:12:01 +02:00
MrTheMake
d9c26f98c7
Suggested changes
2017-08-13 19:54:07 +02:00
MrTheMake
4c2d7bf343
Parse the mods of a leaderboard's score
2017-08-13 17:41:13 +02:00
smoogipooo
bb8c533802
Fix CI issues.
2017-08-09 17:34:09 +09:00
smoogipooo
e9a98358b3
Don't move completed drum rolls above the playfield.
2017-08-09 17:26:59 +09:00
smoogipooo
2334c109e5
Set better TaikoPlayfield default VisibleTimeRange.
2017-08-09 16:46:08 +09:00
smoogipooo
8b4f28318f
Fix drum roll ticks.
2017-08-09 16:19:31 +09:00
smoogipooo
ef29d9c093
Merge remote-tracking branch 'origin/master' into taiko-timingchanges-2
...
# Conflicts:
# osu.Game.Rulesets.Taiko/UI/TaikoRulesetContainer.cs
2017-08-09 16:18:27 +09:00
Dean Herbert
723e27353c
HitRenderer -> RulesetContainer
2017-08-09 13:28:29 +09:00
Dean Herbert
7c0e7ebcd0
Give HitRenderer a reference to Ruleset
...
Used to get correct bindings for a mode (ActionMappingInputManager).
2017-08-09 13:05:52 +09:00
smoogipooo
27e63eb7c4
Fix up sizing issues.
2017-08-09 10:54:00 +09:00
smoogipooo
a95ee7494f
Initial conversion of taiko to use ScrollingPlayfield.
2017-08-08 16:01:18 +09:00
Dean Herbert
fa7ef8ed52
Merge remote-tracking branch 'upstream/master' into taiko-fixes
...
# Conflicts:
# osu.Desktop.Tests/Visual/TestCaseTaikoHitObjects.cs
# osu.Desktop.Tests/Visual/TestCaseTaikoPlayfield.cs
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
2017-08-04 18:04:23 +09:00
Huo Yaoyuan
62b3540fd6
Merge branch 'master' into fixes
2017-08-04 13:49:03 +08:00
Huo Yaoyuan
eb9972581e
Provide Autoplay mod in Ruleset.
2017-08-04 00:25:24 +08:00
smoogipooo
ba31bfcdf1
CI fixes.
2017-08-03 20:44:05 +09:30
