7479 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	ba4b9e3411	Merge branch 'master' into mania-hit-explosions	2017-09-11 18:32:36 +09:00
Dan Balasescu	3f9b682759	Merge pull request #1242 from peppy/maybefix ... Ensure WorkingBeatmap's Track is never null	2017-09-11 18:32:16 +09:00
Dean Herbert	18ad0956b4	Merge branch 'master' into maybefix	2017-09-11 18:23:00 +09:00
smoogipooo	df0a31bf2a	Add judgement text displays to osu!mania	2017-09-11 17:56:02 +09:00
Dean Herbert	7b92bbfa86	Merge branch 'master' into mania-hit-explosions	2017-09-11 17:34:14 +09:00
Dean Herbert	311f4744f6	Merge pull request #1233 from smoogipooo/mania-holdnote-niceness ... Update osu!mania notes + hold notes with glows	2017-09-11 17:33:03 +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	e5808d4680	Merge remote-tracking branch 'origin/master' into mania-holdnote-niceness	2017-09-11 15:14:49 +09:00
Dean Herbert	838fcca9c4	Merge branch 'master' into mania-hit-explosions	2017-09-11 15:14:35 +09:00
Dean Herbert	73b5940498	Merge pull request #1231 from smoogipooo/blending-equations ... Update BlendingMode usages to reflect framework changes	2017-09-11 15:14:18 +09:00
smoogipooo	f3c6f6f959	Merge branch 'blending-equations' into mania-holdnote-niceness	2017-09-11 15:09:01 +09:00
smoogipooo	de7d50d384	Better variable + comment naming	2017-09-11 15:08:51 +09:00
smoogipooo	6c4f507e39	Update framework.	2017-09-11 15:02:30 +09:00
smoogipooo	58c875bdca	Merge remote-tracking branch 'origin/master' into blending-equations ... # Conflicts: # osu-framework	2017-09-11 15:02:12 +09:00
DrabWeb	4be8899fb2	Move Length to BeatmapOnlineInfo.	2017-09-11 02:55:32 -03:00
DrabWeb	43fa314fe0	Details and more data displaying.	2017-09-11 02:48:48 -03:00
smoogipooo	4683319156	Merge remote-tracking branch 'origin/master' into mania-hit-explosions	2017-09-11 14:48:40 +09:00
Dean Herbert	b01233eddc	Fix CI issues	2017-09-11 14:48:01 +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
Dan Balasescu	a9ad02c29f	Merge pull request #1238 from peppy/fix-autoplay ... Fix regression causing autoplay to fail	2017-09-11 14:32:29 +09:00
Dean Herbert	512232c1c8	Fix regression causing autoplay to fail	2017-09-11 14:25:01 +09:00
smoogipooo	2c3131d391	Remove green coloration when hit.	2017-09-11 13:56:10 +09:00
smoogipooo	9e3206fef3	Improve test case a little bit.	2017-09-11 13:55:34 +09:00
smoogipooo	3026675f35	Add explosions.	2017-09-11 13:44:39 +09:00
smoogipooo	0cadee998c	Set default AccentColour for hit objects	2017-09-11 13:44:05 +09:00
DrabWeb	e61ab72c0d	Merge https://github.com/ppy/osu into online-beatmap-set-overlay	2017-09-11 01:24:52 -03:00
DrabWeb	54172ac6ad	Move header button and details components to own files.	2017-09-11 01:21:53 -03:00
Dean Herbert	9d6571a1cb	Merge pull request #1237 from peppy/update-managedbass-retarget ... Update framework and target .NET 4.6.1	2017-09-11 12:57:13 +09:00
smoogipooo	10f0d1f20d	Pass down OnJudgement to columns.	2017-09-11 12:57:10 +09:00
Dean Herbert	712c6942a9	Update submodules	2017-09-11 12:52:25 +09:00
Dean Herbert	7170fbd087	Target .NET 4.6.1	2017-09-11 12:39:00 +09:00
Dean Herbert	81d04ea959	Merge pull request #1222 from DrabWeb/beatmap-details-rewrite ... Beatmap details rewrite	2017-09-11 12:36:44 +09:00
Dean Herbert	adba5b5ba6	Merge branch 'master' into beatmap-details-rewrite	2017-09-11 12:30:32 +09:00
Dean Herbert	71fe39244b	Merge pull request #1235 from peppy/nullref-fix ... Fix nullref when loading MusicController VisualTest after Player VisualTest	2017-09-11 12:23:29 +09:00
Dan Balasescu	24f7b6823e	Merge branch 'master' into nullref-fix	2017-09-11 12:13:43 +09:00
Dan Balasescu	01b294e6b5	Merge pull request #1236 from peppy/ci-refixes ... Fix newly occurring CI issues	2017-09-11 12:02:34 +09:00
Dean Herbert	3cacee300a	Fix a false resharper positive	2017-09-11 11:41:29 +09:00
Dean Herbert	eedfbdc0e8	Add nullref check in KeyCounterCollection's Add method	2017-09-11 11:41:09 +09:00
Dean Herbert	4f6c93aa0f	Update framework	2017-09-11 11:34:40 +09:00
Dean Herbert	8d919e42c9	Fix nullref when loading MusicController VisualTest after Player VisualTest	2017-09-11 11:18:53 +09:00
smoogipooo	42dc4d9b1c	Rework mania playfield to be more sane with masking/nesting.	2017-09-11 10:46:54 +09:00
Dean Herbert	cb24b5c436	Merge branch 'master' into beatmap-details-rewrite	2017-09-11 10:18:34 +09:00
smoogipooo	2f72dff779	Update with framework changes.	2017-09-11 08:59:56 +09:00
Dan Balasescu	d42aab96d1	Merge pull request #1234 from peppy/fix-volume-wheel ... Fix individual volume controls not being adjustable via wheel	2017-09-11 08:37:00 +09:00
Dean Herbert	f33bd700c5	Fix individual volume controls not being adjustable via wheel ... They were blocking each others' input unnecessarily.	2017-09-11 08:27:29 +09:00
smoogipooo	2086ed209d	Fix hold note tick input.	2017-09-11 04:51:44 +09:00
smoogipooo	9cd3af11d5	Fix hold note tick position + lifetime.	2017-09-11 04:45:10 +09:00
smoogipooo	79a9612243	Remove now unnecessary comment.	2017-09-11 04:39:04 +09:00