Dean Herbert
cea6be5e52
Expose as JudgementResult instead of "passing" state
2020-05-03 23:55:44 +09:00
Dean Herbert
ff1d63060d
Add and consume passing state in GameplayBeatmap
2020-05-01 20:08:18 +09:00
Dean Herbert
3033ab80ce
Add passing/failing test
2020-05-01 19:49:30 +09:00
Dean Herbert
6ff31fb786
Fix sizing when gameplay scale is adjusted
2020-05-01 19:49:23 +09:00
Dean Herbert
510df8b282
Improve tiling logic
2020-05-01 19:49:01 +09:00
Dean Herbert
afcb45f28b
Move to playfield
2020-05-01 19:48:31 +09:00
Dean Herbert
8955b98cbb
Add basic taiko scroller implementation
2020-05-01 17:56:09 +09:00
Bartłomiej Dach
d021e213b2
Reword comment
2020-05-01 00:29:03 +02:00
Bartłomiej Dach
1e7b10320f
Adjust mascot positioning in playfield layout
2020-05-01 00:19:12 +02:00
Bartłomiej Dach
f5526890cc
Add comment about animation presence
2020-04-30 22:51:22 +02:00
Bartłomiej Dach
db4c8b2ba5
Fix transition out of clear state
2020-04-30 22:16:25 +02:00
Bartłomiej Dach
5cfc05e12a
Ensure correct initial state
2020-04-30 22:03:39 +02:00
Bartłomiej Dach
22fde8d2a0
Implement partial clear transition logic
2020-04-30 21:58:05 +02:00
Dan Balasescu
68efdd145d
Merge pull request #8909 from peppy/fix-legacy-explosion-rewind
...
Fix skinned taiko hit explosions not being removed on rewind
2020-04-30 21:00:41 +09:00
Dean Herbert
d0a8c0fa71
Add kiai support to osu!taiko skinned playfields
2020-04-30 16:43:00 +09:00
Dean Herbert
48af4d4eb4
Fix skinned taiko hit explosions not being removed on rewind
2020-04-30 16:18:15 +09:00
Dean Herbert
49a98fde73
Move to non-legacy class
2020-04-30 09:57:14 +09:00
Dean Herbert
783dc58ef0
Move taiko additive blending locally to avoid applying to legacy skins
2020-04-30 09:41:56 +09:00
Bartłomiej Dach
b0e97793b6
Implement transitions into and from clear state
2020-04-30 00:14:27 +02:00
Bartłomiej Dach
0d917ca339
Ensure correct behaviour for clear animation
2020-04-29 21:52:09 +02:00
Bartłomiej Dach
9d6720e7e6
Scope up parameter
2020-04-29 21:30:13 +02:00
Bartłomiej Dach
e81d33dcec
Refactor mascot animations to split logic paths
2020-04-29 21:27:02 +02:00
Bartłomiej Dach
6e2ed0c4f3
Refactor mascot to only contain state transitions
2020-04-29 20:28:46 +02:00
Dean Herbert
48733a7e2f
Change taiko hit explosion animation to match stable for skins
2020-04-29 17:53:37 +09:00
Bartłomiej Dach
5f0a4103c2
Merge branch 'master' into taiko-don
2020-04-28 23:46:42 +02:00
Dan Balasescu
79e1b16119
Merge branch 'master' into taiko-explosion-skinning
2020-04-28 12:17:09 +09:00
Dean Herbert
84641765c5
Adjust exceptions and fix capitalisation
2020-04-28 11:08:19 +09:00
Craftplacer
6de6f068fd
Merge branch 'taiko-don' of https://github.com/Craftplacer/osu into taiko-don
2020-04-27 23:19:22 +02:00
Craftplacer
74d36cad78
Change state variables
2020-04-27 23:19:18 +02:00
Craftplacer
96660b2cca
Flip frame count check
2020-04-27 23:18:40 +02:00
Craftplacer
834eeb6d98
Reduce duplicate texture retrieval code
2020-04-27 23:18:26 +02:00
Craftplacer
9b3c1e4126
Remove unused bindables
2020-04-27 23:17:52 +02:00
Craftplacer
5caa4dedc2
Update osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
...
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-04-27 22:27:03 +02:00
Craftplacer
c049302650
Update osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
...
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-04-27 22:23:04 +02:00
Dean Herbert
be59ee945a
Add taiko hit explosion skinning support
2020-04-27 22:36:27 +09:00
Craftplacer
e8a0b77729
Merge remote-tracking branch 'upstream/master' into taiko-don
2020-04-27 12:43:51 +02:00
Dean Herbert
ca055581af
Fix taiko hit target alpha on legacy skins
2020-04-27 18:18:11 +09:00
Dean Herbert
52cf1e1859
Fix hit type not being provided and hit time offset not being considered
2020-04-27 16:48:27 +09:00
Dean Herbert
b9f28c8373
Combine hit types and remove old drumroll hits using a more efficient method
2020-04-27 16:13:28 +09:00
Dean Herbert
ff736a22dd
Fix typos in comment
2020-04-27 14:41:19 +09:00
Dean Herbert
1cd4fd2ac4
Merge branch 'master' into taiko-drumroll-party
2020-04-27 13:27:10 +09:00
smoogipoo
20ae973e4a
Use max result instead of GOOD
2020-04-27 12:29:11 +09:00
smoogipoo
2630fc1405
Break instead of return for consistency
2020-04-27 12:27:43 +09:00
smoogipoo
7dc090cc24
Add support for hit explosions
2020-04-27 12:23:53 +09:00
smoogipoo
dd36b839b9
Refactor
2020-04-27 12:01:31 +09:00
Craftplacer
e830c7d833
Merge remote-tracking branch 'upstream/master' into taiko-don
2020-04-27 02:13:09 +02:00
Craftplacer
d46643ec52
Rework special case for strong hits
2020-04-27 02:10:12 +02:00
Craftplacer
dc6acf6ec9
Various code changes, fixes
2020-04-27 01:40:57 +02:00
Dean Herbert
4ca7ce7715
Merge branch 'master' into taiko-barline-skinning
2020-04-25 18:58:44 +09:00
Tim Oliver
c1c930c472
Fixed linting warnings
2020-04-25 13:47:20 +08:00
Tim Oliver
2a197db481
Merge branch 'master' into taiko-drumroll-party
...
# Conflicts:
# osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
2020-04-25 13:31:50 +08:00
Tim Oliver
3cc0b21eae
Added more smart checking to removing rewound drumroll hits
2020-04-25 13:18:02 +08:00
Craftplacer
364f5bf788
Update osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
...
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-04-24 22:57:23 +02:00
Tim Oliver
477fe72fcf
Changed note playback to happen on new result
2020-04-25 00:15:59 +08:00
Tim Oliver
2be3a8184d
Removed modifications to drum roll object
2020-04-25 00:15:37 +08:00
Dan Balasescu
b3175f9dfa
Merge branch 'master' into taiko-playfield-background-skinning
2020-04-24 19:27:38 +09:00
Dean Herbert
05b3db0147
Remove masking
2020-04-24 16:56:18 +09:00
Craftplacer
8ae119ab62
Fix last formatting error
2020-04-24 08:05:57 +02:00
Craftplacer
84aa37d7c3
Fix all local tests
2020-04-24 07:57:16 +02:00
Craftplacer
ac44185f09
Fix formatting
2020-04-24 07:09:20 +02:00
Craftplacer
dbf39be607
Decide on the name "Mascot", add testing, bug fixed, etc.
2020-04-24 06:59:05 +02:00
Craftplacer
6de08db653
Add removed skin component back
2020-04-24 02:50:47 +02:00
Craftplacer
bbe831698c
Remove unused code
2020-04-24 02:50:33 +02:00
Craftplacer
608596c3b3
Rename DefaultTaikoDonTextureAnimation to TaikoDonTextureAnimation
2020-04-24 02:50:10 +02:00
Tim Oliver
029d15f2a2
Fixed syntax warning for playfield children
2020-04-23 20:14:39 +08:00
Tim Oliver
1fa3764a1d
Cleaned up Update method in Taiko Playfield
2020-04-23 18:26:53 +08:00
Tim Oliver
c059588a09
Removed un-needed unproxy method
2020-04-23 18:26:40 +08:00
Tim Oliver
dded4f8176
Fixed syntax warnings in Taiko playfield
2020-04-23 18:17:31 +08:00
Tim Oliver
f1ae8af581
Removed un-needed using directives
2020-04-23 18:16:05 +08:00
Tim Oliver
a9897ba627
Moved proxy behaviour to drumroll container
2020-04-23 18:15:12 +08:00
Tim Oliver
b471a240cc
Fixed merge typo in playfield members
2020-04-23 16:59:56 +08:00
Dean Herbert
12f156dcec
Add taiko barline skinning support
2020-04-23 14:32:48 +09:00
Dean Herbert
b4e1ad81d0
Fix alignment of right half of legacy input drum
2020-04-23 13:48:08 +09:00
Dean Herbert
f804be25d1
Remove incorrect area sizing (now using fillmode / relative instead)
2020-04-23 13:39:44 +09:00
Dean Herbert
559487b205
Move playfield background implementation to its own file
2020-04-23 13:23:49 +09:00
Dean Herbert
4032d66959
Apply same legacy scale adjust logic to TaikoLegacyHitTarget
2020-04-23 13:17:46 +09:00
Dean Herbert
61d2580e1c
Fix gap to left of InputDrum on legacy skins
2020-04-23 13:07:38 +09:00
Dean Herbert
2e022fbcb5
Add comment about padding update computation
2020-04-23 12:49:53 +09:00
Dean Herbert
49568a3d56
Adjust input drum to work with new playfield changes
2020-04-23 12:49:53 +09:00
Dean Herbert
37f7e0a734
Restructure TaikoPlayfield for better skin support
2020-04-23 12:49:53 +09:00
Dean Herbert
58bf288595
Remove DrawableHit's custom sizing logic
...
Turns out this was unnecessary and never actually being used.
2020-04-23 12:17:52 +09:00
Dean Herbert
ca56e6c0d2
Rename taiko HitTarget classes to avoid conflict with mania
2020-04-23 12:11:30 +09:00
Tim Oliver
81c51f0661
Merge branch 'master' into taiko-drumroll-party
...
# Conflicts:
# osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
# osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
2020-04-22 23:15:48 +08:00
Tim Oliver
2600518b1b
Moved drumroll container and removed rewound notes
2020-04-22 22:50:00 +08:00
Tim Oliver
26779a57b4
Exposed public ability to unproxy content
2020-04-22 22:49:30 +08:00
Craftplacer
8446fa98b5
Merge remote-tracking branch 'upstream/master' into taiko-don
2020-04-22 15:21:54 +02:00
Craftplacer
617d27ace9
Restart branch
2020-04-22 15:19:29 +02:00
Tim Oliver
44405d4771
Moved result to load complete for flying hits
2020-04-22 15:50:23 +08:00
smoogipoo
ba12e23d9e
Fix inspection
2020-04-22 09:06:04 +09:00
smoogipoo
d8fdd73e17
Implement IHasCurve on DrumRoll
2020-04-22 09:06:04 +09:00
Dean Herbert
bfc17bf4c0
Add taiko hit target skinning
2020-04-21 19:06:43 +09:00
Tim Oliver
5b4f69bb8c
Moved flying hit objects to separate files
2020-04-20 13:32:51 +08:00
Dean Herbert
58a1c6e171
Reapply taiko visibility hack at a higher level
2020-04-17 19:52:58 +09:00
Dean Herbert
f36477e39d
Add back "filled" property setting
2020-04-16 10:04:09 +09:00
Dean Herbert
bfc0d41c0c
Add tick skinning support
2020-04-15 19:24:50 +09:00
Dean Herbert
07632cd1e5
Remove unnecessary container logic
2020-04-15 18:44:12 +09:00
Dean Herbert
3137417994
Add drumroll skinning
2020-04-15 18:03:23 +09:00
Dean Herbert
45d88b70f8
Split out base logic from LegacyHit into LegacyCirclePiece
2020-04-15 18:03:23 +09:00
Dean Herbert
eb165840cb
Add remaining taiko hitobject skinnables and expose as SkinnableDrawable for safety
2020-04-15 18:03:23 +09:00
Andrei Zavatski
f4b5a17b65
Fix typo in DrawableTaikoHitObject
2020-04-15 07:00:38 +03:00
Dean Herbert
c3f0475748
Make CirclePiece abstract
2020-04-12 17:40:22 +09:00
Tim Oliver
412ac6121f
Merge branch 'master' into taiko-drumroll-party
2020-04-12 15:36:07 +08:00
Tim Oliver
162a85042a
Removed un-needed using
2020-04-12 10:38:22 +08:00
Tim Oliver
3ad36c7b84
Moved flying objects to use ignore hit judgements
2020-04-11 17:20:52 +08:00
Tim Oliver
1c0ad13d82
Added ignore hit object
2020-04-11 17:20:37 +08:00
Dean Herbert
3d5a622db7
Tidy up comments
2020-04-11 15:04:58 +09:00
Dean Herbert
63ebb7f80c
Add support for taikobigcircle and fix exception on missing layers
2020-04-11 15:02:50 +09:00
Dean Herbert
96bf86099c
Fix scaling of strong hits
2020-04-11 14:43:57 +09:00
Dean Herbert
dc56be0a1d
Add support for skinned hits
2020-04-11 14:23:13 +09:00
Dean Herbert
009b138364
Prepare for skinnable versions
2020-04-11 14:19:59 +09:00
Dean Herbert
78db83fd0e
Remove TaikoPiece class and localise kiai for now
2020-04-11 14:19:59 +09:00
Dean Herbert
7fba291134
Change inheritance of taiko hit pieces to better allow for skinning
2020-04-11 13:33:49 +09:00
Dean Herbert
d786a2c5b3
Add alignment support for skin versions older than 2.1
2020-04-08 19:42:31 +09:00
Dean Herbert
40267cb1fe
Add test sprites and make alignment initially better
2020-04-08 19:42:31 +09:00
Tim Oliver
c30ea2ec29
Added content proxying to drull roll elements
2020-04-08 12:46:02 +08:00
Tim Oliver
b883586add
Added logic to allow strong notes
2020-04-08 12:46:02 +08:00
Tim Oliver
7751c5e3aa
Added separate scrolling track to display drum roll notes
2020-04-08 12:46:02 +08:00
Tim Oliver
9d5a977501
Added judgement forwarder to drumroll tick object
2020-04-08 12:46:02 +08:00
Tim Oliver
1057981c79
Added arbitrary hit handler to drum roll object
2020-04-08 12:46:02 +08:00
Tim Oliver
6e12f1b69b
Added “instant fly” variant of hit notes
2020-04-08 12:46:02 +08:00
Dean Herbert
53c99d137a
Merge branch 'master' into mania-config-lookup-refactor
2020-04-03 22:22:59 +09:00
Dean Herbert
d896d5a231
Rename filename to match class
2020-04-03 18:51:34 +09:00
Dean Herbert
0a7d9b930c
Add osu!taiko legacy drum skinning support
2020-04-03 18:23:03 +09:00
smoogipoo
1f797207f7
Rework lookups to not require total playfield columns
2020-04-03 12:31:05 +09:00
Dean Herbert
8a2aac5f83
Rename conversion methods for clarity
2020-03-25 20:21:34 +09:00
Dean Herbert
800e395bc8
Merge branch 'master' into replay-recording
2020-03-25 20:20:59 +09:00
Dean Herbert
388cf5c83a
Fix catch positional data being incorrectly recorded
2020-03-24 15:38:54 +09:00
Dean Herbert
96a849f897
Add remaining replay recorders
2020-03-24 14:55:49 +09:00
Dean Herbert
022465f546
Add encoding and import support
2020-03-24 14:51:52 +09:00
Dean Herbert
546772192c
Add helper method to convert to legacy mods enums
2020-03-24 13:07:51 +09:00
smoogipoo
e3a5be71cc
Implement random mod for taiko
2020-03-23 12:09:30 +09:00
smoogipoo
5106d275ca
Remove CentreHit/RimHit hitobject abstraction
2020-03-23 12:08:15 +09:00
Dean Herbert
5b8aaba4a6
Merge branch 'master' into fix-perfect-judgements
2020-03-06 00:18:05 +09:00
smoogipoo
bb4193d985
Fix taiko infinity health drain on some beatmaps
2020-03-02 13:25:04 +09:00
smoogipoo
da89798765
Merge remote-tracking branch 'origin/master' into layout-rework
2020-02-26 15:06:40 +09:00
smoogipoo
6c28fd21c7
osu-side changes
2020-02-24 20:52:15 +09:00
Dean Herbert
0e29d3c4a2
Correctly expire bar lines in osu!taiko and osu!mania
2020-02-23 13:50:05 +09:00
Dean Herbert
ffc7eaa3f2
Fix hitobjects with unknown lifetimes by enforcing non-null judgement
...
We've seen multiple cases where DrawableHitObject are stuck in the lifetime management container
due to not implementing a judgement (meaning they are never "hit" or "missed"). To avoid this going forward
CreateJudgement() must be implemented and return a non-null judgement.
This fixes BananaShower and JuiceStreams in osu!catch.
This also makes HitObject abstract and cleans up convert HitObject implementations.
2020-02-23 13:49:06 +09:00
Dean Herbert
cd6902a312
Make EndTime and RepeatCount settable
2020-02-05 17:52:51 +09:00
smoogipoo
7b2f58eb30
Apply OnRelease method signature refactorings
2020-01-22 13:22:34 +09:00
smoogipoo
91735ff367
Update MathUtils namespace usages
2020-01-09 13:43:44 +09:00
Albie Spriddell
3a903339d6
add playingverb and database migrations
2020-01-03 11:39:15 +00:00
smoogipoo
9c49da8942
Remove unnecessary extra "wait" frame
2020-01-03 16:24:39 +09:00
smoogipoo
97b4c65554
Fix taiko replay frames being mis-ordered
2020-01-03 16:24:29 +09:00
smoogipoo
cba6d9f7e6
Fix taiko samples not being loaded
2020-01-02 15:58:11 +09:00
smoogipoo
0f8a76afde
Remove manual hitobject sample namespacing
2020-01-02 14:27:27 +09:00
Dean Herbert
b330aec03e
Drain starting at the first hitobject, not gameplay start
2019-12-27 16:16:30 +09:00
Dean Herbert
cac011edc1
Merge branch 'master' into hp-drain
2019-12-26 23:51:12 +09:00
smoogipoo
d45556eb6a
Remove whitespace
2019-12-26 17:57:16 +09:00
smoogipoo
429272b864
Clean up + document taiko health processor
2019-12-26 15:28:30 +09:00
smoogipoo
e0c1072ab2
Add xmldocs
2019-12-26 15:01:19 +09:00
smoogipoo
eba6371526
Re-implement taiko's accumulating health processor
2019-12-26 15:01:19 +09:00
smoogipoo
522847987b
Implement break/gameplay start times
2019-12-26 15:00:58 +09:00
smoogipoo
90cb9d9162
Simplify scoreprocesor/healthprocessor implementations
2019-12-26 14:59:49 +09:00
smoogipoo
7414a6aadd
Merge remote-tracking branch 'huoyaoyuan/master' into health-processor
...
# Conflicts:
# osu.Game.Rulesets.Catch/CatchRuleset.cs
# osu.Game.Rulesets.Mania/ManiaRuleset.cs
# osu.Game.Rulesets.Taiko/TaikoRuleset.cs
2019-12-26 14:56:54 +09:00
Dan Balasescu
9702cc9809
Merge branch 'master' into remove-legacy-id
2019-12-25 21:01:12 +09:00
Dean Herbert
504a55e803
Merge branch 'master' into better-beatmap-conversion
2019-12-25 19:52:06 +09:00
Dean Herbert
0677f746aa
Provide the ruleset to converter classes
2019-12-24 16:02:16 +09:00
Dean Herbert
a324bfbc2c
Remove LegacyID from Ruleset
2019-12-24 13:48:27 +09:00
smoogipoo
6e7426a098
Simplify/improve beatmap conversion precheck
2019-12-23 17:44:18 +09:00
unknown
00ef2bd8d3
remove unused usings
2019-12-22 16:57:07 +08:00
unknown
fe73b9f8d3
make HP and OD generic and instantiate CS and AR to modes that need it
2019-12-22 16:45:32 +08:00
unknown
08b477ed52
make ModDifficultyAdjust abstract
2019-12-20 18:30:23 +08:00
smoogipoo
76f2fb378f
Separate score and health parts of ScoreProcessor
2019-12-19 20:03:14 +09:00
Dean Herbert
ea661fce21
Merge branch 'master' into adjustable-map-settings
2019-12-18 18:44:11 +09:00
Dean Herbert
51a01c7006
Merge pull request #7256 from peppy/remove-ruleset-ctor-param
...
Remove RulesetInfo parameter from Ruleset constructor
2019-12-18 18:42:42 +09:00
smoogipoo
2a128340d0
Merge remote-tracking branch 'refs/remotes/origin/master' into nightcore-beats
2019-12-18 17:58:37 +09:00
Dean Herbert
6e0802e50c
Remove RulesetInfo parameter from Ruleset constructor
2019-12-18 14:49:09 +09:00
Dean Herbert
e0ce87adca
Move CreateScoreProcessor() to Ruleset ( #7244 )
...
Move CreateScoreProcessor() to Ruleset
2019-12-17 22:15:42 +09:00
Dan Balasescu
fd2785bab3
Merge branch 'master' into fxcop
2019-12-17 20:14:45 +09:00
smoogipoo
49bf8d27d1
Move CreateScoreProcessor() to Ruleset
2019-12-17 20:08:13 +09:00
Huo Yaoyuan
40b43b85f1
CA1715: use prefix for generic parameters.
2019-12-17 13:00:25 +08:00
Huo Yaoyuan
ecfc6dfa3d
CA1825: use Array.Empty.
2019-12-17 12:59:48 +08:00
Dean Herbert
b5db927d93
Merge branch 'master' into cinema-mod
2019-12-17 12:56:06 +09:00
unknown
01c036b0b0
implement backing beats for nightcore mods
2019-12-15 16:56:02 +08:00
Huo Yaoyuan
ddb2cfc46d
Use GetEndTime in Taiko and Mania
2019-12-14 18:16:13 +08:00
unknown
002a125b4a
make ModDifficultyAdjust generic
2019-12-12 21:14:26 +08:00
Dean Herbert
37a94988a3
Merge branch 'improve-hud-hiding' into cinema-mod
2019-12-12 16:12:19 +09:00
smoogipoo
5861eca80d
Make DrawableRuleset take a converted beatmap
2019-12-12 15:58:11 +09:00
unknown
b0cf44c3be
fix appveyor issues
2019-12-11 20:12:29 +08:00
unknown
be3634cce1
remove ApproachRate setting
2019-12-11 20:02:23 +08:00
unknown
b795532aa5
add difficulty adjustment mods
2019-12-11 19:43:16 +08:00
smoogipoo
48f1dad4aa
Remove abstract ScoreProcessor class
2019-12-11 17:25:06 +09:00
Albie
a61f8cc2c3
Merge branch 'master' into cinema-mod
2019-12-10 17:06:53 +00:00
Huo Yaoyuan
6a58509f41
Fix format.
2019-12-03 20:59:42 +08:00
Huo Yaoyuan
9ddfdab27a
Remove meaningless Convert calls.
2019-12-03 20:47:00 +08:00
Albie
7864899249
Merge branch 'master' into cinema-mod
2019-11-28 16:42:01 +00:00
Dan Balasescu
c6a85a11bd
Merge branch 'master' into sharpen
2019-11-27 17:09:11 +09:00
Huo Yaoyuan
9425e80a5d
Unify to use double in performance calculators.
2019-11-26 18:34:23 +08:00
Albie Spriddell
3b9f59cb33
add cinema mod support
2019-11-23 17:34:53 +00:00
Albie Spriddell
20edaf4ba6
add cinema mod support
2019-11-23 17:32:16 +00:00
Huo Yaoyuan
818553027b
Merge branch 'master' into sharpen
2019-11-21 23:42:46 +08: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
608785b99a
Update .Net Standard projects to 2.1
2019-11-18 18:35:58 +08:00
Huo Yaoyuan
e5e8e70704
Use pattern matching.
2019-11-12 19:55:19 +08:00
Huo Yaoyuan
bbeab6fa76
Use auto property.
2019-11-12 19:53:25 +08:00
Dean Herbert
b37bf4ea01
Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition
2019-11-12 10:44:53 +09:00
smoogipoo
6fc1be64c2
Make hitobject samples a bindable list
2019-11-08 14:04:57 +09:00
Huo Yaoyuan
bcf8e3a9d4
Remove redundant properties from desktop projects.
...
While OutputType=Library maybe doubtful, PlatformTarget=AnyCPU should be clearly the default.
2019-10-30 22:56:33 +08:00
Huo Yaoyuan
31595159be
Normalize .props
2019-10-30 21:54:14 +08:00
Dean Herbert
e987db37ec
Add grouping of ControlPoints
2019-10-25 19:52:02 +09:00
smoogipoo
f429a8f7c2
Add back/obsolete old AddNested() method
2019-10-17 14:02:08 +09:00
smoogipoo
d8f3678c3c
Rename parameter
2019-10-17 12:53:54 +09:00
smoogipoo
d49ef6a36b
Make taiko use the new nested hitobject structure
2019-10-17 11:57:00 +09:00
Dean Herbert
51bf600ea7
Use empty hitwindows instead of null
2019-10-09 19:08:31 +09:00
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
