1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-26 03:02:54 +08:00
Commit Graph

10251 Commits

Author SHA1 Message Date
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
Dean Herbert
4ee845fea8 Adjust border thickness and fade out rate of border 2018-01-03 19:15:25 +09:00
smoogipoo
b68daaeb4b Group -> Stage 2018-01-03 19:13:42 +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
b137c3b2ca Adjust ticks size 2018-01-03 18:35:43 +09:00
Dean Herbert
921ca6956d Improve fruit visuals 2018-01-03 18:26:54 +09:00
Dean Herbert
cf1f84cc32 Give fruit a border 2018-01-03 16:32:58 +09:00
Dean Herbert
fd34b36e1a Add fruit drawable testcase 2018-01-03 16:32:09 +09:00
Dean Herbert
02131d75d4 Let fruits know what index they are in the beatmap to draw a visual representation 2018-01-03 16:31:57 +09:00
Aergwyn
d94c313947 fix slider follow circle instantly disappearing on slider ends 2018-01-03 08:13:58 +01:00
Dean Herbert
31865b4d96 Rename conflicting variable 2018-01-03 15:12:27 +09:00
Dean Herbert
c92345cf21 Give fruit a border 2018-01-03 14:46:52 +09:00
Dean Herbert
d72bbf037d
Merge pull request #1832 from peppy/change-audio-settings-icon
Change icon for audio settings
2018-01-03 14:42:39 +09:00
Dean Herbert
532c455f92
Merge branch 'master' into change-audio-settings-icon 2018-01-03 14:34:21 +09:00
Dean Herbert
494b1893e9
Merge pull request #1831 from peppy/fix-import-context-state
Fix errors on import
2018-01-03 14:34:05 +09:00
Dan Balasescu
7ba59d9d56
Merge branch 'master' into fix-import-context-state 2018-01-03 14:21:04 +09:00
Dan Balasescu
b80a393bac
Merge pull request #1820 from peppy/fix-play-song-select-tests
Fix song select dummy beatmap once and for all
2018-01-03 14:21:00 +09:00
Dan Balasescu
2a6068f8e7
Merge branch 'master' into fix-play-song-select-tests 2018-01-03 14:12:49 +09:00
Dan Balasescu
267e624e8c
Merge pull request #1837 from peppy/fix-testcase-performance
Fix TestCasePerformancePoints binding to global beatmap
2018-01-03 14:12:36 +09:00
Dan Balasescu
e6df965da7
Merge branch 'master' into fix-testcase-performance 2018-01-03 14:04:34 +09:00
Dan Balasescu
faa9ecd733
Merge pull request #1817 from peppy/large-texture-store
Create a LargeTextureStore for cached (but not atlased) global textures
2018-01-03 14:04:29 +09:00
Dan Balasescu
262a7f7d19
Merge branch 'master' into large-texture-store 2018-01-03 13:56:39 +09:00
Dan Balasescu
5a4500939b
Merge pull request #1811 from peppy/disable-unimplemented-mods
Clearly mark unimplemented mods and make them non-selectable
2018-01-03 13:56:26 +09:00
Dan Balasescu
d167663340
Merge branch 'master' into large-texture-store 2018-01-03 13:50:49 +09:00
Dean Herbert
31b875b7cd Add test for unranked mod using mania random 2018-01-03 13:42:09 +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
Dean Herbert
254490def1
Merge pull request #1828 from Aergwyn/hitobject-tests
Extend TestCases for HitObjects
2018-01-03 13:12:28 +09:00
Dean Herbert
7b018d4d43 Update framework 2018-01-03 12:56:08 +09:00
Dean Herbert
fb7ff32c07
Merge branch 'master' into hitobject-tests 2018-01-03 12:35:43 +09:00
Dean Herbert
a293ee2699
Merge pull request #1836 from fangerm/auto-nofail
Don't allow auto to fail
2018-01-03 12:02:14 +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
Aergwyn
9ddbed6729 crop slider length to not go out of bounds on small screens/ratios
+ use correct methods for short and fast sliders, ooops
2018-01-02 17:10:05 +01:00
Aergwyn
737a53d826 clean up RequiredTypes 2018-01-02 17:04:00 +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
3a7098340a Add test for unimplemented mod 2018-01-02 16:58:22 +09:00
Dean Herbert
f10a19ada1 Update tests to only use implemented mods 2018-01-02 16:55:15 +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