Commit Graph

245 Commits

Author SHA1 Message Date
f7d985fe18 Fix and refactor star difficulty calculation boilerplate
Moves star difficulty calculation entry-point to Beatmap, and sets
star difficulty at the correct place for song select to display.
2017-02-24 19:36:17 +01:00
51b6075210 Merge remote-tracking branch 'upstream/master' 2017-02-24 16:54:37 +01:00
e2ae03e798 Merge with upstream/master 2017-02-24 16:54:27 +01:00
ea4639932c Simplify event names. 2017-02-24 17:21:14 +09:00
958bf54c31 Add safe deletion support. 2017-02-24 17:08:13 +09:00
6c3bda18b6 Add beatmap deletion support.
Note that this is a very naive approach and will result in file access exceptions. This will be fixed in a further commit.
2017-02-24 14:37:54 +09:00
3a89348413 Centralise access to WorkingBeatmaps.
They can now only be instantiated from BeatmapDatabase and are abstract (to avoid misuse).
2017-02-24 13:43:21 +09:00
c5552dfb27 Merge remote-tracking branch 'upstream/master' into remove-usings 2017-02-24 11:29:34 +09:00
2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01:00
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
b4b88712ad Merge branch 'master' into mod-overlay 2017-02-23 08:00:24 -04:00
6701cd9016 Merge branch 'master' into general-fixes 2017-02-23 17:04:53 +09:00
da2bfe6d3c Framework updates. 2017-02-23 16:42:12 +09:00
99f1f88c75 Merge https://github.com/ppy/osu into mod-overlay 2017-02-22 12:35:55 -04:00
aef0eb49a1 Add loading screen. 2017-02-22 21:53:59 +09:00
6c161fb167 Merge remote-tracking branch 'upstream/master' 2017-02-21 18:15:46 +01:00
417f146386 Add difficulty calculation
Adds base classes for difficulty calculations, hooks them up with
carousel container, and adds a port of the osu difficulty calculator.
2017-02-19 17:41:51 +01:00
21cf96ec10 More sorting rookie mistakes 2017-02-18 16:23:13 +01:00
d92382c1aa Merge remote-tracking branch 'upstream/master' 2017-02-18 15:18:26 +01:00
6bbbbd8f96 Implemented sorting in TestCasePlaySong 2017-02-18 15:11:40 +01:00
006fb5502d ModSelect -> ModSelectOverlay, + WaveOverlayContainer, + ModButton selected colours, made song select OnExit not handle closing mod select 2017-02-18 07:28:22 -04:00
32ce8cf723 Audio class renames in line with framework changes. 2017-02-18 17:35:04 +09:00
7dcbefd50f Implemented basic sorting logic 2017-02-17 17:41:53 +01:00
e6ef9f67aa GameMode -> Screen. 2017-02-17 19:23:58 +09:00
9fc3726925 ModSelector -> ModSelect, added mod descriptions, added per-mode mod selection, changed animations and made the wave mask properly 2017-02-16 18:32:27 -04:00
0a58fc62db Added mod selection overlay 2017-02-16 16:05:03 -04:00
d230c3f9ac Correct masking layers on song select. 2017-02-08 20:39:17 +09:00
050fa7fbe8 Adjust FilterControl to match design and give an absolute height. 2017-02-08 20:30:45 +09:00
2e119cd74f Handle toolbar offsets better. 2017-02-08 20:30:45 +09:00
6b011a50d2 Naming standardisation and enforcing. 2017-02-07 16:20:36 +09:00
50bd80cb0c Update and standardise license headers. 2017-02-07 14:27:41 +09:00
437cc834eb @Tom94 pointed out this problem 2017-02-02 12:23:06 -05:00
aec84ae725 Fix laggy animations, incorrect hiding logic. 2017-02-02 19:24:14 +09:00
2d691ca8d5 Use OnChange instead of OnCommit
OnCommit only gets fired when focus is lost
2017-02-01 19:12:24 -05:00
b1a55f6b5e Use OnCommit instead of OnChange simplifies things 2017-01-31 19:48:33 -05:00
f740707712 Initialize previousFilter to string.Empty 2017-01-31 19:45:42 -05:00
35a1479fc1 Fix extra click sound effect 2017-01-31 19:37:00 -05:00
4597a765b8 Fix escape key to exit PlaySongSelect
This is less than ideal but is the least disruptive solution. The
InputManager itself holds Escape keypresses from getting to anything
else if something is focused.
2017-01-31 19:00:54 -05:00
5852657205 Refactor out Hidden
Also fixes a bug I didn't think about before
2017-01-30 22:35:09 -05:00
144a87a247 Fix focus interactions with search text box 2017-01-30 13:56:33 -05:00
fb431fd44e &&=, unnecessary null check 2017-01-30 09:49:58 -05:00
9a2cba8520 Use null coalesce operator where appropriate 2017-01-30 09:48:21 -05:00
42a2285ef3 Make BeatmapGroup.Hidden more intelligent 2017-01-30 09:47:04 -05:00
0a81fdbd10 Update null background handling 2017-01-30 09:44:02 -05:00
c00a558cb7 Merge remote-tracking branch 'upstream/master' into song-select-filtering 2017-01-30 09:35:14 -05:00
0272c4b559 Add StarDifficulty property and correct colouring of difficulty icons. 2017-01-30 15:26:28 +09:00
10897486ba Merge remote-tracking branch 'upstream/master' into song-select-filtering 2017-01-27 15:41:46 -05:00
f3c5c1f0b8 Fixes following recent updates upstream 2017-01-26 21:31:28 -05:00
4a7b3cf391 Initial implementation of song select footer area. 2017-01-27 00:36:12 +09:00
678f0aaa16 Implement filtering with strings 2017-01-17 19:18:15 -05:00