7544 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
smoogipooo	8bb8999820	More TestCaseManiaHitObjects fixes.	2017-09-11 04:34:30 +09:00
smoogipooo	3b5e847a31	Better updateGlow methods.	2017-09-11 04:29:32 +09:00
smoogipooo	590a34dc28	Add glow to DrawableHoldNote	2017-09-11 04:22:17 +09:00
smoogipooo	73d77637ef	Add glow to DrawableNote	2017-09-11 04:22:05 +09:00
smoogipooo	8797382700	Update body styling of hold notes	2017-09-11 04:21:43 +09:00
smoogipooo	4d77a81e40	Make TestCaseManiaHitObjects work again.	2017-09-11 03:50:16 +09:00
smoogipooo	e876efcc02	Merge branch 'blending-equations' into mania-holdnote-niceness	2017-09-11 03:49:17 +09:00
smoogipooo	af07d5cc51	Update framework.	2017-09-11 03:37:13 +09:00
Damnae	59d9dc5ee7	Ignore storyboard sprites with invalid positions.	2017-09-10 20:08:56 +02:00
smoogipooo	cde22865b9	Merge remote-tracking branch 'origin/master' into blending-equations ... # Conflicts: # osu-framework	2017-09-11 02:42:23 +09:00
Dean Herbert	7d4ca40965	Merge pull request #1219 from naoey/fix-mono-crash ... Fix startup crash on mono.	2017-09-10 11:58:58 +09:00
Dean Herbert	0a9ca8a1ff	Update framework	2017-09-10 11:53:47 +09:00
Dean Herbert	ea35b69f2f	Merge branch 'master' into fix-mono-crash	2017-09-10 11:49:20 +09:00
Dean Herbert	6d33e39c5e	Merge branch 'master' into beatmap-details-rewrite	2017-09-10 11:26:00 +09:00
DrabWeb	aa9dfcc082	BeatmapPicker logic.	2017-09-09 19:05:22 -03:00
DrabWeb	cbd9c07aed	BeatmapPicker design.	2017-09-09 18:19:43 -03:00
Damnae	bc01d9a1b0	Animate Additive / FlipH and FlipV.	2017-09-09 15:41:56 +02:00
Damnae	8d55cb7f92	Improve command sorting.	2017-09-09 11:00:58 +02:00
Dean Herbert	f5b3afbe10	Merge pull request #1228 from naoey/direct-upgrades ... Direct results maintain download status between switching views	2017-09-09 18:00:11 +09:00
naoey	0c2bad1de4	Get rid of some properties and todos.	2017-09-09 12:44:27 +05:30
naoey	d12a5e927a	Rename property.	2017-09-09 11:03:25 +05:30
naoey	e67606e203	Return existing download if it exists.	2017-09-09 10:25:28 +05:30
naoey	5f5dd54f9d	Use a List instead of a Dictionary.	2017-09-09 09:56:01 +05:30
DrabWeb	ecd6994d74	Added favourite/download buttons and author info.	2017-09-08 19:17:39 -03:00
DrabWeb	1d3139d3c3	Basic layout.	2017-09-08 18:32:07 -03:00
naoey	20becbe576	Use the specifically created progress action, add license header.	2017-09-09 01:53:42 +05:30
Damnae	12de737084	Merge branch 'master' into storyboards ... # Conflicts: # osu.Game/Beatmaps/Beatmap.cs	2017-09-08 21:46:34 +02:00
Damnae	57e53ff03a	Fix diff-specific storyboard content being lost after loading.	2017-09-08 21:36:30 +02:00
naoey	5a3814b02e	XMLdoc fixes and a cautionary check.	2017-09-09 01:04:55 +05:30
naoey	0e4973020a	Resharper and test case fixes.	2017-09-09 00:58:54 +05:30
naoey	00306b6e38	Maintain download progress between switching result views. ... - Check for existing download requests on creating DirectPanel - Actually remove downloaded beatmap from results	2017-09-09 00:57:48 +05:30
naoey	31a507372a	Don't show beatmaps that are already added.	2017-09-09 00:57:48 +05:30
naoey	20f93c83d6	Make downloads happen in BeatmapManager.	2017-09-09 00:57:40 +05:30
Damnae	4ab243d885	CI fixes.	2017-09-08 21:23:24 +02:00
Damnae	e8ab853f6f	Make storyboard loops work.	2017-09-08 21:07:40 +02:00