RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,691 Commits 3 Branches 651 Tags 357 MiB
Commit Graph

187 Commits

Author SHA1 Message Date
Thomas Müller 2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01:00
Thomas Müller a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Seth b4b88712ad Merge branch 'master' into mod-overlay 2017-02-23 08:00:24 -04:00
Dean Herbert 6701cd9016 Merge branch 'master' into general-fixes 2017-02-23 17:04:53 +09:00
Dean Herbert da2bfe6d3c
Framework updates. 2017-02-23 16:42:12 +09:00
DrabWeb 99f1f88c75 Merge https://github.com/ppy/osu into mod-overlay 2017-02-22 12:35:55 -04:00
Dean Herbert aef0eb49a1
Add loading screen. 2017-02-22 21:53:59 +09:00
Alex Amadori 6c161fb167 Merge remote-tracking branch 'upstream/master' 2017-02-21 18:15:46 +01:00
Thomas Müller 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
Alex Amadori 21cf96ec10 More sorting rookie mistakes 2017-02-18 16:23:13 +01:00
Alex Amadori d92382c1aa Merge remote-tracking branch 'upstream/master' 2017-02-18 15:18:26 +01:00
Alex Amadori 6bbbbd8f96 Implemented sorting in TestCasePlaySong 2017-02-18 15:11:40 +01:00
DrabWeb 006fb5502d ModSelect -> ModSelectOverlay, + WaveOverlayContainer, + ModButton selected colours, made song select OnExit not handle closing mod select 2017-02-18 07:28:22 -04:00
Dean Herbert 32ce8cf723
Audio class renames in line with framework changes. 2017-02-18 17:35:04 +09:00
Alex Amadori 7dcbefd50f Implemented basic sorting logic 2017-02-17 17:41:53 +01:00
Dean Herbert e6ef9f67aa
GameMode -> Screen. 2017-02-17 19:23:58 +09:00
DrabWeb 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
DrabWeb 0a58fc62db Added mod selection overlay 2017-02-16 16:05:03 -04:00
Dean Herbert d230c3f9ac
Correct masking layers on song select. 2017-02-08 20:39:17 +09:00
Dean Herbert 050fa7fbe8
Adjust FilterControl to match design and give an absolute height. 2017-02-08 20:30:45 +09:00
Dean Herbert 2e119cd74f
Handle toolbar offsets better. 2017-02-08 20:30:45 +09:00
Dean Herbert 6b011a50d2
Naming standardisation and enforcing. 2017-02-07 16:20:36 +09:00
Dean Herbert 50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Drew DeVault 437cc834eb @Tom94 pointed out this problem 2017-02-02 12:23:06 -05:00
Dean Herbert aec84ae725 Fix laggy animations, incorrect hiding logic. 2017-02-02 19:24:14 +09:00
Drew DeVault 2d691ca8d5 Use OnChange instead of OnCommit 
OnCommit only gets fired when focus is lost
 2017-02-01 19:12:24 -05:00
Drew DeVault b1a55f6b5e Use OnCommit instead of OnChange simplifies things 2017-01-31 19:48:33 -05:00
Drew DeVault f740707712 Initialize previousFilter to string.Empty 2017-01-31 19:45:42 -05:00
Drew DeVault 35a1479fc1 Fix extra click sound effect 2017-01-31 19:37:00 -05:00
Drew DeVault 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
Drew DeVault 5852657205 Refactor out Hidden 
Also fixes a bug I didn't think about before
 2017-01-30 22:35:09 -05:00
Drew DeVault 144a87a247 Fix focus interactions with search text box 2017-01-30 13:56:33 -05:00
Drew DeVault fb431fd44e &&=, unnecessary null check 2017-01-30 09:49:58 -05:00
Drew DeVault 9a2cba8520 Use null coalesce operator where appropriate 2017-01-30 09:48:21 -05:00
Drew DeVault 42a2285ef3 Make BeatmapGroup.Hidden more intelligent 2017-01-30 09:47:04 -05:00
Drew DeVault 0a81fdbd10 Update null background handling 2017-01-30 09:44:02 -05:00
Drew DeVault c00a558cb7 Merge remote-tracking branch 'upstream/master' into song-select-filtering 2017-01-30 09:35:14 -05:00
Dean Herbert 0272c4b559 Add StarDifficulty property and correct colouring of difficulty icons. 2017-01-30 15:26:28 +09:00
Drew DeVault 10897486ba Merge remote-tracking branch 'upstream/master' into song-select-filtering 2017-01-27 15:41:46 -05:00
Drew DeVault f3c5c1f0b8 Fixes following recent updates upstream 2017-01-26 21:31:28 -05:00
Dean Herbert 4a7b3cf391 Initial implementation of song select footer area. 2017-01-27 00:36:12 +09:00
Drew DeVault 678f0aaa16 Implement filtering with strings 2017-01-17 19:18:15 -05:00
Drew DeVault 46e7bcef8c Improve beatmap import 2017-01-17 17:05:06 -05:00
Drew DeVault 5eb1cda77b Rename FilterSongSelect, use OsuColour 2017-01-17 16:43:40 -05:00
Drew DeVault 63031fbc3d Move filter container z depth and add hover fx 2017-01-17 15:41:50 -05:00
Drew DeVault 73e46ee8c0 Initial layout of song select filtering UI 2017-01-17 15:41:50 -05:00
Dean Herbert ee0b6be84b Merge pull request #266 from kizayoi/master 
Add support for old beatmaps
 2017-01-16 16:02:22 +08:00
