Dean Herbert
|
16b8c9bd11
|
Merge branch 'master' into fix-crash-hidden-sets#2
|
2017-12-09 11:51:47 +09:00 |
|
Aergwyn
|
dde7678095
|
select beatmap on import/download
|
2017-12-08 13:09:30 +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 |
|
Aergwyn
|
105d01d85b
|
fix crash when restoring from any non-SongSelect-screen
removed unwanted refresh
|
2017-12-07 22:02:53 +01:00 |
|
Dean Herbert
|
44ee11e75f
|
Merge branch 'master' into fix-beatmap-carousel-lag
|
2017-12-07 15:30:50 +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 |
|
Aergwyn
|
12665fb8cf
|
remove unnecessary declaration + revert accidental formatting
|
2017-12-04 12:11:28 +01:00 |
|
Aergwyn
|
011223048b
|
fix crash if any amount of maps were restored from main menu
also fixes preview not playing if an entire set is restored
|
2017-12-04 11:47:27 +01:00 |
|
Dean Herbert
|
d75db5046b
|
Merge branch 'master' into editor-composer
|
2017-12-04 12:41:40 +09:00 |
|
smoogipoo
|
5f9de399e4
|
Add keydown override
|
2017-12-04 11:30:25 +09:00 |
|
Dean Herbert
|
7957e55710
|
Merge branch 'master' into editor-composer
|
2017-12-03 14:47:07 +09:00 |
|
smoogipoo
|
2852337b04
|
Remove unused using
|
2017-12-02 20:35:47 +09:00 |
|
smoogipoo
|
cd20d6df16
|
Apply suggested changes
|
2017-12-02 20:31:15 +09:00 |
|
smoogipoo
|
c14d68e685
|
Use OsuColour for radio buttons
|
2017-12-02 20:30:18 +09:00 |
|
Dean Herbert
|
70b29b8b62
|
Merge branch 'master' into fix-set-hidden-crash
|
2017-12-01 23:35:48 +09:00 |
|
smoogipoo
|
5be00cb0ec
|
Add todo
|
2017-12-01 18:40:55 +09:00 |
|
smoogipoo
|
0b95e36675
|
Fix RelativeChildSize error temporarily
|
2017-12-01 18:00:20 +09:00 |
|
Aergwyn
|
016057ab01
|
readd storyboard to beatmap + minor cleanup
|
2017-11-30 16:49:53 +01:00 |
|
smoogipoo
|
89772f4efd
|
A few resharper fixes
|
2017-11-30 19:54:58 +09:00 |
|
smoogipoo
|
e9cbef88f1
|
Improve selection/deselection behaviour of RadioButtonCollections
|
2017-11-30 19:50:07 +09:00 |
|
smoogipoo
|
efa39f38ca
|
CI fixes
|
2017-11-30 18:49:08 +09:00 |
|
smoogipoo
|
e5353bb53e
|
Add border to playfield, add shadow to toolbox buttons
|
2017-11-30 17:38:55 +09:00 |
|
smoogipoo
|
456bbe25f3
|
Implement toolbox into HitObjectComposer
|
2017-11-30 16:58:14 +09:00 |
|
smoogipoo
|
73e41f9dde
|
Add constructors to RadioButton
|
2017-11-30 16:57:30 +09:00 |
|
smoogipoo
|
ead7456978
|
Add compose radio buttons + testcase
|
2017-11-30 15:43:19 +09:00 |
|
smoogipoo
|
abd6125691
|
Make sure that composerContainer is cleared for testing purposes
|
2017-11-30 14:00:17 +09:00 |
|
smoogipoo
|
a7a9569aee
|
Don't exit when we don't have composer for now
|
2017-11-30 13:53:57 +09:00 |
|
smoogipoo
|
fd3049fd65
|
Merge remote-tracking branch 'origin/master' into editor-composer
|
2017-11-30 13:47:47 +09:00 |
|
Aergwyn
|
acb2cafa58
|
fix wedge not appearing
|
2017-11-29 21:09:08 +01:00 |
|
Dean Herbert
|
28d925dc1d
|
Merge branch 'master' into random-song-fix
|
2017-11-29 20:32:10 +09:00 |
|
Dean Herbert
|
b2fc50247c
|
Hide metadata by default to avoid initial jump when no data present
|
2017-11-29 20:13:00 +09:00 |
|
Dean Herbert
|
2b7bf285e4
|
Improve code quality
|
2017-11-29 20:07:00 +09:00 |
|
mattiapette
|
6dd6f08bd0
|
Random song selection when entering the select menu with default osu theme or invalid beatmap
|
2017-11-29 11:51:56 +01:00 |
|
Dean Herbert
|
d4c1359a49
|
Merge branch 'master' into update-statistics-async
|
2017-11-29 19:27:22 +09:00 |
|
smoogipoo
|
ee35422efc
|
Handle rulesets that don't support composition a bit better
|
2017-11-29 18:38:12 +09:00 |
|
smoogipoo
|
309eb4edd7
|
Integrate HitObjectComposer into Compose
Also removes the other rulesets' HitObjectComposers for now.
|
2017-11-29 17:46:21 +09:00 |
|
smoogipoo
|
f586cbac32
|
Restructure Compose to use grids and eventually support HitObjectContainer
|
2017-11-29 16:47:52 +09:00 |
|
Aergwyn
|
3bdf82d8df
|
refactor newly added code to be less redundant
|
2017-11-28 21:38:11 +01:00 |
|
Aergwyn
|
6a4cc93360
|
fixes crash if all beatmaps of a set are hidden
|
2017-11-28 21:26:13 +01:00 |
|
Dean Herbert
|
96d42b3e5b
|
Fix redundant string interpolation
|
2017-11-27 18:20:13 +09:00 |
|
Dean Herbert
|
7877f42763
|
Merge remote-tracking branch 'upstream/master' into new-sounds-and-more
|
2017-11-27 17:59:24 +09:00 |
|
FreezyLemon
|
82a9b57277
|
Removed unnecessary "using" statement
|
2017-11-27 08:58:09 +01:00 |
|
FreezyLemon
|
b4513497d6
|
Added a textContainer reference to MetadataSection so casting is no longer required for setting new text
|
2017-11-27 08:52:26 +01:00 |
|
FreezyLemon
|
507da0dfb7
|
Renamed addTextAsync to setTextAsync
|
2017-11-27 08:48:47 +01:00 |
|
FreezyLemon
|
ac0942df86
|
Removed unnecessary private method to update the metadata
|
2017-11-27 08:48:12 +01:00 |
|
FreezyLemon
|
d49ee295d9
|
Removed unnecessary schedule and null checks
|
2017-11-27 08:47:36 +01:00 |
|
FreezyLemon
|
b34e724b8d
|
Changed MetadataSection so that the Text setter loads the new text in async before displaying it.
|
2017-11-27 08:18:09 +01:00 |
|
Dan Balasescu
|
a574b092f6
|
Merge branch 'master' into change-transition-blur-rate
|
2017-11-27 10:42:32 +09:00 |
|
Dan Balasescu
|
77bfc6037d
|
Merge branch 'master' into fix-stuck-in-play
|
2017-11-27 10:06:34 +09:00 |
|
Dan Balasescu
|
55741f3898
|
Merge branch 'master' into show-converts-toggle
|
2017-11-27 09:41:30 +09:00 |
|