f41af191ed
Merge remote-tracking branch 'origin/master' into editor-selection-tool
2017-12-08 15:13:18 +09:00
5330ca1fa9
Merge pull request #1635 from awesomecuber/fix-sensitivityslider
...
Fix SensitivitySlider keyboard control
2017-12-07 21:16:42 +09:00
9e37a122e1
Merge branch 'master' into fix-sensitivityslider
2017-12-07 21:01:53 +09:00
805c61d032
Merge pull request #1603 from santerinogelainen/header-button-should-derive
...
Fix beatmap overlay buttons not conforming to design
2017-12-07 20:56:15 +09:00
d52b84df46
Move KeyboardStep assignment to ctor
2017-12-07 20:53:28 +09:00
46cd6fdb45
Merge remote-tracking branch 'origin/master' into fix-sensitivityslider
2017-12-07 20:49:48 +09:00
24b3b10942
Move drawable assignment to load, remove depth overrides
2017-12-07 20:44:55 +09:00
8c89354b36
Remove extra whitespace
2017-12-07 20:44:38 +09:00
d36982b1d9
Merge branch 'master' into header-button-should-derive
2017-12-07 20:04:41 +09:00
fe2cc4daad
Merge pull request #1663 from peppy/input-revamp
...
Apply changes in line with framework input adjustments
2017-12-07 18:47:40 +09:00
13d0524542
Update framework
2017-12-07 18:37:54 +09:00
c35c8263b9
Merge remote-tracking branch 'upstream/master' into input-revamp
2017-12-07 18:07:26 +09:00
2a0b37e192
Merge pull request #1638 from Aergwyn/fix-beatmap-carousel-lag
...
Fix lagging beatmap carousel because of storyboard-loading
2017-12-07 18:04:38 +09:00
2a1a9b9f1f
Fix post-merge issue
2017-12-07 17:26:39 +09:00
44ee11e75f
Merge branch 'master' into fix-beatmap-carousel-lag
2017-12-07 15:30:50 +09:00
a78441bc5a
Apply changes in line with framework input adjustments
2017-12-07 13:16:59 +09:00
de6d1cc647
Merge pull request #1660 from peppy/shader-precompile
...
Add shader precompile step
2017-12-07 04:25:15 +09:00
9c4ca46786
Merge branch 'master' into shader-precompile
2017-12-07 04:15:24 +09:00
eaffd496f2
Merge pull request #1661 from peppy/fix-async-is-loaded
...
Fix IsValueCreated method not checking whether the async task was completed
2017-12-07 01:28:28 +09:00
8e3cce798d
Merge branch 'master' into fix-async-is-loaded
2017-12-06 23:01:38 +09:00
34596b3368
Rename and comment for clarification
2017-12-06 21:47:48 +09:00
04ae64e9fd
Add missing IsCompleted check to ensureValid
2017-12-06 16:20:49 +09:00
988cc27f0e
Update framework
2017-12-06 11:59:53 +09:00
15ed3b4aac
Fix IsValueCreated method not cecking whether the async task was completed
...
Caused potential stutters for components that relied on this check.
2017-12-06 09:49:12 +09:00
fb6408257a
Add shader precompile step
...
Resolves https://github.com/ppy/osu-framework/issues/1180 in a way.
2017-12-05 17:41:47 +09:00
abf5f3b390
Merge pull request #1658 from peppy/add-wait-for-restart
...
Wait until track has restarted before continuing operation
2017-12-05 14:24:25 +09:00
c1b607fed9
Wait until track has restarted before continuing operation
...
I removed this from my previous PR thinking it was not required, but it turned out to be required after all. Just isn't so noticeable when it fails.
2017-12-05 14:06:40 +09:00
634700fae5
Merge pull request #1649 from Aergwyn/fix-playlist-audio-issue
...
Fix MusicController constantly trying to start a track
2017-12-05 01:11:13 +09:00
b4641142a8
Update framework once more
2017-12-05 01:00:06 +09:00
caee6c1cf1
Use Restart instead of Start
2017-12-04 21:40:26 +09:00
7649a31157
Update framework
2017-12-04 20:32:50 +09:00
a83add8540
Tidy up events
2017-12-04 20:30:56 +09:00
22656233d3
Merge branch 'master' into fix-playlist-audio-issue
2017-12-04 19:24:03 +09:00
58777a9674
Merge pull request #1636 from smoogipoo/editor-composer
...
Implement structure for Editor HitObject composition
2017-12-04 13:05:27 +09:00
d75db5046b
Merge branch 'master' into editor-composer
2017-12-04 12:41:40 +09:00
23c0bec678
Merge pull request #1653 from smoogipoo/osuscreen-exit
...
Add OnKeyDown override to OsuScreen
2017-12-04 11:51:36 +09:00
7cfe694a3f
Update framework
2017-12-04 11:37:19 +09:00
5f9de399e4
Add keydown override
2017-12-04 11:30:25 +09:00
14096c90cc
removed looping if only one song is in the list (temporarily)
...
It had one problem in relation to SongSelect disabling it when left and in general that topic belongs to another PR.
2017-12-03 16:41:21 +01:00
9d13bf3602
remove redundant expression
2017-12-03 14:35:23 +01:00
dfa7448716
use ?: expression
2017-12-03 14:25:12 +01:00
0c9ebcd58c
fix possible NullRef
2017-12-03 14:15:08 +01:00
a1dbd7916b
fixes MusicController constantly trying to start a track
...
In Detail:
It tried to start a track if the current one ended even if no BeatmapSets were present.
Also if only one BeatmapSet is present if will loop by itself now.
2017-12-03 14:03:43 +01:00
7957e55710
Merge branch 'master' into editor-composer
2017-12-03 14:47:07 +09:00
5a6f59bed0
Merge pull request #1640 from peppy/catch-hyperdash
...
osu!catch hyperdash
2017-12-03 14:38:22 +09:00
ad8cd7eb5d
fix possible NullReference?
...
AppVeyor pls?
2017-12-02 17:04:42 +01:00
cc76c58f5f
fall back to .osu file for storyboard if no .osb file is present
...
+ CI fixes
2017-12-02 16:05:39 +01:00
2bbfe0dda1
expanded BeatmapDecoder tests, added StoryboardDecoder tests
2017-12-02 15:28:00 +01:00
2852337b04
Remove unused using
2017-12-02 20:35:47 +09:00
cd20d6df16
Apply suggested changes
2017-12-02 20:31:15 +09:00
