628 Commits

Author	SHA1	Message	Date
ANDY840119-PC\andy840119	3b291abf60	Merge branch 'master' of https://github.com/ppy/osu into mania_stage_fix ... # Conflicts: # osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs # osu.Game/Rulesets/UI/Playfield.cs	2018-01-17 22:27:32 +09:00
smoogipoo	db27faa471	Add a ScrollTime config setting to osu!mania	2018-01-17 21:13:14 +09:00
smoogipoo	d96234bf40	Enforce that there's only one configmanager per ruleset	2018-01-17 21:08:23 +09:00
smoogipoo	9f4ebad6e3	Add mania config manager	2018-01-17 20:21:25 +09:00
smoogipoo	c309cc9454	Privatise OnJudgements as much as possible	2018-01-16 15:37:32 +09:00
Dean Herbert	976f7cec39	Merge branch 'master' into playfield-judgements	2018-01-16 15:26:13 +09:00
TocoToucan	3c11978cfa	Use local functions	2018-01-15 21:42:17 +03:00
smoogipoo	8c5ef0a330	Remove base OnJudgement from Playfield to properly accomodate nested playfields	2018-01-15 20:48:57 +09:00
smoogipoo	39b6425c3e	Use a grid container to position the stages ... Should be more flexible in the future + provides a more dual-stage feel.	2018-01-15 19:55:15 +09:00
smoogipoo	28586317dd	Give stages a size again	2018-01-15 19:44:42 +09:00
smoogipoo	8a7892b66a	Make variant keybindings work	2018-01-15 19:29:51 +09:00
smoogipoo	b9909ed1cf	Refactor addition of hitobjects	2018-01-15 18:20:43 +09:00
smoogipoo	89c3fcbf6a	Refactor column construction	2018-01-15 18:11:53 +09:00
smoogipoo	dd67070b6f	ManiaAction.Special -> ManiaAction.Special1	2018-01-15 17:58:04 +09:00
smoogipoo	351afc350e	Implement co-op keybindings	2018-01-15 17:43:45 +09:00
smoogipoo	0d79d16692	Cleanup testcase	2018-01-15 15:52:07 +09:00
smoogipoo	dbcabfb6ac	Remove ManiaAction.Specia2	2018-01-15 15:50:57 +09:00
smoogipoo	1c74e56bab	Increase the point at which normal keys start in ManiaAction	2018-01-15 15:50:43 +09:00
smoogipoo	d2b1e27527	Cleanup implementation of coop key mod ... This is how I intended the functionality to be implemented.	2018-01-15 15:49:03 +09:00
smoogipoo	9f98983550	Remove gravity mod ... Not sure how this made it back in here.	2018-01-15 15:36:36 +09:00
smoogipoo	bfdfb52666	Fix a few usages of AllJudged possibly not being correct	2018-01-15 15:28:08 +09:00
ANDY840119-PC\andy840119	bbb741245e	fix CI error	2018-01-14 21:51:07 +09:00
ANDY840119-PC\andy840119	999386497a	implement co-op mod	2018-01-14 21:35:35 +09:00
ANDY840119-PC\andy840119	cf0d9e4d9b	not sure is it a goodway to delete mania ManiaAction.Special or add more	2018-01-14 21:20:01 +09:00
ANDY840119-PC\andy840119	2d266a8604	fix : ... 1. Instead of this property, turn SpecialColumnPosition into a 2. special column does not display	2018-01-14 20:44:17 +09:00
ANDY840119-PC\andy840119	5ecfc3a57c	fix CI error	2018-01-14 13:06:37 +09:00
ANDY840119-PC\andy840119	58bf611d17	This should be done in the stage instead of the playfield.	2018-01-14 12:51:55 +09:00
ANDY840119-PC\andy840119	d07636a105	Fix : ... 1. This (along with OnJudgement above) should be done in the following three steps: 2. How about giving the stages an Inverted BindableBool, and having them decide their scale?	2018-01-14 12:49:01 +09:00
ANDY840119-PC\andy840119	f7a908fbfa	Fix : ... This (along with OnJudgement above) should be done in the following three steps: . i'm not sure does it means the code i write	2018-01-14 12:08:09 +09:00
ANDY840119-PC\andy840119	4f0e1f03d2	fix the problem that smoogipoo suggest ... 1. Rename to stages 2. This should be checking for null or 0, with two exceptions: 3. Space before and after =. 4. foreach (var stage ... 5. Rename to getStageByColumn, and actualColumn -> column.	2018-01-14 11:49:23 +09:00
ANDY840119-PC\andy840119	e947e46566	fix : ... 1. Add space before {, before Duration, and after 1000 2. How about just ManiaStage? 3. This is really just Columns.Count, you're not saving much with this extra variable here.	2018-01-14 11:41:52 +09:00
ANDY840119-PC\andy840119	561c9f2233	update rom ppy master ... . Find out that has some problem long hit note will not show hit result	2018-01-14 11:32:54 +09:00
Aergwyn	ae1adfd2f2	remove unnecessary empty lines ... codefactor.io \(o.o)/ also one unnecessary semicolon	2018-01-12 19:30:34 +01:00
Dean Herbert	354d781002	Merge remote-tracking branch 'upstream/master' into fix-mod-implementation-check	2018-01-12 17:49:31 +09:00
smoogipoo	cae93a1d1f	Add comment to fade override of holdnote tail	2018-01-12 17:09:39 +09:00
smoogipoo	03824eccc8	Block fadeout on holdnote heads	2018-01-12 17:09:21 +09:00
Dean Herbert	057efa24c7	Move a few interfaces to base classes	2018-01-12 14:26:09 +09:00
smoogipoo	712d586d41	Revert "Add OSD + config value for scroll speed" ... This reverts commit a6d8b28221.	2018-01-12 12:28:43 +09:00
smoogipoo	9d00e5bb7d	Make ScrollingHitObjectContainer handle nested hitobjects	2018-01-11 15:08:30 +09:00
smoogipoo	a6d8b28221	Add OSD + config value for scroll speed	2018-01-11 13:40:46 +09:00
ANDY840119-PC\andy840119	118e0b63eb	fix CI error	2018-01-11 00:07:27 +09:00
ANDY840119-PC\andy840119	cc0520d722	1. because set stage's width doesn't help, so use margin instead ... 2. adjust spacing when has different number of stages	2018-01-10 23:47:38 +09:00
smoogipoo	6255aaab68	Per-hitobject lifetime management	2018-01-10 19:17:43 +09:00
為什麼	fb857c5e37	Merge branch 'master' into master	2018-01-10 18:48:00 +09:00
smoogipoo	f71d086a41	Fix post-merge issues	2018-01-10 18:08: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
ANDY840119-PC\andy840119	4060583b10	Merge branch 'master' of https://github.com/ppy/osu ... # Conflicts: # osu.Game.Rulesets.Mania/Mods/ManiaModGravity.cs	2018-01-09 22:09:25 +09:00
Dean Herbert	b8bb0a52e3	Move mod implementations to individual files	2018-01-09 14:08:18 +09:00
ANDY840119-PC\andy840119	d5b436d91b	use public List<Column> Columns => listColumnStages.SelectMany(x => x.Columns).ToList(); instead	2018-01-08 23:11:20 +09:00
smoogipoo	2d345b2f80	Fix mania hold note tick positioning	2018-01-07 11:43:31 +09:00
FreezyLemon	47f5b23dcf	fix child size == 0 exception	2018-01-07 00:53:44 +01:00
ANDY840119-PC\andy840119	ca7cd40fba	1. update from ppy master ... 2. update header	2018-01-06 11:21:10 +09:00
為什麼	98929952e3	Merge branch 'master' into master	2018-01-06 11:17:15 +09:00
ANDY840119-PC\andy840119	50aaf571fb	miss	2018-01-06 11:08:49 +09:00
ANDY840119-PC\andy840119	a55ac899a8	fix Empty argument list is redundant	2018-01-06 11:08:04 +09:00
ANDY840119-PC\andy840119	356c7ad528	Merge branch 'mania-rc-cleanup' of https://github.com/smoogipoo/osu into mania_fix ... # Conflicts: # osu-framework	2018-01-05 23:29:33 +09:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
smoogipoo	1276e2c71a	Merge branch 'master' into scrolling-hitobjects-rewrite	2018-01-05 14:58:57 +09:00
Dean Herbert	b2e723d288	Merge branch 'master' into mania-keymods	2018-01-05 13:55:20 +09:00
smoogipoo	ce94c825d1	Fix length of hold notes	2018-01-04 22:05:38 +09:00
smoogipoo	e0e84ff370	Fix mania playfield scrolling hitobjects in the wrong direction	2018-01-04 22:05:20 +09:00
smoogipoo	f569d54958	Local circlesize/od variables	2018-01-04 19:52:29 +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
ANDY840119-PC\andy840119	409664e4dc	White space needs to be trimmed	2018-01-03 23:50:52 +09:00
ANDY840119-PC\andy840119	aadafae8cb	1. fix TestCaseManiaHitObjects broken ... 2. add (4+4) (2+4+2) (1+8+1) column stages step in TestCaseManiaPlayfield	2018-01-03 23:47:05 +09:00
ANDY840119-PC\andy840119	a855a21ccb	group -> stage	2018-01-03 23:04:51 +09:00
ANDY840119-PC\andy840119	5326f71ed9	fix some error that smoogipoo says	2018-01-03 22:58:08 +09:00
ANDY840119-PC\andy840119	ee13df94fc	Merge branch 'mania-rc-cleanup' of https://github.com/smoogipoo/osu ... # Conflicts: # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs	2018-01-03 22:02:50 +09:00
smoogipoo	333e1867ab	Implement osu!mania keymods ... ScoreMultiplier not currently working - that's a more involved change that requires the aforementioned "BeatmapAttributes" changes.	2018-01-03 21:27:32 +09:00
smoogipoo	a4d05e5102	Implement interface on ManiaKeyMod for now	2018-01-03 21:26:36 +09:00
smoogipoo	b68daaeb4b	Group -> Stage	2018-01-03 19:13:42 +09:00
smoogipoo	bd171926d6	Remove AvailableColumns from ManiaRulesetContainer ... Also restructures with the addition of a ManiaBeatmap which holds definitions for "groups" of columns. At the moment these are empty save for a "Column" property, but can be expanded in the future, maybe.	2018-01-03 18:44:25 +09:00
Dean Herbert	c0dd812a4c	Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods	2018-01-02 15:33:08 +09:00
Aergwyn	ccb69d16d9	move HitResult in Scoring namespace to replace HitCount	2017-12-30 21:23:18 +01:00
Dean Herbert	28cd72a12b	Add note about mania xKey mods for future implementation	2017-12-31 04:27:35 +09:00
為什麼	3f318fde2f	Merge branch 'master' into master	2017-12-29 22:48:07 +09:00
Dean Herbert	2ca10b28c6	Use a non-broken opentk library	2017-12-29 15:42:51 +09:00
ANDY840119-PC\andy840119	7b94a710e3	Appveyor Chan, Please	2017-12-28 23:55:06 +09:00
ANDY840119-PC\andy840119	9faa5fb199	pray	2017-12-28 23:40:02 +09:00
ANDY840119-PC\andy840119	a322c15bbd	after resharper : ( ... . 裝上Resharper，從此VS的速度一片黑暗	2017-12-28 23:15:12 +09:00
ANDY840119-PC\andy840119	cfc4c39255	Fixed the alert from AppVeyor. ... maybe.	2017-12-28 22:57:41 +09:00
ANDY840119-PC\andy840119	28da60cc38	https://github.com/ppy/osu/issues/716 ... 1. split the playfield columns by ManiaModKeyCoop 2. can chaneg the key number by ManiaKeyMod	2017-12-28 22:40:23 +09:00
smoogipoo	5b529511ec	Update OpenTK nuget package ... Fixes the recent AppVeyor errors	2017-12-27 13:18:34 +09:00
smoogipoo	d288d8a51f	Remove SampleInfoList	2017-12-25 15:40:01 +09:00
Dean Herbert	e7c85d38a8	Move list initialisation to pattern generation code	2017-12-23 19:17:05 +09:00
Dean Herbert	aeafa5645a	Make Samples null by default and prepopulate in mania	2017-12-23 18:06:46 +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	a3fcc0b60c	Back to using SortedLists	2017-12-21 19:40:41 +09:00
smoogipoo	cb7e192aff	Determine SampleInfo defaults in DrawableHitObject	2017-12-21 16:02:33 +09:00
smoogipoo	c99ea32574	Merge branch 'master' into beatmap-serialization	2017-12-21 13:39:39 +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
smoogipoo	f9e34dfa3d	Assume that control points are already sequentially-ordered ... Fixes up deserializing.	2017-12-06 16:24:09 +09:00
smoogipoo	b584178e85	Make Beatmap ISerializable and add more JsonIgnores	2017-12-06 00:37:37 +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
Dean Herbert	3e01a0dda5	Merge branch 'master' into mania-auto-generation-fixes	2017-11-29 19:11:36 +09:00
smoogipoo	d69fa0966f	Generate ManiaReplayFrame instead of ReplayFrame	2017-11-29 18:42:54 +09:00
smoogipoo	dfd035d07b	Merge remote-tracking branch 'origin/master' into mania-auto-generation-fixes	2017-11-29 18:42:17 +09:00
Dean Herbert	93d7cd5a6d	Merge branch 'master' into performance-calculator	2017-11-29 18:37:07 +09:00
Dan Balasescu	7cbca37e2d	Remove redundant cast	2017-11-29 18:18:36 +09:00
smoogipoo	6fd550dc91	Simplify/sanitize construction of ManiaReplayFrame	2017-11-29 15:47:10 +09:00
smoogipoo	1136db1556	Fix mania replays not defining important frames ... Resolves https://github.com/ppy/osu/issues/1495 .	2017-11-29 14:20:15 +09: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
smoogipoo	00f9f97850	Fix compile errors (rider didn't warn me about these)	2017-11-28 19:13:10 +09:00
smoogipoo	375f2710d4	Rename file	2017-11-28 19:09:17 +09:00
smoogipoo	cc9e06e161	Remove unused elements	2017-11-28 19:07:10 +09:00
smoogipoo	eaf2b1d94d	Remove line that shouldn't have been added yet	2017-11-28 19:06:46 +09:00
smoogipoo	567e378bbb	CI fixes	2017-11-28 19:02:39 +09:00
smoogipoo	f8c296877b	Add testcase for mania beatmap conversion (currently ignored)	2017-11-28 18:59:20 +09:00
smoogipoo	b97cab4f29	Make ManiaFramedReplayInputHandler properly account for special keys ... These are interleaved into the playfield, so we have to use the playfield's columns' actions.	2017-11-28 15:27:20 +09:00
smoogipoo	84702211ec	Rewrite mania auto generator to properly account for overlapping objects	2017-11-28 15:17:02 +09:00
smoogipoo	2c53be7853	Fix possible invalid cast when generating mania patterns	2017-11-27 18:39:13 +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	f9ad4b6acb	Make categoryDifficulties return doubles to improve decimal accuracy	2017-11-21 19:55:09 +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	18f2e92a48	Rework mod applications to hitobject/rulesetcontainer for DifficultyCalculator	2017-11-17 12:36:13 +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	15f69dff81	Make mania hit explosions not stick around when rewinding ... Fixes #1461.	2017-11-04 00:57:17 +09:00
smoogipoo	fe00ac7e41	Make DrawableHitObject/ScoreProcessor support rewinding	2017-11-02 21:21:07 +09:00
Dean Herbert	bbc5c05055	Disable ruleset-level tests for now	2017-10-23 21:25:54 +09: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
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	b306eaca6e	Move mania tests to correct namespace	2017-10-10 16:50:46 +09: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
Tom	a42fb4af2a	Add icon for random mod	2017-09-14 12:04:05 +02:00
smoogipooo	ae3e118584	Dummy commit to test CI	2017-09-14 09:32:10 +09:00
Tom	886ad7496d	Implement random mod for osu!mania	2017-09-13 17:35:05 +02: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