1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 10:42:54 +08:00
Commit Graph

6349 Commits

Author SHA1 Message Date
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
Dean Herbert
9bce322682
Merge branch 'master' into wedge-unicode 2018-01-04 15:09:31 +09: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
Felix Ang
dccc134efa Don't allow auto to fail 2018-01-02 17:53:29 +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
Dean Herbert
f72239ef7a Centralise deselect logic and add animation to deselection 2018-01-02 16:09:22 +09:00
Dean Herbert
71bcebe7e1 Fix selections occurring even though buttons aren't selected 2018-01-02 16:08:48 +09:00
Dean Herbert
c0dd812a4c Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods 2018-01-02 15:33:08 +09:00
Dean Herbert
f419518887 Make comment xmldoc 2018-01-02 15:33:00 +09:00
Dean Herbert
4f8a830fbf Fix potential race condition with score retrieval 2018-01-02 15:30:29 +09:00
Dean Herbert
161e8d44b4
Merge branch 'master' into supporter-leaderboards 2018-01-02 15:09:52 +09:00
Dan Balasescu
5f3dbfef47
Merge branch 'master' into hide-unavailable-functions 2018-01-02 12:59:12 +09:00
Dan Balasescu
91c49913c9
Merge branch 'master' into focused-overlay-improvements 2018-01-02 12:44:09 +09:00
Dean Herbert
7154efa1c6 Refresh import context on import error 2018-01-02 12:31:21 +09:00
Dean Herbert
2354163900 Change icon for audio settings 2018-01-02 12:30:55 +09:00
Felix Ang
755befdf84 Check for supporter before displaying loading spinner 2018-01-01 14:30:53 +01:00
Dean Herbert
2079b7239c
Merge branch 'master' into result-page-date-order 2017-12-31 13:11:55 +09:00
Dean Herbert
77f6f25ad3
Merge branch 'master' into wedge-unicode 2017-12-31 13:09:41 +09:00
Dean Herbert
dfee8e911f Fix dummy beatmap selection not propagating to song select components 2017-12-31 12:55:53 +09:00
Dean Herbert
02514d4228 Update tests to account for correct beatmap displaying on details area 2017-12-31 12:54:27 +09:00
Dean Herbert
94b761e63e Remove local storage for now 2017-12-31 12:22:17 +09:00
Dean Herbert
f2d302f8dc Create a LargeTextureStore for cached (but not atlased) global textures
Also
- Fixes first transition depth being incorrect.
- Improves smoothness of transitions (and adds a slight delay to offset from screen switches).
2017-12-31 07:05:04 +09:00
Aergwyn
3d66b879a7 use ToShortTimeString to create a time depending on current culture 2017-12-30 22:45:28 +01:00
Aergwyn
2a0699f13c use ToShortDateString to create a date depending on current culture 2017-12-30 22:41:01 +01:00
Aergwyn
0dad9cbe53 change date to be more friendly to read 2017-12-30 21:49:05 +01:00
Aergwyn
d6af8ad748 swap date and time in ResultsPageScore 2017-12-30 21:48:49 +01:00
Aergwyn
61bbb66996 sort resultpage hitresults descending
HitCount was good to bad but HitResult is the opposite. To account for this just descending order on the result page.
2017-12-30 21:27:15 +01:00
Aergwyn
ccb69d16d9 move HitResult in Scoring namespace to replace HitCount 2017-12-30 21:23:18 +01:00
ColdVolcano
13900d6130 Use LocalisationEngine on BeatmapInfoWedge 2017-12-30 14:12:47 -06:00
Dean Herbert
c002d4e1d2
Merge branch 'master' into result-page-sorting 2017-12-31 04:34:48 +09:00
Dean Herbert
1c80f3e918 Disallow selection of non-implemented mods 2017-12-31 04:28:51 +09:00
Dean Herbert
d9a80dae5d Male NoFail use an applicable interface 2017-12-31 04:10:29 +09:00
Dean Herbert
fea4e1ff68 Add a base interface for applicable mods 2017-12-31 04:09:51 +09:00