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

9673 Commits

Author SHA1 Message Date
ANDY840119-PC\andy840119
eb37c361d8 fix framework branch 2018-01-06 10:34:45 +09:00
Dean Herbert
01038bd9bb
Merge branch 'master' into mania-rc-cleanup 2018-01-05 10:18:15 +09:00
Dean Herbert
c26db17e0b
Merge pull request from smoogipoo/ci-cleaunps
Cleanup some possible CI errors
2018-01-05 10:00:24 +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
8c2cc4c85b
Merge pull request from Aergwyn/fix-slider-follow-circle
Fix slider follow circle instantly disappearing on slider ends
2018-01-04 21:03:14 +09:00
Dean Herbert
0cc8516aa3
Remove empty cases, add initial ball scale adjust. 2018-01-04 20:53:33 +09:00
Dean Herbert
717b263b77 Comment and better stacking of FadeOuts 2018-01-04 20:47:42 +09:00
Dean Herbert
1f62fe19d5 Make animation a bit more subtle 2018-01-04 20:43:42 +09:00
Dean Herbert
155e84d2b7 Update framework 2018-01-04 20:24:59 +09:00
Dean Herbert
ffc7f7ecf4 Add a better slider "hit" state fade out animation 2018-01-04 20:16:10 +09:00
Dean Herbert
bde957940d Disallow SliderBall from contracting after EndTime 2018-01-04 20:09:58 +09:00
smoogipoo
f569d54958 Local circlesize/od variables 2018-01-04 19:52:29 +09:00
Dean Herbert
5310db7990
Merge branch 'master' into fix-slider-follow-circle 2018-01-04 15:42:51 +09:00
Dean Herbert
6e8e82e264
Merge pull request from ColdVolcano/wedge-unicode
Permit BeatmapInfoWedge to display Unicode artist and title
2018-01-04 15:17:35 +09:00
Dean Herbert
9bce322682
Merge branch 'master' into wedge-unicode 2018-01-04 15:09:31 +09:00
Dan Balasescu
227cae3ff8
Merge pull request from james58899/fix-storyboard-path
Fix storyboard file paths on Linux/macOS using incorrect path separators
2018-01-03 22:34:19 +09:00
smoogipoo
823a430d30 Nothing to see here, move along 2018-01-03 22:02:54 +09:00
Aergwyn
1ce6219293 remove unnecessary override 2018-01-03 13:55:24 +01:00
smoogipoo
da5bc959ad Fix testcase 2018-01-03 21:46:39 +09:00
smoogipoo
a4d05e5102 Implement interface on ManiaKeyMod for now 2018-01-03 21:26:36 +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
Aergwyn
d94c313947 fix slider follow circle instantly disappearing on slider ends 2018-01-03 08:13:58 +01:00
Dean Herbert
d72bbf037d
Merge pull request 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 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 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 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 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 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 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 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
Felix Ang
dccc134efa Don't allow auto to fail 2018-01-02 17:53:29 +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