ANDY840119-PC\andy840119
a55ac899a8
fix Empty argument list is redundant
2018-01-06 11:08:04 +09:00
ANDY840119-PC\andy840119
232381533c
update framework again
2018-01-06 10:43:22 +09:00
ANDY840119-PC\andy840119
065ebe896b
Merge branch 'master' of https://github.com/andy840119/osu
2018-01-06 10:35:21 +09:00
ANDY840119-PC\andy840119
eb37c361d8
fix framework branch
2018-01-06 10:34:45 +09:00
ANDY840119-PC\andy840119
356c7ad528
Merge branch 'mania-rc-cleanup' of https://github.com/smoogipoo/osu into mania_fix
...
# Conflicts:
# osu-framework
2018-01-05 23:29:33 +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 #1855 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 #1840 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 #1813 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
ANDY840119-PC\andy840119
409664e4dc
White space needs to be trimmed
2018-01-03 23:50:52 +09:00
ANDY840119-PC\andy840119
aadafae8cb
1. fix TestCaseManiaHitObjects broken
...
2. add (4+4) (2+4+2) (1+8+1) column stages step in TestCaseManiaPlayfield
2018-01-03 23:47:05 +09:00
ANDY840119-PC\andy840119
a855a21ccb
group -> stage
2018-01-03 23:04:51 +09:00
ANDY840119-PC\andy840119
5326f71ed9
fix some error that smoogipoo says
2018-01-03 22:58:08 +09:00
Dan Balasescu
227cae3ff8
Merge pull request #1844 from james58899/fix-storyboard-path
...
Fix storyboard file paths on Linux/macOS using incorrect path separators
2018-01-03 22:34:19 +09:00
ANDY840119-PC\andy840119
edb1401f00
Merge branch 'master' of https://github.com/andy840119/osu
2018-01-03 22:07:06 +09:00
smoogipoo
823a430d30
Nothing to see here, move along
2018-01-03 22:02:54 +09:00
ANDY840119-PC\andy840119
ee13df94fc
Merge branch 'mania-rc-cleanup' of https://github.com/smoogipoo/osu
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-01-03 22:02:50 +09:00
Aergwyn
1ce6219293
remove unnecessary override
2018-01-03 13:55:24 +01:00
為什麼
9ecbb5d604
Merge branch 'master' into master
2018-01-03 21:55:23 +09: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 #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
