1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 05:02:56 +08:00
Commit Graph

5055 Commits

Author SHA1 Message Date
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
DrabWeb
62ca76bc41 Unused using 2017-05-22 03:42:32 -03:00
DrabWeb
8a364c6068 CI fixes 2017-05-22 03:37:36 -03:00
DrabWeb
aa40f88258 Add UserStatusOffline 2017-05-22 03:32:02 -03: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
DrabWeb
a73cf92994 Add second UserPanel to visual test, center cover sprite 2017-05-22 03:27:08 -03:00
smoogipooo
c972335297 Add InputTarget to capture input from columns before hit objects. 2017-05-22 15:25:37 +09:00
DrabWeb
bdab545ca4 Use BeatmapBackgroundSprite 2017-05-22 03:15:22 -03:00
DrabWeb
77affc1eb7 Split onto multiple lines 2017-05-22 03:13:55 -03:00
DrabWeb
7ce3b73ecd Added UserPanel and UserStatus 2017-05-22 03:11:42 -03: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
DrabWeb
3c35badf06 Unused using 2017-05-22 02:03:53 -03:00
DrabWeb
6bf0ca59fe Make FilterControl not scroll with the panels 2017-05-22 02:03:26 -03:00
Huo Yaoyuan
d0ff9e6576 Merge branch 'master' into sections 2017-05-22 12:52:27 +08:00
ColdVolcano
059af0850b Changes in-line with framework 2017-05-21 23:47:08 -05:00
smoogipooo
f70bfd5378 CI fixes. 2017-05-22 13:43:53 +09:00
DrabWeb
87cdf5aac6 CI fixes 2017-05-22 01:29:39 -03:00
DrabWeb
d1df895844 Unused using 2017-05-22 01:16:59 -03:00
DrabWeb
26bf9dd64b Remove unused Background 2017-05-22 01:13:51 -03:00
DrabWeb
800a319470 Remove newline 2017-05-22 01:08:35 -03:00
DrabWeb
0c30b2c698 Remove folder from osu.Game.csproj 2017-05-22 01:07:26 -03:00
DrabWeb
0795089d86 Merge https://github.com/ppy/osu into drawable-multiplayer-room 2017-05-22 01:06:05 -03:00
DrabWeb
82fdf1a918 Bindables, avatars, more cleanup 2017-05-22 01:01:55 -03: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
DrabWeb
e5ee7096f8 Initial cleanup 2017-05-22 00:07:15 -03: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