1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 17:42:54 +08:00
Commit Graph

4788 Commits

Author SHA1 Message Date
EVAST9919
eafe215169 Simplify Hud visibility change 2017-05-23 11:53:12 +03:00
Dean Herbert
9cb614fee7 Merge pull request #827 from smoogipooo/mania-note-input
Implement mania note input
2017-05-23 17:22:59 +09:00
Dean Herbert
836c33cfb0 Merge branch 'master' into mania-note-input 2017-05-23 16:50:01 +09:00
Dean Herbert
d1eb8937b7 Merge pull request #828 from smoogipooo/ColdVolcano/beat-syncing
Add beat syncing container
2017-05-23 11:25:24 +09:00
Dean Herbert
1295b0a7e1 Merge branch 'master' into ColdVolcano/beat-syncing 2017-05-23 10:51:47 +09: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
smoogipooo
adf8bb853e Move load() to be directly below ctor. 2017-05-22 20:06:37 +09:00
smoogipooo
de575b3867 Early return if beatLength = 0. 2017-05-22 20:02:02 +09:00
smoogipooo
95c4704a9e Delay backwards instead of using a millisecond tolerance. 2017-05-22 20:01:28 +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
Dan Balasescu
fc90cfa604 Update BeatSyncedContainer.cs 2017-05-22 17:50:05 +09:00
smoogipooo
3235e280a9 Add to csproj. 2017-05-22 17:32:18 +09:00
Dan Balasescu
a438a8b8d3 Merge branch 'master' into ColdVolcano/beat-syncing 2017-05-22 17:27:22 +09:00
smoogipooo
70d7f61f7c More inversion for logic simplification. 2017-05-22 17:19:39 +09:00
smoogipooo
f81ffa636d Use BindTo instead of taking the game's beatmap bindable. 2017-05-22 17:18:11 +09:00
smoogipooo
609aac6453 Better kiai mode detection. 2017-05-22 17:18:05 +09:00
smoogipooo
b241140496 Proper kiai mode detection. 2017-05-22 17:18:00 +09:00
smoogipooo
abe9c464a8 Invert if statements. 2017-05-22 17:17:54 +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
4200e05fe7 Don't handle repeat keys. 2017-05-22 16:42:14 +09:00
smoogipooo
7314a9019c Fix nullref. 2017-05-22 16:39:30 +09:00
smoogipooo
f9eb448f16 Implement DrawableNote hits. 2017-05-22 16:35:15 +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