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
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
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
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
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
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
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
dded4f8176
Fixed syntax warnings in Taiko playfield
2020-04-23 18:17:31 +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
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
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
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
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
Dean Herbert
bfc17bf4c0
Add taiko hit target skinning
2020-04-21 19:06:43 +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
Dean Herbert
0a7d9b930c
Add osu!taiko legacy drum skinning support
2020-04-03 18:23:03 +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
smoogipoo
5106d275ca
Remove CentreHit/RimHit hitobject abstraction
2020-03-23 12:08:15 +09:00
smoogipoo
7b2f58eb30
Apply OnRelease method signature refactorings
2020-01-22 13:22:34 +09:00
smoogipoo
49bf8d27d1
Move CreateScoreProcessor() to Ruleset
2019-12-17 20:08:13 +09:00
smoogipoo
5861eca80d
Make DrawableRuleset take a converted beatmap
2019-12-12 15:58:11 +09:00
smoogipoo
48f1dad4aa
Remove abstract ScoreProcessor class
2019-12-11 17:25:06 +09: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
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
Dean Herbert
af3bb5a2cd
Centralise and share bar line generation code between rulesets
2019-09-10 13:30:54 +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
70e417533f
Update naming
2019-08-30 15:13:29 +09:00
smoogipoo
6ab2b20c70
Add an interface for working beatmaps
2019-08-29 19:38:44 +09:00
smoogipoo
7cc92e2fad
Make taiko proxy containers use LifetimeManagementContainer
2019-08-28 13:20:28 +09:00
Dean Herbert
48716f8f2b
Update framework
2019-08-21 13:29:50 +09: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
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
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
42eaabe24c
Fix editor blueprints being misplaced
...
Regressed with PlayfieldAdjustmentContainer changes.
2019-03-31 01:29:37 +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
ed3746e166
Make PlayfieldAdjustmentContainer universal
2019-03-26 13:32:44 +09:00
Dean Herbert
9bf48863b0
Fix DrawableRuleset drawable creation method's name
2019-03-25 00:00:29 +09:00
Dean Herbert
7b6d882ce6
Remove double-generic type
2019-03-20 11:29:16 +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
David Zhao
527b77b07d
Make all inheritors of drawablejudgement use new method
2019-03-12 19:52:44 +09:00
smoogipoo
bca347427f
Update with framework bindable changes
2019-02-21 18:56:34 +09:00
Dean Herbert
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09:00
smoogipoo
2ee181daf7
Re-namespace replay-related classes
2018-11-28 17:20:37 +09:00
smoogipoo
f27bd3ef3e
OpenTK -> osuTK
2018-11-20 17:14:59 +09: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
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
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
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
Kyle Chang
88b0c234cc
Move judgement text to internal container
2018-09-30 04:01:33 -04: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
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
732dfde8ed
DrawableStrongHandler -> DrawableNestedStrongHit
2018-08-14 14:28:40 +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
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
a0887a600f
Fix swells showing hit circles on intermediate judgements
2018-08-02 21:08:06 +09:00
smoogipoo
9c2122c0ca
Make Rulesets.Taiko use the new judgement result structure
2018-08-02 20:36:19 +09:00
smoogipoo
1139f0dbf2
Centralise method of disabling playfield judgements
2018-07-20 17:04:33 +09:00
Dan Balasescu
64cde1ebad
Merge branch 'master' into use-switch-over-if
2018-07-17 16:44:57 +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
d7133f059d
Fix incorrect implementation
2018-06-25 16:53:12 +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
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
smoogipoo
22dfe46572
Make taiko hitobject properly unproxy when rewound
2018-06-11 21:46:45 +09:00
smoogipoo
8f3215f5a0
Make sure taiko hitexplosions expire and get removed
2018-06-11 20:42:04 +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
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
smoogipoo
187a025d36
Make hitobjects sorted by their start times
2018-03-29 16:07:31 +09: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
smoogipoo
a3c7755ade
Implement a conversion process for ReplayFrames
2018-03-01 02:28:14 +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
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
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
3a869edf36
Add a flag to disable user scroll speed adjustments
2018-01-11 12:44:39 +09:00
smoogipoo
86b5591583
Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite
2018-01-10 18:02:49 +09:00
Dean Herbert
37d393bca0
Update licence headers
2018-01-05 20:21:19 +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
3f73a9a693
Add better sample fallback logic
...
Also adds support for null channels at InputDrum level.
2017-12-27 21:44:04 +09:00
smoogipoo
35d7fa8a81
Cleanup things that are now not needed with these changes
2017-12-26 14:18:38 +09:00