Commit Graph

1927 Commits

Author SHA1 Message Date
44ee11e75f Merge branch 'master' into fix-beatmap-carousel-lag 2017-12-07 15:30:50 +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
d75db5046b Merge branch 'master' into editor-composer 2017-12-04 12:41:40 +09:00
5f9de399e4 Add keydown override 2017-12-04 11:30:25 +09:00
7957e55710 Merge branch 'master' into editor-composer 2017-12-03 14:47:07 +09: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
c14d68e685 Use OsuColour for radio buttons 2017-12-02 20:30:18 +09:00
70b29b8b62 Merge branch 'master' into fix-set-hidden-crash 2017-12-01 23:35:48 +09:00
5be00cb0ec Add todo 2017-12-01 18:40:55 +09:00
0b95e36675 Fix RelativeChildSize error temporarily 2017-12-01 18:00:20 +09:00
016057ab01 readd storyboard to beatmap + minor cleanup 2017-11-30 16:49:53 +01:00
89772f4efd A few resharper fixes 2017-11-30 19:54:58 +09:00
e9cbef88f1 Improve selection/deselection behaviour of RadioButtonCollections 2017-11-30 19:50:07 +09:00
efa39f38ca CI fixes 2017-11-30 18:49:08 +09:00
e5353bb53e Add border to playfield, add shadow to toolbox buttons 2017-11-30 17:38:55 +09:00
456bbe25f3 Implement toolbox into HitObjectComposer 2017-11-30 16:58:14 +09:00
73e41f9dde Add constructors to RadioButton 2017-11-30 16:57:30 +09:00
ead7456978 Add compose radio buttons + testcase 2017-11-30 15:43:19 +09:00
abd6125691 Make sure that composerContainer is cleared for testing purposes 2017-11-30 14:00:17 +09:00
a7a9569aee Don't exit when we don't have composer for now 2017-11-30 13:53:57 +09:00
fd3049fd65 Merge remote-tracking branch 'origin/master' into editor-composer 2017-11-30 13:47:47 +09:00
acb2cafa58 fix wedge not appearing 2017-11-29 21:09:08 +01:00
28d925dc1d Merge branch 'master' into random-song-fix 2017-11-29 20:32:10 +09:00
b2fc50247c Hide metadata by default to avoid initial jump when no data present 2017-11-29 20:13:00 +09:00
2b7bf285e4 Improve code quality 2017-11-29 20:07:00 +09:00
6dd6f08bd0 Random song selection when entering the select menu with default osu theme or invalid beatmap 2017-11-29 11:51:56 +01:00
d4c1359a49 Merge branch 'master' into update-statistics-async 2017-11-29 19:27:22 +09:00
ee35422efc Handle rulesets that don't support composition a bit better 2017-11-29 18:38:12 +09:00
309eb4edd7 Integrate HitObjectComposer into Compose
Also removes the other rulesets' HitObjectComposers for now.
2017-11-29 17:46:21 +09:00
f586cbac32 Restructure Compose to use grids and eventually support HitObjectContainer 2017-11-29 16:47:52 +09:00
3bdf82d8df refactor newly added code to be less redundant 2017-11-28 21:38:11 +01:00
6a4cc93360 fixes crash if all beatmaps of a set are hidden 2017-11-28 21:26:13 +01:00
96d42b3e5b Fix redundant string interpolation 2017-11-27 18:20:13 +09:00
7877f42763 Merge remote-tracking branch 'upstream/master' into new-sounds-and-more 2017-11-27 17:59:24 +09:00
82a9b57277 Removed unnecessary "using" statement 2017-11-27 08:58:09 +01:00
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
507da0dfb7 Renamed addTextAsync to setTextAsync 2017-11-27 08:48:47 +01:00
ac0942df86 Removed unnecessary private method to update the metadata 2017-11-27 08:48:12 +01:00
d49ee295d9 Removed unnecessary schedule and null checks 2017-11-27 08:47:36 +01:00
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
a574b092f6 Merge branch 'master' into change-transition-blur-rate 2017-11-27 10:42:32 +09:00
77bfc6037d Merge branch 'master' into fix-stuck-in-play 2017-11-27 10:06:34 +09:00
55741f3898 Merge branch 'master' into show-converts-toggle 2017-11-27 09:41:30 +09:00
5aa6615107 Add confirm-selection sound in song select 2017-11-26 17:21:22 +09:00
af499df6dd Make a base OsuButton class to handle default samples 2017-11-26 17:17:48 +09:00
ae48b85827 Don't play logo select sample when actions are playing their own 2017-11-26 17:17:47 +09:00
07d6a70028 New sound effects with better names 2017-11-26 17:17:46 +09:00
69e388dd52 Adjust background blur rate 2017-11-26 17:08:14 +09:00
7be55df790 fix being stuck in gameplay if exit is pressed too fast
The reliance on `pauseOverlay.Alpha == 1` created a race condition that, when you pressed Exit while the pauseoverlay is still fading in, could get you stuck in gameplay.
The game wants to show the pause overlay but also thinks it's already paused and returns early.
2017-11-25 19:09:05 +01:00