Drew DeVault f5f545df62 Refactor OsuColour into injected instance class 
Which should allow you to change the color palette in the future for
skinning purposes.
 2017-01-12 23:49:05 -05:00
Drew DeVault fa007e632d Refactor colors to palette based design 2017-01-12 16:38:27 -05:00
Drew DeVault c222be05c0 Add Color4.Opacity and OsuColor.Gray 2017-01-10 13:44:40 -05:00
Drew DeVault 70ecf48ca7 Add central color class 
I didn't move _every_ color here, but most of them. The ones I left
behind are mostly just shades of gray.

Closes #126
 2017-01-09 17:20:31 -05:00
柯十六夜 ef11c3f389 Add default Beatmap ID 2016-12-21 14:47:56 +08:00
柯十六夜 02f6e46105 Add support for v9 beatmaps 2016-12-20 23:56:49 +08:00
Thomas Müller 66435a515c Don't async/await song selection since audio operations are now on a separate thread. 2016-12-18 15:19:41 +01:00
Dean Herbert 6e10a9bb29 Allow starting maps by clicking an active panel a second time. 2016-12-18 16:59:13 +09:00
Dean Herbert 2cbc528971 Remove janky beatmap info wedge animation, restore pixel snapping. 2016-12-18 16:50:39 +09:00
Dean Herbert 3e42fa4f90 Merge pull request #247 from peppy/song-select-async-player 
Load player async
 2016-12-17 16:05:50 +09:00
BuildTools d37ff8f153 Deleted unnecesary things (I guess) 2016-12-15 17:35:14 -06:00
BuildTools b788878c95 Unnecesary things were removed (I guess) 2016-12-15 17:28:22 -06:00
BuildTools a845a897b3 Add Base Preview Time 2016-12-15 17:11:48 -06:00
Dean Herbert 8ce18e8986 Improve song select startup time via better database querying. Also fix difficulty displays. 2016-12-15 22:58:32 +09:00
Dean Herbert 08ef8ed8ea Add comment about future implementation. 2016-12-15 22:58:18 +09:00
Dean Herbert 8d800dac99 Make Player load async. 2016-12-15 22:58:00 +09:00
Dean Herbert 9557821776 Start a map using enter key. 2016-12-15 22:57:28 +09:00
Dean Herbert bbc11c77ca Add (temporary) transitions to songselect and player. 2016-12-07 20:47:28 +09:00
Dean Herbert 8fc8ca3998 Add song select panel sound effects. 2016-12-05 20:09:56 +09:00
stanriders 775e8ac5d6 Hardcoded button size, fixed input handling, fixed flash not being visible 2016-11-27 18:56:05 +03:00
stanriders ba18c9a309 Merged ExtendableButton and BackButton 2016-11-27 05:48:31 +03:00
stanriders e9343fe53d Add stable-alike BackButton 2016-11-27 04:21:12 +03:00
Dean Herbert af18d25357 Move some styling inside BeatmapInfoWedge and fix initial transition happening too early. 2016-11-26 17:31:35 +09:00
Drew DeVault 89effca12e Remove need for PlaySongSelect ctor to take a db 2016-11-25 00:44:46 -05:00
Dean Herbert ece3bc0e01 Refactor BeatmapInfoWedge to be async. 2016-11-24 13:48:48 +09:00
Dean Herbert 1eb04ff11e Don't use the overlay suffix for beatmapInfo wedge. 2016-11-24 13:35:25 +09:00
Dean Herbert 1e0b7dffc0 Move WedgeBackground to its own class and improve display a bit. 2016-11-23 14:29:20 +09:00
Dean Herbert 622b127180 One missing carousel rename. 2016-11-23 13:28:49 +09:00
Dean Herbert 2e05ec0296 Fix scaling of BeatmapInfoOverlay wedge. 2016-11-23 13:07:35 +09:00
Dean Herbert 611619fd9c Fix some namespaces. 2016-11-23 12:00:17 +09:00
Thomas Müller 5cf5e8c80c Move BeatmapInfoOverlay into its own class. 
No loading async optimizations yet.
 2016-11-22 21:51:42 +01:00
Thomas Müller 9bf23bc4ad Only handle beatmap panels that are visible in song select. 2016-11-22 21:41:48 +01:00
Thomas Müller ba1d3ab20e Carousell -> Carousel 2016-11-22 20:10:25 +01:00
Thomas Müller b22762d0e1 Merge branch 'master' of github.com:ppy/osu into better-song-select 2016-11-22 18:55:13 +01:00
Dean Herbert 4cf2dd90d6 Standardise and simplify the amount of beatmap information passed around song select. 2016-11-22 22:07:15 +09:00
Dean Herbert ccb00aeb94 Add comment about wedgedBeatmapInfo performance issues. 2016-11-22 21:43:35 +09:00
Dean Herbert a251db804c Stop adding beatmaps to song select when disposed. 2016-11-22 16:13:38 +09:00
Thomas Müller d32f11b5e2 Smoother movement within song select. 2016-11-21 07:59:46 +01:00
Thomas Müller 318fe2f9d6 Fix broken VisualTests SongSelect. 2016-11-20 20:43:43 +01:00
Thomas Müller c6d688898f Initial implementation of a beatmap carousell and various minor improvements to song select. 
No big optimizations yet, but groundwork is laid out.
 2016-11-20 20:34:16 +01:00