Commit Graph

4744 Commits

Author SHA1 Message Date
9eaa1cb5cd Fix sprites not being visible when all their commands are inside loops. 2017-09-11 12:06:00 +02:00
262aea8b6b Fix osu! logo triangles going super fast when the track is paused 2017-09-11 19:16:44 +09:30
ba4b9e3411 Merge branch 'master' into mania-hit-explosions 2017-09-11 18:32:36 +09:00
18ad0956b4 Merge branch 'master' into maybefix 2017-09-11 18:23:00 +09:00
7b92bbfa86 Merge branch 'master' into mania-hit-explosions 2017-09-11 17:34:14 +09:00
838fcca9c4 Merge branch 'master' into mania-hit-explosions 2017-09-11 15:14:35 +09:00
f3c6f6f959 Merge branch 'blending-equations' into mania-holdnote-niceness 2017-09-11 15:09:01 +09:00
58c875bdca Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
#	osu-framework
2017-09-11 15:02:12 +09:00
4683319156 Merge remote-tracking branch 'origin/master' into mania-hit-explosions 2017-09-11 14:48:40 +09:00
5ce76d8023 Merge remote-tracking branch 'upstream/master' into judgement-revamp 2017-09-11 14:36:51 +09:00
512232c1c8 Fix regression causing autoplay to fail 2017-09-11 14:25:01 +09:00
0cadee998c Set default AccentColour for hit objects 2017-09-11 13:44:05 +09:00
7170fbd087 Target .NET 4.6.1 2017-09-11 12:39:00 +09:00
adba5b5ba6 Merge branch 'master' into beatmap-details-rewrite 2017-09-11 12:30:32 +09:00
24f7b6823e Merge branch 'master' into nullref-fix 2017-09-11 12:13:43 +09:00
eedfbdc0e8 Add nullref check in KeyCounterCollection's Add method 2017-09-11 11:41:09 +09:00
8d919e42c9 Fix nullref when loading MusicController VisualTest after Player VisualTest 2017-09-11 11:18:53 +09:00
cb24b5c436 Merge branch 'master' into beatmap-details-rewrite 2017-09-11 10:18:34 +09:00
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
2086ed209d Fix hold note tick input. 2017-09-11 04:51:44 +09:00
59d9dc5ee7 Ignore storyboard sprites with invalid positions. 2017-09-10 20:08:56 +02:00
cde22865b9 Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
#	osu-framework
2017-09-11 02:42:23 +09:00
ea35b69f2f Merge branch 'master' into fix-mono-crash 2017-09-10 11:49:20 +09:00
6d33e39c5e Merge branch 'master' into beatmap-details-rewrite 2017-09-10 11:26:00 +09:00
bc01d9a1b0 Animate Additive / FlipH and FlipV. 2017-09-09 15:41:56 +02:00
8d55cb7f92 Improve command sorting. 2017-09-09 11:00:58 +02:00
0c2bad1de4 Get rid of some properties and todos. 2017-09-09 12:44:27 +05:30
d12a5e927a Rename property. 2017-09-09 11:03:25 +05:30
e67606e203 Return existing download if it exists. 2017-09-09 10:25:28 +05:30
5f5dd54f9d Use a List instead of a Dictionary. 2017-09-09 09:56:01 +05:30
20becbe576 Use the specifically created progress action, add license header. 2017-09-09 01:53:42 +05:30
12de737084 Merge branch 'master' into storyboards
# Conflicts:
#	osu.Game/Beatmaps/Beatmap.cs
2017-09-08 21:46:34 +02:00
57e53ff03a Fix diff-specific storyboard content being lost after loading. 2017-09-08 21:36:30 +02:00
5a3814b02e XMLdoc fixes and a cautionary check. 2017-09-09 01:04:55 +05:30
0e4973020a Resharper and test case fixes. 2017-09-09 00:58:54 +05:30
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
31a507372a Don't show beatmaps that are already added. 2017-09-09 00:57:48 +05:30
20f93c83d6 Make downloads happen in BeatmapManager. 2017-09-09 00:57:40 +05:30
4ab243d885 CI fixes. 2017-09-08 21:23:24 +02:00
e8ab853f6f Make storyboard loops work. 2017-09-08 21:07:40 +02:00
e4a2ad5eb5 Fix storyboard sprite flipping. 2017-09-08 20:39:17 +02:00
386147cc77 Merge branch 'master' into channelselection-minimum-size 2017-09-09 02:51:47 +09:00
d95940ed5e CI fixes. 2017-09-08 14:25:41 -03:00
ce68b6661e Update visual test. 2017-09-08 14:15:28 -03:00
15dd8d9071 Mind the minimum size of the channel selection overlay 2017-09-08 18:21:42 +02:00
3f2598543c Fix CommandLoop start and end time. 2017-09-08 18:03:04 +02:00
5c125737cb Fix wrong initial topic color of not joined channels in the channel selection 2017-09-08 17:47:23 +02:00
9b790157d8 Merge branch 'master' into non-null-beatmap 2017-09-08 23:33:03 +09:00
3166394a59 Merge branch 'master' into home-hides-overlays 2017-09-08 23:23:20 +09:00
e63fb5720c Make CI happy. 2017-09-08 13:04:53 +02:00