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
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
