439 Commits

Author	SHA1	Message	Date
smoogipoo	6e1d651087	Merge remote-tracking branch 'origin/master' into convert-object-hitwindows	2018-05-14 11:17:39 +09:00
smoogipoo	faa82f17cc	Pass original hitobject HitWindows during conversion	2018-05-11 15:30:50 +09:00
smoogipoo	7eb64ab590	Remove object counts from mania/taiko/catch	2018-05-07 15:51:08 +09:00
smoogipoo	accffda532	Add taiko statistics	2018-05-07 15:51:08 +09:00
smoogipoo	4ecdea8b2e	Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer	2018-05-07 10:17:54 +09:00
smoogipoo	03a5df84c6	Initial rework of beatmap conversion process	2018-04-19 22:04:12 +09:00
smoogipoo	66b3b295e7	Use IBeatmap wherever possible	2018-04-19 20:44:38 +09:00
tgi74000	9b36cf2066	Review changes	2018-04-16 14:14:40 +02:00
tgi74000	b23b0a445b	Add support for replay mods	2018-04-13 15:41:35 +02:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Dean Herbert	acbdbcc3df	Update AssemblyInfo in line with framework changes	2018-04-06 13:17:26 +09:00
Dan Balasescu	824201336a	Merge branch 'master' into hr-on-mania-is-unranked	2018-03-30 16:35:00 +09:00
Joseph Madamba	0887dafa2c	Revert changes on hard rock mod	2018-03-29 20:36:52 -07:00
smoogipoo	187a025d36	Make hitobjects sorted by their start times	2018-03-29 16:07:31 +09:00
Dean Herbert	9aae568bbe	Tidy up csproj further	2018-03-28 15:19:56 +09:00
Dean Herbert	9667d54ecb	Add missing licence headers	2018-03-28 14:48:08 +09:00
Dean Herbert	0026b94cd3	Consolidate and move ruleset test projects	2018-03-28 14:41:25 +09:00
Dean Herbert	1a8aa87469	Make everything better	2018-03-27 18:56:54 +09:00
Dean Herbert	b290d2d039	Move NUnit includes to individual projects	2018-03-27 15:07:09 +09:00
smoogipoo	dd5bbbbd9f	Define testable projects	2018-03-26 19:11:23 +09:00
smoogipoo	5159127bce	Fix SQLite failing to initialize on test projects	2018-03-26 18:07:09 +09:00
smoogipoo	35ef9d99c6	Only compile with net461 in visual studio	2018-03-26 15:44:55 +09:00
smoogipoo	96901b6498	Add msbuild/dotnet build + launch targets	2018-03-26 10:52:54 +09:00
smoogipoo	31920f1866	Fix ruleset resources not getting included in build	2018-03-25 02:12:01 +09:00
smoogipoo	d28de89e50	Add net461 target to test projects for nunit discovery ... Nunit "by design" will not run tests for NETStandard projects (see: https://github.com/nunit/dotnet-test-nunit/issues/122#issuecomment-329531632).	2018-03-25 01:35:50 +09:00
smoogipoo	c29f7a4333	Merge remote-tracking branch 'origin/master' into netstandard	2018-03-24 14:49:46 +09:00
Dean Herbert	cb3d0db555	Move combo colours completely out of HitObjects	2018-03-20 15:50:12 +09:00
smoogipoo	20acc601bb	Fix up breaking taiko changes	2018-03-16 16:10:09 +09:00
Dean Herbert	7e7f8ed7a2	Merge branch 'master' into drawable-composite-hit-object	2018-03-16 15:53:16 +09:00
Dean Herbert	a42035f494	Make DrawableHitObject a CompositeDrawable ... No reason for it to be a container.	2018-03-15 13:41:06 +09:00
Joseph Madamba	d122aa80e4	Edit mods description, multiplier, and code	2018-03-13 20:07:03 -07:00
Dean Herbert	b62ed004f2	Remove judgements when deciding a new judgement for a HitObject ... Generally happens when rewinding.	2018-03-07 19:14:42 +09:00
Dean Herbert	e82cadc811	Make LegacyID nullable ... The -1 default was getting stored to the database.	2018-03-06 17:40:14 +09:00
Dean Herbert	7b18e8a5ca	Merge branch 'master' into fix-taiko-conversion	2018-03-06 01:16:47 +09:00
smoogipoo	2a9fb2c2c6	Make NestedHitObjects lazily-constructed	2018-03-05 21:40:26 +09:00
smoogipoo	df84b23847	Fix possible nullref when there are 0 drumroll ticks	2018-03-05 21:19:40 +09:00
smoogipoo	7ce3e60722	Fix drumrolls giving GOOD judgements too one tick too late	2018-03-05 21:19:36 +09:00
smoogipoo	c013f83267	Restore IgnoreAttribute	2018-03-05 17:01:27 +09:00
smoogipoo	88c33e31e8	Add slider conversion testcases	2018-03-05 16:01:45 +09:00
smoogipoo	63155f169e	Fix incorrect taiko slider conversions due to beatlength adjustments ... Fixes ppy/osu#2152 .	2018-03-05 15:12:15 +09:00
Dean Herbert	0e928429d4	Merge branch 'master' into ruleset-replayframes	2018-03-04 01:57:43 +09:00
smoogipoo	a2c239d5e3	Rename to IBeatmapConverter, move to separate file	2018-03-02 20:19:47 +09:00
smoogipoo	71755f5363	Prettyfy some JSON	2018-03-02 20:12:29 +09:00
smoogipoo	820a852caf	Remove unnecessary .osu properties	2018-03-02 18:37:38 +09:00
smoogipoo	cdca7371a3	Replace testcases with a basic test suite	2018-03-02 18:20:33 +09:00
smoogipoo	1f21ccffb0	Add lenience to start times	2018-03-02 18:20:12 +09:00
Dan Balasescu	4aff659272	Merge branch 'master' into beatmap-conversion-testcases	2018-03-02 16:04:32 +09:00
smoogipoo	3d5fefae8c	Add TestFixtureAttribute to all tests	2018-03-02 15:34:31 +09:00
smoogipoo	6fff6da751	Ignore broken testcases	2018-03-02 14:01:34 +09:00
smoogipoo	573d6d1b5f	Allow multiple mappings to be generated for a single hitobject	2018-03-02 13:13:01 +09:00
smoogipoo	4e363664fd	Add beatmap parameter to beatmapconverter creation	2018-03-02 13:13:01 +09:00
smoogipoo	b2827d82d4	Add a taiko beatmap conversion test case	2018-03-02 13:13:01 +09:00
smoogipoo	195b6642e6	Reimplement important frames	2018-03-01 02:28:15 +09:00
smoogipoo	cf42d5bbd5	Remove mostly-unused Score parameter	2018-03-01 02:28:14 +09:00
smoogipoo	c9c65cab53	CreateReplayFrame -> CreateConvertibleReplayFrame	2018-03-01 02:28:14 +09:00
smoogipoo	222ae70062	Populate rulesets with their replay frames	2018-03-01 02:28:14 +09:00
smoogipoo	a3c7755ade	Implement a conversion process for ReplayFrames	2018-03-01 02:28:14 +09:00
Dean Herbert	b9f8ed3123	Merge branch 'master' into taiko_legacy_rep	2018-02-26 13:27:37 +09:00
Dean Herbert	4a52df2dd4	Apply review	2018-02-24 23:07:02 +09:00
Dean Herbert	768e0a4e2a	Add SkinnableSound class ... Tidy things up, move logic out of SampleInfo.	2018-02-24 22:47:14 +09:00
smoogipoo	bea9bf9dd4	Merge remote-tracking branch 'origin/master' into taiko_legacy_rep	2018-02-23 14:40:32 +09:00
smoogipoo	3fdb6845da	Revert unneeded change ... This was already correct as per osu-stable.	2018-02-23 14:40:25 +09:00
Dean Herbert	6ceabfe19e	Add basic hitsound skinning	2018-02-23 13:38:12 +09:00
tgi74000	426343f136	Fix legacy Taiko replays having reversed inputs	2018-02-21 15:05:51 +01:00
smoogipoo	5faec5c2f1	Add a separate property to control playfield area	2018-02-21 20:54:33 +09:00
smoogipoo	cd2c9a9de6	Adjust xmldoc and rename to GetAspectAdjustedSize	2018-02-19 17:04:18 +09:00
Dan Balasescu	9f7736fab3	Merge branch 'master' into restore-ruleset-tests	2018-02-14 22:48:29 +09:00
smoogipoo	b500b76407	Merge branch 'master' into update-branch	2018-02-08 23:35:48 +09:00
smoogipoo	46284c61ae	Return HitResult.None instead of null	2018-02-08 14:25:59 +09:00
smoogipoo	3d167c40ae	Remove now unneeded Math.Abs call	2018-02-08 14:15:58 +09:00
smoogipoo	beaecbafbd	Merge branch 'master' into unified-hitwindows	2018-02-08 13:22:44 +09:00
smoogipoo	ccc948a0b9	Update framework (testing)	2018-02-08 12:45:51 +09:00
Dean Herbert	dfc344b47a	Update OpenTK version	2018-02-06 13:47:54 +09:00
Dean Herbert	6b35ef7063	Update OpenTK version	2018-02-05 16:13:30 +09:00
smoogipoo	9225e883c1	Add + use HalfHitWindow	2018-02-02 20:29:50 +09:00
smoogipoo	9bc4bf33a6	Use HitWindows for taiko	2018-02-02 18:53:30 +09:00
Dean Herbert	1cc7c23982	Hits -> JudgedHits	2018-02-01 18:08:15 +09:00
Dean Herbert	888d2362fd	Merge branch 'master' into fix-taiko-fastforwarding	2018-01-31 18:30:15 +09:00
FreezyLemon	8f0ab2040f	Add Jetbrains.Annotations NuGet package	2018-01-26 12:46:28 +01:00
smoogipoo	92df704fbd	Fix up taiko not having any important frames	2018-01-25 21:37:38 +09:00
smoogipoo	d37844c068	Clean up off-by-one offsets from repeat-related properties	2018-01-23 13:37:25 +09:00
smoogipoo	c309cc9454	Privatise OnJudgements as much as possible	2018-01-16 15:37:32 +09:00
smoogipoo	8c5ef0a330	Remove base OnJudgement from Playfield to properly accomodate nested playfields	2018-01-15 20:48:57 +09:00
smoogipoo	bfdfb52666	Fix a few usages of AllJudged possibly not being correct	2018-01-15 15:28:08 +09:00
smoogipoo	9d00e5bb7d	Make ScrollingHitObjectContainer handle nested hitobjects	2018-01-11 15:08:30 +09:00
smoogipoo	3a869edf36	Add a flag to disable user scroll speed adjustments	2018-01-11 12:44:39 +09:00
smoogipoo	6255aaab68	Per-hitobject lifetime management	2018-01-10 19:17:43 +09:00
smoogipoo	86b5591583	Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite	2018-01-10 18:02:49 +09:00
Dean Herbert	58626e3b30	Allow rulesets to create their own instantiation info	2018-01-10 17:04:07 +09:00
Dean Herbert	b8bb0a52e3	Move mod implementations to individual files	2018-01-09 14:08:18 +09:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
smoogipoo	36e9232472	Merge master into netstandard	2018-01-05 00:42:48 +09:00
smoogipoo	add68ff068	Fix swells not stopping at the hit position	2018-01-04 21:45:29 +09:00
smoogipoo	4fee76ba0b	Fix drumroll lengths	2018-01-04 20:56:28 +09:00
smoogipoo	a7aab21a29	Re-namespace files	2018-01-04 19:22:15 +09:00
smoogipoo	651e24e3cc	Implement proper scrolling directions	2018-01-04 19:17:40 +09:00
smoogipoo	f34131f8f4	Initial game-wide replacement of scrolling playfields	2018-01-04 18:50:17 +09:00
Aergwyn	ccb69d16d9	move HitResult in Scoring namespace to replace HitCount	2017-12-30 21:23:18 +01:00
Dean Herbert	2ca10b28c6	Use a non-broken opentk library	2017-12-29 15:42:51 +09:00
Dean Herbert	02f4705178	Merge branch 'master' into proper-taiko-hitsounds	2017-12-27 23:13:30 +09:00
Dean Herbert	3f73a9a693	Add better sample fallback logic ... Also adds support for null channels at InputDrum level.	2017-12-27 21:44:04 +09:00
smoogipoo	7a793eaded	Merge master into netstandard	2017-12-27 20:48:53 +09:00
smoogipoo	de353ee6af	Merge branch 'master' into proper-taiko-hitsounds	2017-12-27 14:59:26 +09:00
Dean Herbert	7dcd325a91	Merge branch 'master' into autoplay-drumroll-tick-fix	2017-12-27 14:19:25 +09:00
smoogipoo	5b529511ec	Update OpenTK nuget package ... Fixes the recent AppVeyor errors	2017-12-27 13:18:34 +09:00
smoogipoo	9fa0cfd250	Fix taiko autoplay hitting drumroll ticks with the rims instead of centres ... Fixes #1772.	2017-12-27 13:06:36 +09:00
smoogipoo	519ef72adf	Lookup by control point time rather than control point ... Under some situations, such as when there are no control points, ControlPointInfo will return to us a newly-constructed controlpoint with every call to SamplePointAt, which will fail on this key lookup. Between this and overriding GetHashCode, I think this is the more proper fix for this.	2017-12-27 13:03:46 +09:00
smoogipoo	0c4e4012f8	Taiko drumroll ticks should just play the playfield samples	2017-12-26 19:57:40 +09:00
smoogipoo	9690591593	Make taiko use namespaced hitsounds ... This is a temporary solution for now that uses DrawableHitObject.SampleNamespace for the override. We will not want to do this going forward, and instead have the rulesets add their custom resource stores to the games', but that requires deciding where/when to apply/remove such resource stores, and is probably left to skinning.	2017-12-26 19:55:56 +09:00
smoogipoo	c74561b3d4	Add test case for InputDrum	2017-12-26 19:33:28 +09:00
smoogipoo	35d7fa8a81	Cleanup things that are now not needed with these changes	2017-12-26 14:18:38 +09:00
smoogipoo	14162b5d46	Make InputDrum handle all Normals/Claps, hitobjects all others	2017-12-26 14:18:23 +09:00
smoogipoo	affdd81563	Remove unused usings	2017-12-25 17:29:44 +09:00
smoogipoo	ac8b345bfe	Make TaikoPlayfield use the new DrumSampleMapping	2017-12-25 17:29:20 +09:00
smoogipoo	8bfdee586b	Rename SwellSampleMapping -> DrumSampleMapping	2017-12-25 17:29:04 +09:00
smoogipoo	d288d8a51f	Remove SampleInfoList	2017-12-25 15:40:01 +09:00
smoogipoo	844e39a9f6	Make Swells play samples while they're being hit	2017-12-25 15:04:22 +09:00
smoogipoo	8529eb1d3a	Make strong hit misses not count as misses	2017-12-25 14:49:39 +09:00
Dean Herbert	298ac5468f	Fix regressions	2017-12-23 17:24:28 +09:00
Dean Herbert	cd8e8c8323	Actually save changes	2017-12-23 16:52:23 +09:00
Dean Herbert	a30400ad29	Use a class instead of Tuple	2017-12-23 16:49:29 +09:00
Dean Herbert	9ca03c0209	Simplify and tidy sample retrieval ... Less static weirdness	2017-12-23 16:46:02 +09:00
Dean Herbert	5026c7a95e	SoundControlPoint -> SampleControlPoint	2017-12-23 16:34:34 +09:00
Dean Herbert	46865bbacd	Merge remote-tracking branch 'upstream/master' into taiko-hitsounds-fix ... # Conflicts: # osu.Game/Audio/SampleInfo.cs	2017-12-23 14:50:35 +09:00
Dean Herbert	1fa9dac1bb	Merge remote-tracking branch 'origin/master' into taiko-hitsounds-fix	2017-12-23 14:20:16 +09:00
smoogipoo	6a29f6020a	Make HitObjects construct nested hit objects	2017-12-22 21:42:54 +09:00
smoogipoo	ac1d27e925	Fix possible nullref exceptions	2017-12-21 23:02:46 +09:00
smoogipoo	d80079a73a	Merge remote-tracking branch 'origin/master' into beatmap-serialization	2017-12-21 20:15:01 +09:00
smoogipoo	cb7e192aff	Determine SampleInfo defaults in DrawableHitObject	2017-12-21 16:02:33 +09:00
Dean Herbert	020d272636	Make all TestCases public	2017-12-20 21:51:00 +09:00
Dean Herbert	08727266e7	Merge branch 'master' into add-ruleset-shortname	2017-12-11 15:41:11 +09:00
FreezyLemon	4a723f7382	Added the "Service Include" tag that is used by Visual Studio's test explorer to the .csproj files	2017-12-08 11:05:00 +01:00
Dean Herbert	679134c030	Add ShortName to rulesets	2017-12-08 18:55:25 +09:00
FreezyLemon	4b3cf0773d	Various CI adjustments	2017-12-08 09:52:58 +01:00
FreezyLemon	9d3d9bcdc8	Corrected the return values for taiko DrawableHit and DrawableHitStrong (OnPressed == true if new Judgement occurs and is a hit)	2017-12-08 09:42:10 +01:00
FreezyLemon	61a6a2919e	Fixed multiple critical bugs and changed allSamples to a normal Dictionary for faster access	2017-12-08 09:41:13 +01:00
FreezyLemon	40e750f309	Added sample preloading and playing	2017-12-08 08:32:16 +01:00
FreezyLemon	9e3d439f0a	Merge branch 'master' of https://github.com/ppy/osu into taiko-hitsounds-fix	2017-12-08 08:30:02 +01:00
FreezyLemon	229c9b5b4e	First basic implementation of IKeyBindingHandler for the playfield so it can handle taiko hitsounds	2017-12-07 23:11:34 +01:00
FreezyLemon	43c270ea49	Rolled back the bad earlier implementation	2017-12-07 21:18:51 +01:00
smoogipoo	a30270658d	Merge remote-tracking branch 'origin/master' into netstandard	2017-12-01 18:50:28 +09:00
smoogipoo	36be171c29	Fix up/clean up csprojs for C#7 support	2017-11-30 02:06:03 +09:00
smoogipoo	a0c3349935	Add LangVer.props and osu.Game.props for common csproj properties	2017-11-30 00:45:37 +09:00
smoogipoo	267bb75458	Merge remote-tracking branch 'Aergwyn/master' into netstandard	2017-11-29 23:45:29 +09:00
FreezyLemon	e3232dd754	Added if to ignore more (for our purposes) useless keydowns	2017-11-29 06:51:00 +01:00
FreezyLemon	c00fb47236	Added hitsound handling to the TaikoRulesetContainer so every KeyDown can play a hitsound (instead of the DrawableHitObjects)	2017-11-29 06:28:08 +01:00
FreezyLemon	3e8db8c5e1	Enabled strong taiko hitobjects playing samples again. ... Also removes the first hitsound from the strong hitobject so only the "hitfinish" sound gets played.	2017-11-29 06:27:25 +01:00
FreezyLemon	bc3f11fdb8	Added PlaysSamples property to prevent certain DrawableHitObjects from playing their samples on hit. Also added this to TaikoObjects so their hitsounds won't be played (will be done by the TaikoRulesetContainer)	2017-11-29 06:24:13 +01:00
smoogipoo	7db7fb91dd	Ignore ruleset testcases from CI	2017-11-28 21:45:24 +09:00
smoogipoo	a9cc156d7a	Merge remote-tracking branch 'origin/master' into performance-calculator	2017-11-28 21:38:26 +09:00