494 Commits

Author	SHA1	Message	Date
Unknown	8ddff673b7	revert previous rename and rename ruleset specific classes instead	2019-01-25 11:14:37 +01:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Dean Herbert	271dcded3c	Merge branch 'master' into scoredatabase	2018-11-30 14:59:58 +09:00
Dean Herbert	5254b07680	Merge remote-tracking branch 'upstream/master' into inter-column-movements	2018-11-30 11:57:53 +09:00
Dean Herbert	d1c976880c	Fix incorrect margin/spacing handling	2018-11-29 14:15:28 +09:00
Dean Herbert	8fd04cb47b	Fix mania placement blueprints appearing outside valid stage placement area	2018-11-29 13:20:37 +09:00
smoogipoo	2ee181daf7	Re-namespace replay-related classes	2018-11-28 17:20:37 +09:00
Dean Herbert	4cfeb1b9a1	Merge branch 'master' into note-placement	2018-11-26 14:35:31 +09:00
Dean Herbert	c944e8bb29	Merge branch 'master' into fix-deletion-crash	2018-11-26 14:20:02 +09:00
smoogipoo	c0fcbc283e	Merge branch 'note-placement' into inter-column-movements ... # Conflicts: # osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs	2018-11-26 11:47:22 +09:00
smoogipoo	56032a4522	Merge branch 'mania-selection-movement' into inter-column-movements ... # Conflicts: # osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs # osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs	2018-11-26 11:45:48 +09:00
smoogipoo	91aa00b0e9	Add helper method to get column by position	2018-11-26 10:54:54 +09:00
smoogipoo	4ba3fa4ab6	osuTK	2018-11-26 10:44:48 +09:00
Dean Herbert	1da2006dea	Merge branch 'master' into note-placement	2018-11-22 19:44:39 +09:00
smoogipoo	dc8cd51e15	Implement mania note deletion	2018-11-20 17:26:00 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
smoogipoo	595e2ffbff	Unbind event when column changes	2018-11-19 16:20:21 +09:00
smoogipoo	f7fc2ca569	Basic inter-column selection movement	2018-11-15 21:37:22 +09:00
smoogipoo	25101ecd2c	Snap placement blueprint to columns	2018-11-13 14:13:29 +09:00
smoogipoo	3a1fee59fb	Implement note placement	2018-11-12 18:24:18 +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	9fde7f7f44	Move scrolling info to osu.Game	2018-11-12 17:34:35 +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
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	540a010fbb	Implement an intermediary EditRulesetContainer	2018-10-03 15:36:24 +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
Dean Herbert	68a79f895a	Fix mania throwing an exception on start of map	2018-08-30 14:58:00 +09:00
Dean Herbert	270dc2d1be	Merge branch 'master' into judgement-rework	2018-08-14 13:16:16 +09:00
smoogipoo	f719b9bef5	Fix mania scroll direction not being read from database	2018-08-07 12:20:24 +09:00
Dan Balasescu	c1517e1521	Merge branch 'master' into judgement-rework	2018-08-06 12:30:46 +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	807794d512	Make Rulesets.Mania use the new judgement result structure	2018-08-02 20:36:54 +09:00
Dean Herbert	aead4be134	Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container	2018-07-23 06:36:10 +02:00
smoogipoo	1139f0dbf2	Centralise method of disabling playfield judgements	2018-07-20 17:04:33 +09:00
smoogipoo	b7721edc80	Remove more unnecessary changes	2018-07-19 18:25:28 +09:00
smoogipoo	54e288f09b	Correctly give note masks a scrolling info	2018-07-17 16:55:50 +09:00
smoogipoo	6437fdd9db	Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs	2018-07-17 16:46:48 +09:00
smoogipoo	827c5c4939	Remove scroll direction from ScrolingPlayfield constructor	2018-07-17 15:14:03 +09:00
smoogipoo	577ff4cc7f	Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs # osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs # osu.Game.Rulesets.Mania/UI/ManiaStage.cs	2018-07-17 13:13:57 +09:00
Dean Herbert	24054246b8	Fix DI regression	2018-07-11 17:54:01 +09:00
Dean Herbert	fbc5250bf1	Update framework	2018-07-11 17:12:01 +09:00
smoogipoo	f007e71c87	Retrieve the mania key action through DI	2018-07-02 12:31:41 +09:00
Dean Herbert	a397827841	Reduce line length	2018-06-25 19:28:38 +09:00
Dean Herbert	57011ff13b	Merge branch 'master' into mania-playfield-inversions	2018-06-15 18:33:40 +09:00
Dean Herbert	30f7837b03	Merge branch 'master' into fix-taiko-hitexplosions	2018-06-15 17:52:53 +09:00
Dean Herbert	ae136e89a4	Merge branch 'master' into ruleset-configs	2018-06-12 13:13:18 +09:00
smoogipoo	7651819fb0	Add same change to mania's hit explosions	2018-06-12 12:53:53 +09:00
Dan Balasescu	9994c69d58	Merge branch 'master' into fix-object-ordering	2018-06-11 17:53:33 +09:00
smoogipoo	3bad319dd2	Fix filename	2018-06-11 16:19:57 +09:00
smoogipoo	10d1dfa7cd	A bit of cleanup	2018-06-11 16:10:27 +09:00
smoogipoo	162237dc46	Fix bar lines being offset	2018-06-11 15:43:15 +09:00
smoogipoo	f49b7d6e16	Add mania direction to settings	2018-06-11 14:36:19 +09:00
smoogipoo	93696fb5e5	Merge branch 'ruleset-configs' into mania-playfield-inversions ... # Conflicts: # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs	2018-06-11 13:46:39 +09:00
smoogipoo	baaf431b9e	Make IScrollingInfo and store direction as bindable	2018-06-11 13:42:13 +09:00
smoogipoo	ca5103615d	DI the scrolling info rather than pass by ctor	2018-06-11 13:42:13 +09:00
smoogipoo	eca016ec6c	Move ruleset config managers to Ruleset	2018-06-11 13:17:08 +09:00
smoogipoo	7deaffdb62	Fix hit explosions not following the scroll direction	2018-06-08 15:24:19 +09:00
smoogipoo	80a577f182	Fix notes not scrolling correctly	2018-06-08 15:16:45 +09:00
smoogipoo	ee64760406	Add mania stage test case	2018-06-08 14:28:27 +09:00
smoogipoo	32037701bf	Make the column hitobject area follow the scroll direction	2018-06-07 21:40:12 +09:00
smoogipoo	0c35908802	Reorder fields	2018-06-07 21:19:31 +09:00
smoogipoo	207cdbdefe	Make the column key area follow the scroll direction	2018-06-07 21:13:57 +09:00
smoogipoo	11f067d7d6	Fix background input	2018-06-07 21:13:29 +09:00
smoogipoo	d49758d149	Make background handle its own lit state	2018-06-07 20:59:04 +09:00
smoogipoo	4af8baefc1	Make the column background follow the scroll direction	2018-06-07 20:49:31 +09:00
smoogipoo	9b10cc4e0c	Remove invertability of ManiaStage	2018-06-07 19:53:47 +09:00
smoogipoo	55475d129f	Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs	2018-06-07 19:19:20 +09:00
smoogipoo	485026da6f	Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs	2018-06-07 15:32:31 +09:00
Dan Balasescu	8d0161c2fc	Refactoring	2018-06-07 15:11:48 +09:00
Dean Herbert	f9449e841a	Improve overall visual clarity and explosion effects	2018-06-07 14:30:27 +09:00
Dean Herbert	81a3a8a1a4	Add corner radius	2018-06-07 11:57:30 +09:00
Dean Herbert	3567823759	Reverse order of exposed objects in HitObjectContainer ... Closes #2740.	2018-06-06 15:03:47 +09:00
smoogipoo	31cbec99a1	Fix mania hold notes displaying judgements	2018-05-28 18:12:49 +09:00
AlFasGD	8aac1f50ee	Remove more dependencies	2018-05-22 09:12:22 +03:00
AlFasGD	61a18b952f	Remove useless things	2018-05-21 23:24:10 +03:00
AlFasGD	d504a44dfb	Implement mask layering (incomplete)	2018-05-21 23:08:04 +03: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	bb7618eb0c	FIx mania playfield playing the wrong/duplicated sounds ... Fixes #2266.	2018-03-29 16:13:31 +09:00
smoogipoo	187a025d36	Make hitobjects sorted by their start times	2018-03-29 16:07:31 +09:00
Dean Herbert	eb643b690a	Merge branch 'master' into more-skinning	2018-03-12 11:55:50 +09:00
Dean Herbert	fe3ab94afb	Fix mania judgement regression	2018-03-07 19:19:56 +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
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	5742e61e68	Merge remote-tracking branch 'origin/master' into ruleset-configs	2018-01-26 15:39:09 +09:00
Dean Herbert	03154dbc63	Fix incorrect initial migration ... Also adds variant to settings	2018-01-25 23:41:03 +09:00
smoogipoo	45e8a2b69b	Remove ManiaPlayfield local scrollTime bindable ... Now not needed due to having this databased.	2018-01-25 20:49:25 +09:00
smoogipoo	b77f08941c	Make mania play the next note's sounds if no note is hit ... Fixes #1911. This follows what osu!stable does, which is rather unfortunate, since it just plays _every_ sound for the note :|.	2018-01-24 20:05:37 +09:00
Dean Herbert	5a00ae36d1	Add database-based configuration for rulesets	2018-01-24 17:45:28 +09:00
Dean Herbert	1fda45fe10	Fix broken formatting	2018-01-23 16:40:18 +09:00
Dean Herbert	c01f67b0d8	Merge remote-tracking branch 'upstream/master' into ruleset-configs	2018-01-23 16:23:25 +09:00
smoogipoo	68a6323168	Remove SpecialColumnPosition for now ... This needs to be re-implemented in the future, perhaps in a way that allows it to be dynamically changed.	2018-01-22 16:19:05 +09:00
smoogipoo	8a8b3f25e7	SpecialColumn -> SpecialColumnPosition	2018-01-22 16:12:45 +09:00
smoogipoo	351be4308f	Oops, forgot to commit OnJudgement change	2018-01-22 16:12:35 +09:00
smoogipoo	90d8ee8d36	Fix stage background being too transparent ... This is the original colour for the background. Not sure why this was changed.	2018-01-22 16:12:15 +09:00
smoogipoo	583aa9922f	IKeyBindingMod -> IPlayfieldTypeMod	2018-01-22 15:07:14 +09:00
smoogipoo	2674859b54	ManiaKeyBindingVariantType -> PlayfieldType	2018-01-22 14:59:17 +09:00
smoogipoo	286b1bb81f	Solo -> Single, Coop -> Dual	2018-01-22 14:57:25 +09:00
smoogipoo	293023d99a	Fix keybinding offsets due to special keys	2018-01-22 14:38:41 +09:00
smoogipoo	dee298c395	No more statics + better unregistration	2018-01-18 17:40:05 +09:00
smoogipoo	7910b47868	Move ConfigManager registration/dependency injection to RulesetContainer	2018-01-18 17:00:23 +09:00
ANDY840119-PC\andy840119	6c67f96fdb	fix ci error	2018-01-18 02:01:01 +09:00
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	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	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
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
smoogipoo	712d586d41	Revert "Add OSD + config value for scroll speed" ... This reverts commit a6d8b28221.	2018-01-12 12:28:43 +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	86b5591583	Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite	2018-01-10 18:02:49 +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
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
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
smoogipoo	e0e84ff370	Fix mania playfield scrolling hitobjects in the wrong direction	2018-01-04 22:05:20 +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	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	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
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	a3fcc0b60c	Back to using SortedLists	2017-12-21 19:40:41 +09:00
smoogipoo	f9e34dfa3d	Assume that control points are already sequentially-ordered ... Fixes up deserializing.	2017-12-06 16:24:09 +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	15f69dff81	Make mania hit explosions not stick around when rewinding ... Fixes #1461.	2017-11-04 00:57:17 +09:00
Dean Herbert	5d5ea5fb2e	Fix all remaining db structure issues	2017-10-19 14:05:11 +09:00
TocoToucan	887aa7496b	Rework EF Core usage in model classes	2017-10-06 00:23:26 +03:00
TocoToucan	6a4198d0d6	Initial EF Core commit	2017-10-04 22:52:12 +03:00
Dean Herbert	6d3d485565	And then everything became one	2017-09-19 16:06:58 +09:00
smoogipooo	093d82ac45	Set depths from playfield add methods instead of DrawableHitObject	2017-09-13 16:17:01 +09:00
Dan Balasescu	ee8ec31c6e	Merge branch 'master' into judgement-revamp	2017-09-12 18:57:37 +09:00
Dean Herbert	86de4fa2e2	Apply CI fixes	2017-09-12 18:36:19 +09:00
Dean Herbert	b21c080121	Make mania readable again	2017-09-12 18:22:02 +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	a22dd80b23	Expire HitExplosions.	2017-09-12 16:20:15 +09:00
smoogipooo	8737a1b1a5	Implement osu!mania auto replay generation.	2017-09-12 15:52:32 +09:00
Dean Herbert	d66fb307dc	Fix wrong licence header	2017-09-11 19:14:37 +09:00
smoogipooo	df0a31bf2a	Add judgement text displays to osu!mania	2017-09-11 17:56:02 +09:00
smoogipooo	54aff432fe	Fix CI error	2017-09-11 15:43:23 +09:00
Dan Balasescu	6ecd530d7b	Add missing license header	2017-09-11 15:24:28 +09:00
smoogipooo	e8efdcf188	Make tick explosions white and lower scale.	2017-09-11 14:37:34 +09:00
Dean Herbert	5ce76d8023	Merge remote-tracking branch 'upstream/master' into judgement-revamp	2017-09-11 14:36:51 +09:00
smoogipooo	3026675f35	Add explosions.	2017-09-11 13:44:39 +09:00
smoogipooo	10f0d1f20d	Pass down OnJudgement to columns.	2017-09-11 12:57:10 +09:00
smoogipooo	42dc4d9b1c	Rework mania playfield to be more sane with masking/nesting.	2017-09-11 10:46:54 +09:00
smoogipooo	b085208d24	Remove unused code	2017-09-07 16:15:33 +09:00
smoogipooo	ef9b87e8c7	Make column lights not increase in brightness when successfully pressed	2017-09-07 16:15:25 +09:00
smoogipooo	0cc443e618	Remove all generic judgements.	2017-09-06 18:05:51 +09:00
smoogipooo	115e5c95af	Make ScrollingPlayfield.Reversed protected; make ManiaPlayfield 'invertible'.	2017-08-23 20:50:03 +09:00
smoogipooo	d8dfcc614a	Make mania work with key bindings	2017-08-23 13:42:16 +09:00
smoogipooo	0e41fc8842	Add mania bindings.	2017-08-23 12:49:50 +09:00
smoogipooo	909cae5861	CI fixes.	2017-08-22 14:21:28 +09:00
smoogipooo	9a7c9e9af0	Disable reversing for now - this needs to be re-implemented in a later PR.	2017-08-22 14:17:57 +09:00
smoogipooo	cd3c825bd2	Fix mania playfield not working.	2017-08-22 14:07:46 +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
smoogipooo	4eec59f669	Only set the number of availableColumns once, at ManiaRulesetContainer level. ... # Conflicts: # osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs # osu.Game/Rulesets/UI/RulesetContainer.cs	2017-08-22 14:07:37 +09:00
Dean Herbert	16e96888ab	Update KeyCounterCollection to support action-based buttons	2017-08-21 12:39:22 +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	c5ce86b9f3	Add reversing capability to ScrollingPlayfield.	2017-08-08 12:59:50 +09:00
smoogipooo	12f9793fec	Fix mania bar lines not working.	2017-08-07 17:46:22 +09:00
smoogipooo	f3c05fe232	CI fixes.	2017-08-07 17:34:57 +09:00
smoogipooo	933740664c	SpeedAdjustedHitRenderer -> ScrollingHitRenderer for consistent naming.	2017-08-07 16:43:54 +09:00
smoogipooo	a3efca9c35	Reduce implementation overhead in actually positioning hitobjects and making them scroll.	2017-08-07 16:02:38 +09:00
smoogipooo	c6447e40f9	Reduce implementation overhead for nested playfields (e.g. playfield + columns).	2017-08-07 14:56:26 +09:00
smoogipooo	b1d25ed388	Implement ScrollingPlayfield, now containing ScrollingHitObjectContainer (prev. SpeedAdjustmentCollection). ... Also removing a lot of mania code relating to gravity mod for now.	2017-08-04 23:07:08 +09:00
smoogipooo	0f901c99a0	Implement SpeedAdjustedPlayfield and a new HitRenderer derivation.	2017-08-04 20:11:18 +09:30
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	598b3f051e	Address CI concerns and update framework	2017-07-22 11:15:45 +02:00
Thomas Müller	c4619f614a	Merge branch 'master' of github.com:ppy/osu into better-transforms ... # Conflicts: # osu-framework	2017-07-19 19:15:51 +02:00
Dean Herbert	21d07428fe	Fix some test regressions	2017-07-19 15:16:59 +09:00
Thomas Müller	6063219b72	Update framework	2017-07-16 13:59:26 +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	e8ce3e16b0	Address CI concern	2017-07-10 12:52:29 +03:00
Dean Herbert	0e2dc9388a	More changes in-line with framework changes.	2017-07-10 12:55:47 +09:00
Dean Herbert	89c8a34025	Merge branch 'master' into better-drawablehitobject-lifetimes	2017-06-21 20:13:57 +09:00
smoogipooo	fc0e44b214	Update framework.	2017-06-21 11:28:27 +09:00
paparony03	62dee59672	Shapes namespace ... Depends on https://github.com/ppy/osu-framework/pull/837	2017-06-20 15:54:23 +10:00
smoogipooo	4afe83e74e	Rework DrawableHitObject to provide default life times and proper DrawableTimingSection autosizing. ... This exposes LifetimeOffset from DrawableHitObject which is used by the XSRG rulesets to adjust the life time range by the VisibleTimeRange.	2017-06-16 19:21:54 +09:00
smoogipooo	5bac0919f0	Remove gross autoSizingAxes and life time.	2017-06-16 13:00:08 +09:00
smoogipooo	5d7336b235	A bit more cleanup.	2017-06-16 10:06:47 +09:00
smoogipooo	fda220acbc	Move speed adjustment code from ManiaHitRenderer to SpeedAdjustedHitRenderer.	2017-06-15 19:34:28 +09:00
smoogipooo	419682b740	Merge remote-tracking branch 'origin/master' into timingchange-rework ... # Conflicts: # osu-framework	2017-06-12 13:09:02 +09:00
smoogipooo	ffbb46f668	Update in line with framework.	2017-06-12 12:48:47 +09:00
smoogipooo	de35ea22b1	Make bar lines work again.	2017-06-09 22:03:28 +09:00
smoogipooo	1f56848442	Rewrite the way speed adjustments are applied.	2017-06-09 19:57:03 +09:00
smoogipooo	921350128d	Rename SpeedAdjustment -> MultiplierControlPoint + reworking.	2017-06-09 16:57:17 +09:00
smoogipooo	4b2669e65d	Namespace movement.	2017-06-09 16:20:55 +09:00
smoogipooo	d11002e499	Use new naming structure + VisibleTimeRange bindable.	2017-06-09 16:11:49 +09:00
smoogipooo	cd435f7ec6	Merge remote-tracking branch 'origin/master' into timingchange-rework ... # Conflicts: # osu-framework # osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs	2017-06-09 03:37:55 +09:00
smoogipooo	8de6bdf340	Rewrite mania to use the new timing section stuff.	2017-06-09 02:43:48 +09:00
smoogipooo	55f238f6a9	Remove IHasTimeSpan, add rename to TimingSection.	2017-06-08 23:40:24 +09:00
John Neijzen	2f7d9655fd	More Clean up	2017-06-08 15:27:35 +08:00
smoogipooo	8641379424	Not sure how these CI issues were missed.	2017-06-07 19:27:22 +09:00
smoogipooo	6f191193a1	Rename timing changes, simplify + improve columns/dictionary usage.	2017-06-07 19:15:51 +09:00
smoogipooo	7aee8ee547	Make TimeSpan a double again.	2017-06-07 19:08:32 +09:00
smoogipooo	d66f114b5b	Properly set starting lifetime for mania hit objects.	2017-06-03 18:18:25 +09:00
smoogipooo	7022c8d496	Move timing change stuff to osu.Game project.	2017-06-02 20:17:44 +09:00
smoogipooo	a4cd409835	Super huge abstraction changes to (hopefully) make this TimingChangeContainer usable for non-mania rulesets. ... Also includes commenting improvements/fixes.	2017-06-02 19:27:22 +09:00
smoogipooo	1d3f5d8649	CI fixes.	2017-06-02 18:19:21 +09:00
smoogipooo	5ebe08ed2a	Make default mania playfield timespan 1.5s for now.	2017-06-02 17:45:48 +09:00
smoogipooo	b46a9dd0ef	Add gravity mod.	2017-06-02 17:33:58 +09:00
smoogipooo	d30706f640	Move drawable timing changes to Timing/Drawables.	2017-06-01 15:13:52 +09:00
smoogipooo	3e2aa26722	Add bar line timing changes.	2017-06-01 15:08:41 +09:00
smoogipooo	f612914e87	Initial rewrite of timing changes to allow them to be more extensible.	2017-06-01 14:26:21 +09:00
smoogipooo	4b6f2efa76	Cleanups.	2017-05-29 15:32:58 +09:00
smoogipooo	32550bda4f	Make drawable bar line a bit more sane.	2017-05-29 15:18:06 +09:00
smoogipooo	4fce0c1189	Rename Barline -> BarLine.	2017-05-29 15:05:20 +09:00
smoogipooo	ee7158aa95	Implement bar lines.	2017-05-29 14:44:42 +09:00
smoogipooo	e4b59314ea	Use new HitObjectStartTimeComparer.	2017-05-26 18:52:43 +09:00
smoogipooo	a5b79b2192	Fix notes not getting accent colours.	2017-05-24 21:56:49 +09:00
smoogipooo	78067e085c	Fix note input ordering.	2017-05-24 20:53:47 +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	3dfe88c068	Make Key a bindable, pass down to drawable hit objects.	2017-05-22 15:28:30 +09:00
smoogipooo	c972335297	Add InputTarget to capture input from columns before hit objects.	2017-05-22 15:25:37 +09:00
Dean Herbert	93182e5da3	Merge branch 'master' into generic-interface	2017-05-22 09:52:40 +09:00