1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-30 09:22:54 +08:00
Commit Graph

1692 Commits

Author SHA1 Message Date
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
smoogipooo
351d255355 Fix brokenness due to relative sizes. 2017-08-03 20:12:31 +09:30
smoogipooo
0a4464bbe8 Merge remote-tracking branch 'origin/master' into taiko-fixes
# Conflicts:
#	osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/SwellSymbolPiece.cs
2017-08-03 20:02:19 +09:30
smoogipooo
74e9449a75 Make symbol pieces relative sized. 2017-08-03 15:57:45 +09:30
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
smoogipooo
dc0d0a3602 CI. 2017-08-03 14:31:20 +09:30
smoogipooo
c2475f6721 Fix gravity. 2017-08-03 14:18:54 +09:30
smoogipooo
e55a406e4d Fix DrawableTaikoHitObject + drawable hit objects. 2017-08-03 13:54:13 +09:30
smoogipooo
786bad3d71 Simplify + fix up circle pieces. 2017-08-03 13:53:12 +09:30
smoogipooo
b2d69dfa02 Fix HitExplosion. 2017-08-03 13:36:49 +09:30
smoogipooo
14639ff8e3 Fix HitTarget. 2017-08-03 13:36:36 +09:30
smoogipooo
d796730e36 Fix KiaiHitExplosion. 2017-08-03 13:36:15 +09:30
smoogipooo
22ffc78757 Rework consts in TaikoHitObject to be relative size values. 2017-08-03 13:36:04 +09:30
smoogipooo
324fd456a7 Rework border + fillmodes + size in TaikoPlayfield. 2017-08-03 13:35:07 +09:30
smoogipooo
358b7c9d3d Better InputDrum sizing + positioning. 2017-08-03 09:35:42 +09:30
smoogipooo
5352da277d Remove ScaleFixContainer. 2017-08-03 08:16:19 +09:30
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Dean Herbert
64f2e2dc32 Use Colour instead of ColourInfo 2017-07-23 13:06:16 +02:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller
a7dc8a892b Update framework 2017-07-21 17:24:09 +02:00
Thomas Müller
440878945e Remove remaining usages of AddDelay 2017-07-17 18:16:15 +03:00
Thomas Müller
19fb03e737 Try different formatting style 2017-07-16 18:28:20 +03:00
Thomas Müller
032e9df67b ApplyDelay -> AddDelay 2017-07-16 17:47:29 +03:00
Thomas Müller
99221260c4 Replace several usages of BeginDelayedSequence with LINQ-style 2017-07-16 17:42:01 +03:00
Thomas Müller
71105bb9ee Delay -> ApplyDelay; DelayReset -> ResetDelay 2017-07-16 14:06:46 +03:00
Thomas Müller
a5e610a7ba Update framework and fix compilation
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
Thomas Müller
9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
paparony03
62dee59672 Shapes namespace
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
Dean Herbert
41d4aee4f5 Update nuget packages
- [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820
2017-06-13 11:50:46 +09:00
smoogipooo
ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00
John Neijzen
2f7d9655fd More Clean up 2017-06-08 15:27:35 +08:00
John Neijzen
431d225a60 Keyword Spacing and Brackets Fixing 2017-06-08 14:35:10 +08:00
Shawdooow
ecc0d0b11c Daycore mod 2017-05-30 12:49:06 -04:00
Dean Herbert
391134b1d3 Adjust glow a bit 2017-05-24 17:16:02 +09:00
smoogipooo
7afa1766e1 Make HitExplosion circular again, keep it masked to the stage. 2017-05-24 15:48:47 +09:00
smoogipooo
56fe97a147 Make kiai hit explosions slightly more prominent. 2017-05-24 15:48:27 +09:00
smoogipooo
c29f4b2ee8 Fix weird glow + add small pre-beat transition. 2017-05-24 15:40:34 +09:00
smoogipooo
445b469e47 Use ligher hue instead of white. 2017-05-24 15:22:46 +09:00
smoogipooo
4224143136 Add faint kiai explosion on the hit marker. 2017-05-24 14:56:07 +09:00
smoogipooo
c25f995506 Merge remote-tracking branch 'origin/master' into taiko-visual-update 2017-05-24 14:21:16 +09:00
smoogipooo
9255297075 Cleanup. 2017-05-23 17:59:45 +09:00
smoogipooo
ae94e6ea85 Redesign hit explosions. 2017-05-23 17:57:34 +09:00
smoogipooo
25a48d832f Make kiai time hit object pulse on bar line beats. 2017-05-23 17:36:43 +09:00
smoogipooo
4c66157a07 Merge branch 'beat-sync-container-improvements' into taiko-visual-update 2017-05-23 16:51:45 +09:00
smoogipooo
a4823bca91 CI fixes. 2017-05-23 16:47:47 +09:00
smoogipooo
61348ff08d Restructure playfield so that various elements are masked. 2017-05-23 16:42:17 +09:00
smoogipooo
836bf930a0 More cleanups. 2017-05-23 15:29:38 +09:00
smoogipooo
002a0e99a2 Use SortedList + BinarySearch to find control points at time values. 2017-05-23 15:20:32 +09:00
smoogipooo
3cdfd2eef5 Split ControlPoint into different types.
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
smoogipooo
6cef3021c7 Adjust sizing to better fit glows within the playfield. 2017-05-22 19:50:01 +09:00
smoogipooo
67cf64062a Add flag to determine whether the beatmap requested for conversion is for the current ruleset. 2017-05-19 16:02:40 +09:00
Dean Herbert
efab186384 Update namespaces in line with framework 2017-05-16 12:50:30 +09:00
smoogipooo
6cc54773e8 Fix taiko right background not scaling with the playfield as intended. 2017-05-11 17:18:22 +09:00
Huo Yaoyuan
e466380ee2 Generic infer for IJsonSerializable.DeepClone. 2017-05-08 19:33:37 +08:00
Huo Yaoyuan
4f8549f220 Standardise usages of exceptions. 2017-05-07 00:38:17 +08:00
smoogipooo
4d27e0abb6 Oops i didn't save the solution. 2017-05-03 11:25:54 +09:00
smoogipooo
60c2e2a90a Fix taiko auto replay generation not working. 2017-05-03 11:22:09 +09:00
Thomas Tan
9b8b88601f Create "AutoGenerator" base class and interface. 2017-04-29 02:08:48 +08:00
Dean Herbert
94c259bd59 Remove most usages of DelayReset
ButtonSystem requires some more work.
2017-04-27 18:39:40 +09:00
Dean Herbert
4087b638cf Merge branch 'master' into taiko-fixes 2017-04-26 19:27:05 +09:00
Dean Herbert
49c02f5ad6 Merge branch 'master' into fix-drumroll-conversion 2017-04-26 19:16:40 +09:00
smoogipooo
47cd91fa63 CI fixes. 2017-04-26 17:04:57 +09:00
smoogipooo
8df3c3f736 Adjust Swell hit speed. 2017-04-26 16:28:53 +09:00
smoogipooo
d9dec9d444 Implement Taiko difficulty calculation. 2017-04-26 15:50:08 +09:00
smoogipooo
28f7e0cdba Introduce SampleInfoList as List<SampleInfo> to reduce generic nesting. Fix CI warnings. 2017-04-26 14:12:21 +09:00
smoogipooo
ac5f70b765 Fix drum roll conversion not generating strong hits. 2017-04-26 13:48:31 +09:00
smoogipooo
324d5c1093 Merge remote-tracking branch 'origin/master' into fix-drumroll-conversion 2017-04-26 13:17:28 +09:00
smoogipooo
f750325aa1 Bring up to date. 2017-04-21 20:10:14 +09:00
smoogipooo
29fe0b471c Fix drum rolls not taking into account nodal samples when converting from drum rolls to hit circles. 2017-04-21 18:52:08 +09:00
Dean Herbert
2d53ad4c0a
Remove xmldoc-only using usage. 2017-04-21 14:01:58 +09:00
smoogipooo
61090d918c Temporary for taiko lagging on auto replays due to inImportantSection.
Note that this isn't a full "as intended" fix, because the full fix is quite big. I'll be saving it for a separate branch/pull-req.
2017-04-20 15:26:42 +09:00
smoogipooo
ef56058ad2 Drum roll ticks shouldn't be able to result in miss judgements. 2017-04-20 15:09:49 +09:00
smoogipooo
a958c99e22 Make ticks smaller (as per flyte's suggestion). 2017-04-20 13:12:43 +09:00
smoogipooo
8facf473d1 Fix drum rolls not being correctly converted to hitcircles. 2017-04-20 13:05:57 +09:00
Dean Herbert
cef6a014d5
Add a simulated key-up delay to auto replays.
Fixes key counter display looking odd.
2017-04-18 22:31:52 +09:00
Dan Balasescu
d4e75ecec4 Rename to use -index. 2017-04-18 17:37:01 +09:00
Dean Herbert
4895a482b4 That's a lot of white spaces 2017-04-18 17:26:59 +09:00
smoogipooo
579698f0a9 Merge remote-tracking branch 'origin/master' into taiko-fixes
# Conflicts:
#	osu.Game.Rulesets.Taiko/UI/TaikoHitRenderer.cs
2017-04-18 17:12:23 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00