ANDY840119-PC\andy840119
edb1401f00
Merge branch 'master' of https://github.com/andy840119/osu
2018-01-03 22:07:06 +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
為什麼
9ecbb5d604
Merge branch 'master' into master
2018-01-03 21:55:23 +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
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
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
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
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
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
Dean Herbert
71bcebe7e1
Fix selections occurring even though buttons aren't selected
2018-01-02 16:08:48 +09:00
Dean Herbert
131a431b02
Merge pull request #1829 from fangerm/supporter-leaderboards
...
Check for supporter before displaying leaderboard loading animation
2018-01-02 15:38:01 +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
Dean Herbert
d91ae42ca5
Merge pull request #1812 from peppy/hide-unavailable-functions
...
Remove search button on toolbar
2018-01-02 13:50:12 +09:00
Dan Balasescu
5f3dbfef47
Merge branch 'master' into hide-unavailable-functions
2018-01-02 12:59:12 +09:00
Dan Balasescu
1a67a8a061
Merge pull request #1807 from peppy/focused-overlay-improvements
...
QoL improvements to focused overlays
2018-01-02 12:58:57 +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
Aergwyn
80be40ed34
ignore new test classes
2018-01-01 12:08:44 +01:00
