smoogipooo
|
093d82ac45
|
Set depths from playfield add methods instead of DrawableHitObject
|
2017-09-13 16:17:01 +09:00 |
|
Dan Balasescu
|
f4a2ffbeea
|
Merge branch 'master' into judgement-revamp
|
2017-09-12 19:13:33 +09:00 |
|
smoogipooo
|
112429051e
|
Fix XMLDoc CI errors
|
2017-09-12 19:05:37 +09:00 |
|
Dan Balasescu
|
ee8ec31c6e
|
Merge branch 'master' into judgement-revamp
|
2017-09-12 18:57:37 +09:00 |
|
smoogipooo
|
d5bd005c01
|
Remove unused code for now
I don't think we'll ever be using this anyway.
|
2017-09-12 18:52:15 +09:00 |
|
smoogipooo
|
92b3e203e8
|
judgementOccurred should be passed upwards
So only one hit object is ever judged in a single frame.
|
2017-09-12 18:50:30 +09:00 |
|
smoogipooo
|
a38e0062a4
|
Fix checking judgements even if we don't provide a judgement, if we have a result, or if a nested hit object handled a judgement.
|
2017-09-12 18:49:50 +09:00 |
|
Dan Balasescu
|
d25c382adf
|
Merge branch 'master' into workingbeatmap-track-disposal
|
2017-09-12 18:44:52 +09:00 |
|
Dean Herbert
|
86de4fa2e2
|
Apply CI fixes
|
2017-09-12 18:36:19 +09:00 |
|
Dean Herbert
|
f32d444d68
|
Remove generics from Playfield (fixes catch)
|
2017-09-12 18:19:28 +09:00 |
|
Dean Herbert
|
d7ac02d090
|
Ensure judgements aren't updated when ArmedState is not idle
|
2017-09-12 18:00:41 +09:00 |
|
Dean Herbert
|
1194e46ef1
|
Merge remote-tracking branch 'upstream/master' into judgement-revamp
|
2017-09-12 17:46:21 +09:00 |
|
Dean Herbert
|
20dae5ee11
|
Minor refactors
|
2017-09-12 17:36:46 +09:00 |
|
Dean Herbert
|
5b9d906ad5
|
Improve beatmap track disposal logic
- [ ] Depends on https://github.com/ppy/osu-framework/pull/1035
|
2017-09-12 16:56:46 +09:00 |
|
Dan Balasescu
|
3be9d3c747
|
Merge branch 'master' into mania-autoplay
|
2017-09-12 16:44:05 +09:00 |
|
smoogipooo
|
8737a1b1a5
|
Implement osu!mania auto replay generation.
|
2017-09-12 15:52:32 +09:00 |
|
smoogipooo
|
d6bf5c38b7
|
Move Kiai bool to HitObject.
|
2017-09-12 10:01:07 +09:00 |
|
Dean Herbert
|
7c7849f189
|
Fix icon states being updated incorrectly when being set too early
|
2017-09-11 21:40:58 +09:00 |
|
Dean Herbert
|
b38da61ef6
|
Merge branch 'master' into fix-paused-osu-logo
|
2017-09-11 19:53:36 +09:00 |
|
Shane Woolcock
|
262aea8b6b
|
Fix osu! logo triangles going super fast when the track is paused
|
2017-09-11 19:16:44 +09:30 |
|
Dean Herbert
|
ba4b9e3411
|
Merge branch 'master' into mania-hit-explosions
|
2017-09-11 18:32:36 +09:00 |
|
Dean Herbert
|
18ad0956b4
|
Merge branch 'master' into maybefix
|
2017-09-11 18:23:00 +09:00 |
|
Dean Herbert
|
7b92bbfa86
|
Merge branch 'master' into mania-hit-explosions
|
2017-09-11 17:34:14 +09:00 |
|
Dean Herbert
|
838fcca9c4
|
Merge branch 'master' into mania-hit-explosions
|
2017-09-11 15:14:35 +09:00 |
|
smoogipooo
|
f3c6f6f959
|
Merge branch 'blending-equations' into mania-holdnote-niceness
|
2017-09-11 15:09:01 +09:00 |
|
smoogipooo
|
58c875bdca
|
Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
# osu-framework
|
2017-09-11 15:02:12 +09:00 |
|
smoogipooo
|
4683319156
|
Merge remote-tracking branch 'origin/master' into mania-hit-explosions
|
2017-09-11 14:48:40 +09:00 |
|
Dean Herbert
|
5ce76d8023
|
Merge remote-tracking branch 'upstream/master' into judgement-revamp
|
2017-09-11 14:36:51 +09:00 |
|
Dean Herbert
|
512232c1c8
|
Fix regression causing autoplay to fail
|
2017-09-11 14:25:01 +09:00 |
|
smoogipooo
|
0cadee998c
|
Set default AccentColour for hit objects
|
2017-09-11 13:44:05 +09:00 |
|
Dean Herbert
|
7170fbd087
|
Target .NET 4.6.1
|
2017-09-11 12:39:00 +09:00 |
|
Dean Herbert
|
adba5b5ba6
|
Merge branch 'master' into beatmap-details-rewrite
|
2017-09-11 12:30:32 +09:00 |
|
Dan Balasescu
|
24f7b6823e
|
Merge branch 'master' into nullref-fix
|
2017-09-11 12:13:43 +09:00 |
|
Dean Herbert
|
eedfbdc0e8
|
Add nullref check in KeyCounterCollection's Add method
|
2017-09-11 11:41:09 +09:00 |
|
Dean Herbert
|
8d919e42c9
|
Fix nullref when loading MusicController VisualTest after Player VisualTest
|
2017-09-11 11:18:53 +09:00 |
|
Dean Herbert
|
cb24b5c436
|
Merge branch 'master' into beatmap-details-rewrite
|
2017-09-11 10:18:34 +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
|
cde22865b9
|
Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
# osu-framework
|
2017-09-11 02:42:23 +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 |
|
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 |
|
naoey
|
20becbe576
|
Use the specifically created progress action, add license header.
|
2017-09-09 01:53:42 +05:30 |
|
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 |
|