Commit Graph

6391 Commits

Author SHA1 Message Date
Aergwyn 4ce125478a remove unnecessary Schedules
one was bugging out when rapidly switching display styles and the other was... unnecessary
2018-01-09 19:03:23 +01:00
Aergwyn 44d821172a tidying up 2018-01-09 16:29:12 +01:00
Dean Herbert 1c9e9cb8af
Merge branch 'master' into expand-social-tab 2018-01-09 21:08:26 +09:00
Dean Herbert a3f05ca9ec Avoid unnecessary use of linq 2018-01-09 12:43:10 +09:00
Dean Herbert b90b1e326e
Merge branch 'master' into fix-randomizer 2018-01-09 12:00:21 +09:00
Dean Herbert 4c0259a040
Merge branch 'master' into fix-storyboard-variables 2018-01-09 11:50:03 +09:00
Aergwyn f6c168be27 add skip cutscene as "in game" keybinding 2018-01-08 18:22:43 +01:00
Aergwyn d9866a2052 fix hover effects on social panels 2018-01-06 11:27:17 +01:00
Aergwyn a61666d2a7 update licence headers 2018-01-06 10:54:53 +01:00
Aergwyn e6b581e259 Merge branch 'master' into expand-social-tab 2018-01-06 10:48:27 +01:00
Aergwyn 57b44b8c29 fix new panels appearing too soon 2018-01-06 10:40:18 +01:00
Aergwyn 140a09ba3d fix requests not cancelling properly + formatting 2018-01-05 19:13:54 +01:00
Dean Herbert d1f03ebf0c Update in line with framework 2018-01-05 20:29:14 +09:00
Dean Herbert 37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
Dean Herbert 01038bd9bb
Merge branch 'master' into mania-rc-cleanup 2018-01-05 10:18:15 +09:00
smoogipoo 5eb2dc3d64 Cleanup some possible CI errors
Not sure why these aren't being detected on master right now - they should be...
2018-01-05 01:20:24 +09:00
james58899 0158246ba1
AppVeyor 2018-01-04 19:23:00 +08:00
james58899 dcc4e863ab
move variables to StoryboardDecoder 2018-01-04 19:04:52 +08:00
Aergwyn 038fa682f7 Merge branch 'master' into expand-social-tab 2018-01-04 11:49:35 +01:00
Aergwyn bf64b8fc69 added hover effects to panels in social
at least partially QQ
2018-01-04 11:42:50 +01:00
Aergwyn d0c9d71ee7 fix covers not showing in user panels 2018-01-04 08:15:11 +01:00
Dean Herbert 9bce322682
Merge branch 'master' into wedge-unicode 2018-01-04 15:09:31 +09:00
Aergwyn 9b70578af6 enabled Location as filter tab
forgot it QQ
2018-01-03 19:01:10 +01:00
Aergwyn 9d29adce27 bring social tab+filter behaviour closer to direct 2018-01-03 17:54:20 +01:00
Aergwyn 988f6ac901 fix SortDirection default to descending when retrieved data is ascending 2018-01-03 17:53:50 +01:00
Aergwyn 0e361aefeb added new tabs and sort criteria 2018-01-03 17:52:11 +01:00
Endrik Tombak ce156098f6 Merge branch 'fix-randomizer' of https://github.com/LittleEndu/osu into fix-randomizer 2018-01-03 12:33:43 +02:00
Endrik Tombak 969fa65c42 Merge branch 'master' of https://github.com/ppy/osu into fix-randomizer 2018-01-03 12:31:59 +02:00
Endrik 35af5d1ce6
Merge branch 'master' into fix-randomizer 2018-01-03 12:25:07 +02:00
smoogipoo 6d253fd33c Add a way to adjust the conversion process with mods 2018-01-03 19:06:20 +09:00
james58899 89fe567496
use FileSafety.PathSanitise 2018-01-03 17:57:24 +08:00
smoogipoo bd171926d6 Remove AvailableColumns from ManiaRulesetContainer
Also restructures with the addition of a ManiaBeatmap which holds definitions for "groups" of columns. At the moment these are empty save for a "Column" property, but can be expanded in the future, maybe.
2018-01-03 18:44:25 +09:00
Dean Herbert 532c455f92
Merge branch 'master' into change-audio-settings-icon 2018-01-03 14:34:21 +09:00
Dan Balasescu 7ba59d9d56
Merge branch 'master' into fix-import-context-state 2018-01-03 14:21:04 +09:00
Dan Balasescu 2a6068f8e7
Merge branch 'master' into fix-play-song-select-tests 2018-01-03 14:12:49 +09:00
Dan Balasescu e6df965da7
Merge branch 'master' into fix-testcase-performance 2018-01-03 14:04:34 +09:00
Dan Balasescu 262a7f7d19
Merge branch 'master' into large-texture-store 2018-01-03 13:56:39 +09:00
Dan Balasescu d167663340
Merge branch 'master' into large-texture-store 2018-01-03 13:50:49 +09:00
Dean Herbert b8fa33459a Merge branch 'master' into disable-unimplemented-mods 2018-01-03 13:39:29 +09:00
Dean Herbert 61c2bf7ebe Fix TestCasePerformancePoints binding to global beatmap
and never unbinding
2018-01-03 13:34:27 +09:00
Dan Balasescu fa6db30d30
Fix broken xmldoc param 2018-01-03 13:12:49 +09:00
Dean Herbert 2291053205
Merge branch 'master' into wedge-unicode 2018-01-03 13:12:42 +09:00
Felix Ang 3e6f0c198c Remove tab 2018-01-02 18:02:04 +01:00
Aergwyn 699902234b remove unused code 2018-01-02 17:58:11 +01:00
Felix Ang dccc134efa Don't allow auto to fail 2018-01-02 17:53:29 +01:00
Aergwyn 52c2ba49cf make loading indicator more visible by deleting panels preemptively 2018-01-02 17:42:44 +01:00
Aergwyn 313dfd4d46 remove unnecessary task + rename method 2018-01-02 17:22:12 +01:00
Aergwyn a00f92dcb4 change unnecessary cast 2018-01-02 17:18:49 +01:00
Dean Herbert 1c3541f18e Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods 2018-01-02 16:58:28 +09:00
Dean Herbert 0e1b033008 Improve mod cycling logic further 2018-01-02 16:55:03 +09:00