Dan Balasescu
|
7584c7df53
|
Merge pull request #1675 from FreezyLemon/fix-interests-typo
Fixed small typo. (User.Intrerests -> Interests)
|
2017-12-08 21:13:49 +09:00 |
|
Aergwyn
|
dde7678095
|
select beatmap on import/download
|
2017-12-08 13:09:30 +01:00 |
|
FreezyLemon
|
856b56d79c
|
Fixed small typo.
|
2017-12-08 12:54:36 +01:00 |
|
FreezyLemon
|
e1c04a1f44
|
Added check for "menu music beatmap hash" before undeleting so circles.osu doesn't get imported on Undelete. Also moved the const property to BeatmapManager.
|
2017-12-08 12:50:04 +01:00 |
|
Aergwyn
|
3e417d8e30
|
removed specific AddBeatmap method
the way UpdateBeatmapSet was extended it can handle all of this and better
|
2017-12-08 12:47:28 +01:00 |
|
FreezyLemon
|
b1270a84f8
|
Added handling for rank == 0 (unranked), removed "#0" from country name if that happens, also display "no rank" when hovering over history instead of "#0"
|
2017-12-08 11:31:32 +01:00 |
|
FreezyLemon
|
4a723f7382
|
Added the "Service Include" tag that is used by Visual Studio's test explorer to the .csproj files
|
2017-12-08 11:05:00 +01:00 |
|
Dean Herbert
|
679134c030
|
Add ShortName to rulesets
|
2017-12-08 18:55:25 +09:00 |
|
Dean Herbert
|
51dc66df12
|
Add support for relevance based search results in osu!direct
|
2017-12-08 18:48:36 +09:00 |
|
FreezyLemon
|
d93a1fdaae
|
Merge branch 'master' of https://github.com/ppy/osu into undelete-button-add
|
2017-12-08 10:30:42 +01:00 |
|
smoogipoo
|
5341e79102
|
Remove SelectionDragger for now
|
2017-12-08 17:51:15 +09:00 |
|
smoogipoo
|
faa921ba05
|
Fix up post-merge issues
|
2017-12-08 17:41:10 +09:00 |
|
Dean Herbert
|
31884a951a
|
Remove "redundant" parenthesis
|
2017-12-08 15:53:59 +09:00 |
|
smoogipoo
|
f41af191ed
|
Merge remote-tracking branch 'origin/master' into editor-selection-tool
|
2017-12-08 15:13:18 +09:00 |
|
Dean Herbert
|
2e1dfa16a2
|
Fix checks disallowing import of older beatmaps with no embedded online IDs
|
2017-12-08 14:59:32 +09:00 |
|
Aergwyn
|
105d01d85b
|
fix crash when restoring from any non-SongSelect-screen
removed unwanted refresh
|
2017-12-07 22:02:53 +01:00 |
|
Aergwyn
|
95955d68ef
|
rephrased description of local context checking
|
2017-12-07 14:14:50 +01:00 |
|
Aergwyn
|
1dcbfab18e
|
removed redundant comment
|
2017-12-07 13:56:37 +01:00 |
|
Aergwyn
|
76c09ae59e
|
added comments for local context checking
|
2017-12-07 13:44:47 +01:00 |
|
Dean Herbert
|
5330ca1fa9
|
Merge pull request #1635 from awesomecuber/fix-sensitivityslider
Fix SensitivitySlider keyboard control
|
2017-12-07 21:16:42 +09:00 |
|
Dan Balasescu
|
9e37a122e1
|
Merge branch 'master' into fix-sensitivityslider
|
2017-12-07 21:01:53 +09:00 |
|
Dean Herbert
|
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 |
|
smoogipoo
|
d52b84df46
|
Move KeyboardStep assignment to ctor
|
2017-12-07 20:53:28 +09:00 |
|
smoogipoo
|
46cd6fdb45
|
Merge remote-tracking branch 'origin/master' into fix-sensitivityslider
|
2017-12-07 20:49:48 +09:00 |
|
Dean Herbert
|
24b3b10942
|
Move drawable assignment to load, remove depth overrides
|
2017-12-07 20:44:55 +09:00 |
|
Dean Herbert
|
8c89354b36
|
Remove extra whitespace
|
2017-12-07 20:44:38 +09:00 |
|
Dean Herbert
|
d36982b1d9
|
Merge branch 'master' into header-button-should-derive
|
2017-12-07 20:04:41 +09:00 |
|
Dean Herbert
|
f2eef6621a
|
Merge branch 'master' into fix-missing-metadata
|
2017-12-07 19:23:51 +09:00 |
|
Dan Balasescu
|
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 |
|
Dean Herbert
|
13d0524542
|
Update framework
|
2017-12-07 18:37:54 +09:00 |
|
Dean Herbert
|
c35c8263b9
|
Merge remote-tracking branch 'upstream/master' into input-revamp
|
2017-12-07 18:07:26 +09:00 |
|
Dean Herbert
|
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 |
|
Dean Herbert
|
2a1a9b9f1f
|
Fix post-merge issue
|
2017-12-07 17:26:39 +09:00 |
|
Dean Herbert
|
44ee11e75f
|
Merge branch 'master' into fix-beatmap-carousel-lag
|
2017-12-07 15:30:50 +09:00 |
|
Dean Herbert
|
a78441bc5a
|
Apply changes in line with framework input adjustments
|
2017-12-07 13:16:59 +09:00 |
|
Dan Balasescu
|
de6d1cc647
|
Merge pull request #1660 from peppy/shader-precompile
Add shader precompile step
|
2017-12-07 04:25:15 +09:00 |
|
Dan Balasescu
|
9c4ca46786
|
Merge branch 'master' into shader-precompile
|
2017-12-07 04:15:24 +09:00 |
|
Dan Balasescu
|
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 |
|
Dan Balasescu
|
8e3cce798d
|
Merge branch 'master' into fix-async-is-loaded
|
2017-12-06 23:01:38 +09:00 |
|
Dean Herbert
|
34596b3368
|
Rename and comment for clarification
|
2017-12-06 21:47:48 +09:00 |
|
Dean Herbert
|
04ae64e9fd
|
Add missing IsCompleted check to ensureValid
|
2017-12-06 16:20:49 +09:00 |
|
Dean Herbert
|
988cc27f0e
|
Update framework
|
2017-12-06 11:59:53 +09:00 |
|
Dean Herbert
|
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 |
|
Dean Herbert
|
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 |
|
Dan Balasescu
|
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 |
|
Dean Herbert
|
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 |
|
Dean Herbert
|
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 |
|
Dean Herbert
|
b4641142a8
|
Update framework once more
|
2017-12-05 01:00:06 +09:00 |
|
Dean Herbert
|
caee6c1cf1
|
Use Restart instead of Start
|
2017-12-04 21:40:26 +09:00 |
|
Dean Herbert
|
7649a31157
|
Update framework
|
2017-12-04 20:32:50 +09:00 |
|