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

4540 Commits

Author SHA1 Message Date
smoogipooo
5365dff698 Merge branch 'hitrenderer-improvements' into mania-timing-sections 2017-05-11 15:05:26 +09:00
smoogipooo
3118dad52b Subtract out playfield/hitrenderer/drawablehitobject changes. 2017-05-11 15:05:21 +09:00
smoogipooo
a762f820c6 Fix possible nullrefs. 2017-05-11 14:50:18 +09:00
smoogipooo
2d2d1beddd More concrete method to determine if all hit objects have been judged.
Covers the case where nested hit objects are involved.
2017-05-11 14:48:08 +09:00
smoogipooo
6445bea864 Make Playfield.HitObjects internal to playfields.
Because not all playfields will be using this.
2017-05-11 14:44:11 +09:00
smoogipooo
da4be2f9d6 Move notes above judgement area but below keys. 2017-05-11 14:32:31 +09:00
smoogipooo
623912b40a Fix playfield position. 2017-05-11 14:32:13 +09:00
smoogipooo
f6677125af Merge branch 'mania-notes' into mania-timing-sections 2017-05-11 14:11:58 +09:00
smoogipooo
a6b71f8ccb Resharper fixes. 2017-05-11 14:11:52 +09:00
Dean Herbert
df48204403 Fix OptionsOverlay stealing focus itself. 2017-05-11 13:56:21 +09:00
smoogipooo
cdf827df8e CI fixes. 2017-05-11 13:55:52 +09:00
Dean Herbert
7d8af5f1da Use SearchTextBox
Correctly handle focus.
2017-05-11 13:23:31 +09:00
smoogipooo
94585672b6 Merge remote-tracking branch 'origin/master' into mania-notes 2017-05-11 13:01:00 +09:00
Dean Herbert
6c5490e31c Merge remote-tracking branch 'upstream/master' into new-option-search 2017-05-11 12:59:19 +09:00
Dean Herbert
ab58acad81 Merge pull request #732 from peppy/general-fixes
Update framework
2017-05-11 12:57:12 +09:00
smoogipooo
7fcbf2d8d4 Add t=0 display to notes. 2017-05-11 12:57:07 +09:00
smoogipooo
8160f36a48 Fix notes scrolling from end of map -> start of map. 2017-05-11 12:56:51 +09:00
smoogipooo
b10df74079 Full rewrite of timing section code, partially working for now. 2017-05-11 12:33:19 +09:00
smoogipooo
185e98aa14 Add basic column conversion to ManiaBeatmapConverter. 2017-05-11 12:32:30 +09:00
Dan Balasescu
78ed48d5ef Merge branch 'master' into general-fixes 2017-05-11 12:29:10 +09:00
Dean Herbert
672c22178a Merge pull request #724 from huoyaoyuan/metadata
WorkingBeatmap enhancement
2017-05-11 12:28:15 +09:00
Dean Herbert
70ef503403 Merge branch 'master' into metadata 2017-05-11 12:23:00 +09:00
Dean Herbert
262b42efe3 Merge branch 'master' into new-option-search 2017-05-11 12:20:58 +09:00
Dean Herbert
fe47451dbc Merge (fix conflicting framework) 2017-05-11 11:17:44 +09:00
EVAST9919
ea0add2354 Fixed update condition 2017-05-11 02:34:57 +03:00
EVAST9919
c0acc1799b Now progress testcase has it's own clock 2017-05-11 01:49:57 +03:00
EVAST9919
d55c97a08a Stop progress as soon as we at 100% 2017-05-11 01:48:46 +03:00
smoogipooo
62656b98df Internalize HitObjects to playfields, since some playfields may not use that container. 2017-05-10 20:39:13 +09:00
smoogipooo
ba998035a8 More concrete way to determine whether all hit objects have been judged. 2017-05-10 20:37:59 +09:00
smoogipooo
4614904409 Update framework. 2017-05-10 17:38:59 +09:00
smoogipooo
2867606913 Whoops wrong project. 2017-05-10 17:35:00 +09:00
smoogipooo
3b533de8ac Add xmldoc to HitWindows.cs. 2017-05-10 17:29:54 +09:00
smoogipooo
11c47454ad Update framework. 2017-05-10 17:13:33 +09:00
EVAST9919
5b469eff69 Fixes 2017-05-10 10:33:02 +03:00
smoogipooo
bcc8a94e36 Construct mania playfield with proper column count. 2017-05-10 16:32:11 +09:00
EVAST9919
d8f9e71b84 Applied suggested changes 2017-05-10 10:14:44 +03:00
smoogipooo
2edc39ae16 Add timing sections. 2017-05-10 15:09:29 +09:00
Dean Herbert
2e7812956a Update framework. 2017-05-10 14:15:11 +09:00
EVAST9919
7b17e331c4 cleanups 2017-05-10 03:45:31 +03:00
EVAST9919
113df86304 Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-10 03:23:51 +03:00
Dan Balasescu
cdd71b496d Fix unnecessary newline. 2017-05-09 21:08:53 +09:00
Dean Herbert
76380a0792 Merge pull request #731 from smoogipooo/general-fixes
Update framework.
2017-05-09 21:06:40 +09:00
smoogipooo
e1ed785cbf Update framework. 2017-05-09 21:00:40 +09:00
smoogipooo
89bfc0ff22 Fix exception. 2017-05-09 20:55:38 +09:00
smoogipooo
5b323ad483 Cleanups. 2017-05-09 20:55:20 +09:00
smoogipooo
d852567d1d Rewrite notes to have time-relative position and length. 2017-05-09 20:33:59 +09:00
smoogipooo
ea76eff1e1 Merge remote-tracking branch 'origin/master' into mania-notes 2017-05-09 19:31:35 +09:00
EVAST9919
315f1f1256 CI fixes 2017-05-09 06:23:03 +03:00
EVAST9919
2c92ee432b Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-09 06:05:46 +03:00
EVAST9919
2826c663fd Apply suggested changes 2017-05-09 06:05:37 +03:00