2311 Commits

Author	SHA1	Message	Date
Huo Yaoyuan	9b1e010dcc	Fix filename mismatch.	2017-04-06 16:05:41 +08:00
smoogipooo	0107772737	Fix using.	2017-04-06 16:25:46 +09:00
Dan Balasescu	6fc1384927	Merge branch 'master' into taiko-fixes	2017-04-06 16:23:22 +09:00
Dean Herbert	1942ef9e8f	Fix merge fail.	2017-04-06 16:06:02 +09:00
Dean Herbert	4783d17d94	Merge branch 'master' into better-hitsounds	2017-04-06 16:00:56 +09:00
smoogipooo	cec8bca78a	Implement IJsonSerializable, BeatmapInfo IJsonSerializable.	2017-04-06 15:54:50 +09:00
Dean Herbert	942699218a	Merge branch 'master' into details	2017-04-06 15:44:43 +09:00
Dean Herbert	7c63c8394b	Remove unnecessary depth setting.	2017-04-06 15:36:03 +09:00
Dean Herbert	a18367454d	InGameOverlay -> MenuOverlay.	2017-04-06 15:34:52 +09:00
Dean Herbert	856696b17e	Fix incorrect verbatim strings.	2017-04-06 15:31:21 +09:00
Dean Herbert	6285f3eea8	Merge branch 'master' into pause_buttons_refactor	2017-04-06 15:00:48 +09:00
smoogipooo	37129bf03d	Make combo be changed by the base ScoreProcessor.	2017-04-06 14:37:21 +09:00
Dean Herbert	2bb99eac72	fix typo	2017-04-06 14:27:23 +09:00
Dean Herbert	efe82ef88c	Merge branch 'master' into hud_visibility	2017-04-06 13:40:10 +09:00
Dean Herbert	18ff8efd46	Mark TODO for BeatmapVersion.	2017-04-06 13:15:33 +09:00
Dean Herbert	f193af2a2a	Add better defaults for BaseDifficulty.	2017-04-06 13:15:21 +09:00
Dean Herbert	c50960af63	Add better defaults for ControlPoint.	2017-04-06 13:15:12 +09:00
Dan Balasescu	326baae615	Merge branch 'master' into taiko-wtf	2017-04-06 12:30:44 +09:00
smoogipooo	982dbb5bba	Cleanup + bow down to resharper.	2017-04-06 12:27:35 +09:00
smoogipooo	73e2ddaf26	Revert DrawableHitObject changes, make them less conflicting.	2017-04-06 12:24:17 +09:00
smoogipooo	4cc309e5a7	Make hit sounds into consts.	2017-04-06 12:14:06 +09:00
smoogipooo	c65ab5b6f1	General cleanup.	2017-04-06 11:56:19 +09:00
smoogipooo	acfcd30cc6	Simplify lambda.	2017-04-06 11:51:04 +09:00
smoogipooo	5beab4c43d	Absolute default bank should be normal.	2017-04-06 11:48:48 +09:00
smoogipooo	c73d6a52ec	Add a few comments.	2017-04-06 11:47:54 +09:00
smoogipooo	eb82a4c090	Back to using SampleInfo + fix taiko beatmap conversion.	2017-04-06 11:41:16 +09:00
Dean Herbert	863dc44c4d	Some minor improvements.	2017-04-06 09:57:34 +09:00
Dean Herbert	8354fb5eb5	Fix judgements being constructed too late.	2017-04-06 09:57:12 +09:00
smoogipooo	e903241c7b	Implement sample + addition sample reading from hit objects.	2017-04-06 09:43:47 +09:00
Andrey Zavadskiy	0946e42363	removed useless stuff	2017-04-05 22:51:43 +03:00
Andrey Zavadskiy	6a510097df	InGameOverlay fixes	2017-04-05 22:36:03 +03:00
smoogipooo	1ef465716d	Proper legacy timing point parsing.	2017-04-05 21:59:40 +09:00
smoogipooo	d607207b69	Ability to contain multiple sample banks. Get default bank name from control point.	2017-04-05 21:59:07 +09:00
smoogipooo	8d720e39c6	Going forward, explicit ToLower should not be needed.	2017-04-05 21:39:09 +09:00
smoogipooo	2d8239a3f7	Re-implement the SampleBank/Sample structure. No parsing support yet.	2017-04-05 21:34:28 +09:00
Dean Herbert	4aafc172ca	Allow playfield to specify whether it has a cursor or not.	2017-04-05 17:38:57 +09:00
Dean Herbert	4b1588a21d	Fix correct mode filter not being applied when first entering song select.	2017-04-05 17:33:19 +09:00
Dean Herbert	8173d01d78	Fix crash on changing play mode too early.	2017-04-05 17:26:45 +09:00
Dean Herbert	6a922da87e	Move legacy_velocity_multiplier application to LegacyTimingInfo.	2017-04-05 12:05:48 +09:00
Jorolf	f9bf1c69bf	add Flags to BarDirection and remove unused "using"	2017-04-04 18:23:29 +02:00
Jorolf	502afc0a48	some fixes to BarGraph so Direction works properly	2017-04-04 18:09:16 +02:00
Andrey Zavadskiy	c4c8604afd	A little change to woke up AppVeyor	2017-04-04 19:06:53 +03:00
Andrey Zavadskiy	f2a9ec0f24	Converted constructor to protected	2017-04-04 19:02:36 +03:00
Andrey Zavadskiy	7b95f2d46a	InGameOverlay now is abstract	2017-04-04 18:53:13 +03:00
Andrey Zavadskiy	62655b70c9	Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor	2017-04-04 18:41:37 +03:00
Jorolf	b2731bb0a1	some formatting	2017-04-04 17:27:08 +02:00
Jorolf	58f8dc8254	add direction to graphs	2017-04-04 17:17:22 +02:00
Andrey Zavadskiy	bec4bf36ac	hud->content and style fixes	2017-04-04 17:47:41 +03:00
Andrey Zavadskiy	009909dd4b	Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility	2017-04-04 17:39:53 +03:00
smoogipooo	1d4a371ded	A few general fixes.	2017-04-04 14:38:50 +09:00
smoogipooo	5e67bcb581	Remove a few unused classes.	2017-04-04 13:14:45 +09:00
smoogipooo	4b424263ce	Fully parse control points.	2017-04-04 13:13:27 +09:00
Dean Herbert	1233fb5b82	Split noto out into individual ranges.	2017-04-04 11:34:55 +09:00
Dean Herbert	c6216dbde1	Remove outdated todo.	2017-04-04 11:34:45 +09:00
Dean Herbert	7c74951454	Update bindables. ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCaseResults.cs # osu.Game/Screens/Ranking/ResultModeButton.cs # osu.Game/Screens/Ranking/Results.cs	2017-04-04 11:34:13 +09:00
Dean Herbert	f6303d55ec	Upodate some tab usages.	2017-04-04 11:13:09 +09:00
Dean Herbert	d0ebbad0fa	Fix avatar display.	2017-04-04 10:33:41 +09:00
Jorolf	8e689a06d8	change font	2017-04-03 23:03:49 +02:00
Jorolf	5a694e0c9d	changed location of BarGraph to be more generic	2017-04-03 19:29:13 +02:00
Jorolf	f3946bebb4	Merge branch 'master' of git://github.com/ppy/osu into details	2017-04-03 18:33:47 +02:00
Andrey Zavadskiy	5baa887f55	Fixes	2017-04-03 14:58:38 +03:00
Dean Herbert	aa43b138b0	Merge branch 'master' into hud_visibility	2017-04-03 20:42:27 +09:00
smoogipooo	2e80ecfda8	Don't need explicit null value.	2017-04-03 20:33:10 +09:00
smoogipooo	19b5555ef2	Slightly clean up archive readers + decoders. Read beatmap version into BeatmapInfo.	2017-04-03 20:26:46 +09:00
Andrey Zavadskiy	c1b48c6cbf	FadeIn/Out	2017-04-03 12:17:53 +03:00
Andrey Zavadskiy	e1d3befaed	Added bool to ensure the notification is only displayed once per game execution	2017-04-03 12:03:21 +03:00
Andrey Zavadskiy	63a1eef6e4	Removed unnecessary line	2017-04-03 11:54:50 +03:00
Andrey Zavadskiy	e51fdd3c86	Added container whose visibility will be changable	2017-04-03 11:41:17 +03:00
Andrey Zavadskiy	8d28c54ff3	Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility	2017-04-03 11:07:14 +03:00
Dean Herbert	c539e514f5	Merge branch 'master' into fix_slider_velocities	2017-04-03 15:08:54 +09:00
smoogipooo	27132958c8	Merge remote-tracking branch 'origin/master' into taiko-drawable-generation ... Conflicts: osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj	2017-04-03 14:19:31 +09:00
smoogipooo	74bd427997	Remove SliderVelocityAt, compute it manually inside hit objects.	2017-04-03 14:12:15 +09:00
Dean Herbert	83322dc5cb	Merge branch 'master' into hud_visibility	2017-04-03 11:51:11 +09:00
smoogipooo	ffe4d0ae4a	Remove BeatDistanceAt (does not express distance) and BeatVelocityAt.	2017-04-03 11:48:42 +09:00
smoogipooo	f1b0a12ee3	Rename BPMMultiplierAt -> SpeedMultiplierAt.	2017-04-03 11:48:15 +09:00
Andrey Zavadskiy	ed476a79f8	Move posting notification in HudOverlay	2017-04-02 16:18:01 +03:00
Dean Herbert	263374a357	Remove unnecessary using.	2017-04-02 17:11:31 +09:00
Dean Herbert	bfa2e68bfb	Container->Wrapper.	2017-04-02 16:17:13 +09:00
Dean Herbert	6f1fff4ee7	Update async load usage to new style.	2017-04-02 15:56:12 +09:00
Andrey Zavadskiy	1ecff1b32c	Fix naming and testcase	2017-04-01 21:50:25 +03:00
Andrey Zavadskiy	f70de7439b	Moved title and description to each class	2017-04-01 21:42:12 +03:00
Andrey Zavadskiy	bd123fa906	Better inheritance	2017-04-01 21:29:17 +03:00
Andrey Zavadskiy	e3a8a14281	Removed unnecessary using	2017-04-01 21:19:49 +03:00
Andrey Zavadskiy	ebc814f06a	Typos fix	2017-04-01 21:17:24 +03:00
Andrey Zavadskiy	3574dac780	Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor	2017-04-01 21:03:19 +03:00
Jorolf	017281246d	changed SpriteText to OsuSpriteText	2017-04-01 18:12:44 +02:00
Jorolf	d0b4f86725	fix errors from merge	2017-04-01 14:16:18 +02:00
Jorolf	072a77b4d9	Merge branch 'master' of git://github.com/ppy/osu into details	2017-04-01 14:12:20 +02:00
Andrey Zavadskiy	9d027a61cd	Move input to HudOverlay	2017-04-01 14:46:45 +03:00
Andrey Zavadskiy	06850f7e1f	Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility	2017-04-01 14:04:48 +03:00
Jorolf	e380254386	remove unnecessary code	2017-03-31 22:32:09 +02:00
Jorolf	1f19d72474	removed wrong using >.>	2017-03-31 21:24:05 +02:00
Jorolf	d8bb72dd78	remove unused using-directive	2017-03-31 21:19:23 +02:00
Jorolf	50b8580141	add license header	2017-03-31 21:13:20 +02:00
Jorolf	47698be1f5	Merge branch 'master' into details	2017-03-31 21:10:45 +02:00
Andrey Zavadskiy	d7c39a00b4	Hud Visibility	2017-03-31 16:43:31 +03:00
Dean Herbert	24d06fa92d	CheckBox -> Checkbox.	2017-03-31 17:38:33 +09:00
Dean Herbert	14fcc197e9	Merge branch 'master' into partial-judgements	2017-03-31 16:53:49 +09:00
Dean Herbert	50c328f1b4	Merge remote-tracking branch 'upstream/master' into partial-judgements ... # Conflicts: # osu.Game/osu.Game.csproj	2017-03-31 16:46:40 +09:00
Dean Herbert	5d25fa3282	Merge remote-tracking branch 'upstream/master' into accented-interface	2017-03-31 16:38:19 +09:00
Dean Herbert	3f080ab424	Add some commenting.	2017-03-31 16:01:48 +09:00
Dean Herbert	cf87330f80	Allow SetReplay to receive null.	2017-03-31 16:00:40 +09:00
Dean Herbert	fa7c72a099	Refactor ReplayInputHandler creation for more flexibility.	2017-03-31 15:59:53 +09:00
Dean Herbert	0f4b98ce73	Move FramedReplayInputHandler to own file and un-nest.	2017-03-31 15:32:34 +09:00
Dean Herbert	c531d774b7	Fix file naming.	2017-03-31 15:21:30 +09:00
smoogipooo	a48224bd6d	Don't need Drawable type.	2017-03-31 15:06:33 +09:00
smoogipooo	43c306d658	IAccented -> IHasAccentColour.	2017-03-31 15:06:31 +09:00
smoogipooo	09b98d71a7	Add back Capacity.	2017-03-31 13:33:19 +09:00
Dean Herbert	79031b9e74	Update framework.	2017-03-31 12:58:54 +09:00
Dean Herbert	e7ecc479c9	Add FramedReplay and use where legacy is not needed.	2017-03-31 12:43:42 +09:00
smoogipooo	cd915a32be	Let's use a List for now.	2017-03-31 11:58:24 +09:00
smoogipooo	49575c3447	Special case not needed.	2017-03-31 11:54:12 +09:00
smoogipooo	d944b8c192	Implement IAccented interface + transform.	2017-03-31 11:01:42 +09:00
Dean Herbert	8e8d1bbd6d	Merge branch 'master' into partial-judgements	2017-03-31 09:08:22 +09:00
Jorolf	0d4f2c59a5	there's probably something in here I overlooked	2017-03-30 17:32:18 +02:00
Jorolf	15326204d5	Merge branch 'master' of git://github.com/ppy/osu into details	2017-03-30 16:38:25 +02:00
smoogipooo	76d0beb64f	Fix custom transform.	2017-03-30 22:28:51 +09:00
Dean Herbert	ddc6d45985	Merge pull request #572 from smoogipooo/general-fixes ... Fix missing base call that may result in invalid ScoreProcessor state.	2017-03-30 14:07:50 +09:00
Dean Herbert	77ac205b62	Merge branch 'master' into partial-judgements	2017-03-30 14:07:43 +09:00
smoogipooo	6287ba321d	Rewrite ScoreProcessor to have a new method for when existing judgements are changed. ... - OnNewJudgement: Keeps its previous functionality. It is now only invoked when a _new_ judgement has been added to the Judgements hashset. - OnJudgementChanged: Has a similar funcitonality to OnNewJudgement, but is only invoked whenever a judgement that was _previously_ in the Judgements hashset is changed.	2017-03-30 10:51:14 +09:00
smoogipooo	c2d6faa7c2	Change Judgements into HashSet to prevent duplicates.	2017-03-30 10:39:38 +09:00
Jorolf	a3430dd072	add culture info	2017-03-29 16:10:07 +02:00
Jorolf	cdb3150c56	add readonlies and remove unused using directives	2017-03-29 16:00:29 +02:00
Jorolf	6982529481	Merge branch 'master' of git://github.com/ppy/osu into details	2017-03-29 15:47:00 +02:00
Jorolf	ab4d1c7725	better maxValue calculation for the retry and fail graph	2017-03-29 15:33:36 +02:00
Jorolf	7bd13d76a8	fixes + updates to DetailsBar and a button for the TestCaseDetails	2017-03-29 14:48:43 +02:00
Dean Herbert	6afa6f30cc	Keep selected beatmap in centre of screen post-filter.	2017-03-29 20:01:46 +09:00
Dean Herbert	a6c8be3637	Increase load delay on panel backgrounds; add back missing fade.	2017-03-29 19:52:16 +09:00
Dean Herbert	fa7fd6efe3	Fix mode selector not invoking a re-filter.	2017-03-29 19:48:13 +09:00
smoogipooo	3050039972	Implement partial judgements + make Result non-nullable.	2017-03-29 18:35:28 +09:00
smoogipooo	bae0ac4901	Fix missing base call that may result in invalid ScoreProcessor state.	2017-03-29 18:21:45 +09:00
Dean Herbert	b96a153e0e	Resize ranks better.	2017-03-29 12:24:04 +09:00
smoogipooo	eed50784ba	Make player work with TaikoHitRenderer.	2017-03-29 11:35:57 +09:00
Dan Balasescu	d7674e2367	Merge branch 'master' into dynamic-recompile	2017-03-29 10:12:48 +09:00
Dean Herbert	ab97967237	Update references and framework.	2017-03-29 09:54:00 +09:00
Dan Balasescu	bca18ce209	Merge branch 'master' into move-easingtypes	2017-03-29 08:14:13 +09:00
Dan Balasescu	e53a5a3521	Merge branch 'master' into avatars-and-login	2017-03-29 07:52:43 +09:00
Jorolf	199c70ff95	Added fails and retries	2017-03-28 20:18:56 +02:00
Jorolf	305bc9cff6	Merge branch 'master' of git://github.com/ppy/osu into details	2017-03-28 17:14:35 +02:00
Jorolf	909fdb647c	Added ratings and different bar rotations	2017-03-28 17:12:54 +02:00
Dean Herbert	f7dc7e9bb9	Update references.	2017-03-28 21:26:20 +09:00
Andrey Zavadskiy	91e18cc63e	Fix usings	2017-03-28 12:12:35 +03:00
Andrey Zavadskiy	cf3db49631	Inherit Pause/Fail overlay from InGameOverlay	2017-03-28 12:09:26 +03:00
Andrey Zavadskiy	687f71e410	Fixes	2017-03-28 11:45:48 +03:00
Andrey Zavadskiy	60be69d3b0	Fixes	2017-03-28 11:41:08 +03:00
Andrey Zavadskiy	85c2184170	Fixes	2017-03-28 11:33:56 +03:00
Andrey Zavadskiy	62693a6a59	Again separate classes	2017-03-28 10:49:58 +03:00
Dean Herbert	4042b94e01	Use DelayedLoadContainer in more places.	2017-03-28 15:28:58 +09:00
Dean Herbert	f690e1d0c4	Move async logic to framework.	2017-03-28 14:24:34 +09:00
Andrey Zavadskiy	9774f826ab	Pause and fail overlays -> StopOverlay	2017-03-28 06:08:31 +03:00