1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-24 10:07:28 +08:00
Commit Graph

4764 Commits

Author SHA1 Message Date
MrTheMake
0603be5937 Unregister OnBeatmapChanged() when exiting song selection 2017-05-23 15:30:15 +02:00
Dean Herbert
e6e443dbce Merge pull request #800 from smoogipooo/mania-hitobject-object-conversion
Mania hitobject object conversion
2017-05-22 21:34:17 +09:00
Dean Herbert
51728e48be Merge branch 'master' into mania-hitobject-object-conversion 2017-05-22 21:12:00 +09:00
Dean Herbert
9d411fe07b Merge pull request #815 from huoyaoyuan/sections
Abstract out SectionsContainer from Settings
2017-05-22 20:09:09 +09:00
Dean Herbert
b494938145 Merge branch 'master' into sections 2017-05-22 19:55:27 +09:00
Dean Herbert
2e730c6840 Merge pull request #826 from smoogipooo/mania-input-base
Add basic framework required to implement mania note input
2017-05-22 19:54:59 +09:00
Huo Yaoyuan
63259a3457 Fix depth of header background.
Thanks to the order of adding to parent container, the depth value is actually not needed.
2017-05-22 16:00:03 +08:00
Huo Yaoyuan
85684e5fee Do not scroll headers to when scrolling position is negative. 2017-05-22 15:54:58 +08:00
smoogipooo
7314a9019c Fix nullref. 2017-05-22 16:39:30 +09:00
Dan Balasescu
6f00f7f0d0 Update HitWindows.cs 2017-05-22 16:34:38 +09:00
smoogipooo
62c7e97a5f Add helper method to easily compare time offset to hit windows. 2017-05-22 16:28:44 +09:00
smoogipooo
0f3cf18345 Forgot license header. 2017-05-22 16:15:52 +09:00
smoogipooo
9a578e036e Add xmldoc. 2017-05-22 16:09:32 +09:00
smoogipooo
60e036b5f4 Fix missing reference. 2017-05-22 15:29:02 +09:00
smoogipooo
dcf3148d23 Fix osu!mania failing due to 0 hp. 2017-05-22 15:28:51 +09:00
smoogipooo
3dfe88c068 Make Key a bindable, pass down to drawable hit objects. 2017-05-22 15:28:30 +09:00
smoogipooo
c972335297 Add InputTarget to capture input from columns before hit objects. 2017-05-22 15:25:37 +09:00
smoogipooo
409464381c Expose HitWindows so they're accessible from the drawable hit objects. 2017-05-22 14:11:14 +09:00
smoogipooo
d0ddd62f84 Add ManiaHitResult to ManiaJudgement. 2017-05-22 14:10:53 +09:00
Huo Yaoyuan
d0ff9e6576 Merge branch 'master' into sections 2017-05-22 12:52:27 +08:00
smoogipooo
f70bfd5378 CI fixes. 2017-05-22 13:43:53 +09:00
Dan Balasescu
4556ead3b6 Merge branch 'master' into mania-hitobject-object-conversion 2017-05-22 12:54:06 +09:00
Dean Herbert
f8c419f9ba Merge pull request #814 from MrTheMake/songselect-fixes
Fixes to the song select screen
2017-05-22 12:52:36 +09:00
Dean Herbert
d3495545c5 Merge branch 'master' into songselect-fixes 2017-05-22 12:29:18 +09:00
Dean Herbert
0040fbb284 Merge pull request #790 from smoogipooo/mania-endtime-object-conversion
Mania endtime object conversion
2017-05-22 12:22:33 +09:00
Dean Herbert
b50f9cad44 Merge branch 'master' into mania-endtime-object-conversion 2017-05-22 12:14:53 +09:00
Dean Herbert
ca653ac708 Merge pull request #789 from smoogipooo/mania-distance-object-conversion
Mania distance object conversion
2017-05-22 12:12:54 +09:00
Dean Herbert
fe70641980 Merge branch 'master' into mania-distance-object-conversion 2017-05-22 12:08:01 +09:00
Dean Herbert
0ff3280bb3 Merge pull request #781 from huoyaoyuan/generic-interface
More tidy ups
2017-05-22 11:49:24 +09:00
Dan Balasescu
d02aaf0a28 Merge branch 'master' into mania-distance-object-conversion 2017-05-22 11:36:36 +09:00
Dean Herbert
7f08d60008 Merge branch 'master' into generic-interface 2017-05-22 11:35:50 +09:00
Dean Herbert
05f5e55bc7 Merge pull request #820 from smoogipooo/remove-siblings
Remove Note Siblings.
2017-05-22 11:28:25 +09:00
Dean Herbert
469cc5fa52 Merge branch 'master' into remove-siblings 2017-05-22 11:18:46 +09:00
Dean Herbert
71e5b0dd02 Merge pull request #813 from MrTheMake/replay-no-pausing
Do not pause a running replay if the window is not focused
2017-05-22 11:18:14 +09:00
Dean Herbert
04f0dcc255 Merge branch 'master' into replay-no-pausing 2017-05-22 11:09:31 +09:00
Dean Herbert
d7796fa941 Merge pull request #822 from smoogipooo/mania-pattern-changes
Mania pattern changes
2017-05-22 11:09:01 +09:00
smoogipooo
8077ddf944 Update with pattern changes. 2017-05-22 10:34:12 +09:00
smoogipooo
7d417e4219 Merge remote-tracking branch 'smoogipooo/mania-pattern-changes' into mania-hitobject-object-conversion 2017-05-22 10:32:32 +09:00
smoogipooo
dba9dd3509 Remove siblings. 2017-05-22 10:30:03 +09:00
smoogipooo
6c0d226459 Merge branch 'remove-siblings' into mania-hitobject-object-conversion 2017-05-22 10:25:59 +09:00
smoogipooo
e232968ea7 Fix line endings resulting in CI error. 2017-05-22 10:25:28 +09:00
Dean Herbert
4b17bb8e69 Merge branch 'master' into mania-pattern-changes 2017-05-22 10:25:17 +09:00
smoogipooo
6714a244e8 Add check before possibly going into endless loop. 2017-05-22 10:23:08 +09:00
smoogipooo
2d11a8bdf0 Update with pattern changes. 2017-05-22 10:20:42 +09:00
Dan Balasescu
4ce3a78066 Update Pattern.cs 2017-05-22 10:18:42 +09:00
smoogipooo
e9f7be8dce Merge branch 'mania-pattern-changes' into mania-endtime-object-conversion 2017-05-22 10:17:54 +09:00
smoogipooo
cd66e2af14 Update with pattern changes. 2017-05-22 10:17:08 +09:00
smoogipooo
9fd4ab2302 Merge branch 'mania-pattern-changes' into mania-distance-object-conversion 2017-05-22 10:14:32 +09:00
Dan Balasescu
4ffc44eac7 Merge pull request #821 from peppy/remove-some-colours
Move spinner colours to local definition for now
2017-05-22 10:14:04 +09:00
smoogipooo
0a0139aded Remove the concept of beatmap events, rename BreakEvent -> BreakPeriod. 2017-05-22 10:12:33 +09:00