1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 11:03:21 +08:00
Commit Graph

4969 Commits

Author SHA1 Message Date
Dean Herbert
b477e5cd9e Fix potential nullref 2017-05-24 02:53:21 +09:00
smoogipooo
0a385055dc Remove Func<T>'d-ness. 2017-05-24 02:53:08 +09:00
DrabWeb
7a4b476121 Tab character 2017-05-23 14:46:23 -03:00
DrabWeb
aa9a636c3c Indentation 2017-05-23 14:42:57 -03:00
DrabWeb
7b9eacc213 CI fixes 2017-05-23 14:41:30 -03:00
DrabWeb
fbbcc80a3e Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct 2017-05-23 14:34:58 -03:00
DrabWeb
4f17a4fe91 Make result counts scroll with the panels 2017-05-23 14:34:34 -03:00
smoogipooo
41824e0179 Add comment. 2017-05-24 02:24:10 +09:00
smoogipooo
2d1df8fd8a xmldoc fixes. 2017-05-24 02:22:28 +09:00
smoogipooo
9e7f384203 Fix returning incorrect control points for non-timing points. 2017-05-24 02:19:22 +09:00
Dean Herbert
813b09189c Remove unused parameter 2017-05-24 02:09:31 +09:00
Dean Herbert
84499275ad Update framework 2017-05-24 01:58:07 +09:00
Dean Herbert
7e827c4f11 Add amplitude adjust 2017-05-24 01:45:01 +09:00
Dean Herbert
f57b234cc3 Expose Beatmap in BeatSyncedContainer 2017-05-24 01:44:47 +09:00
smoogipooo
462bbd02ba Simplify expression. 2017-05-24 01:38:28 +09:00
smoogipooo
7628cdf522 Return first control point in the list if the time is before it. 2017-05-24 01:38:04 +09:00
Dean Herbert
b12300391b Merge branch 'master' 2017-05-24 01:17:09 +09:00
Dean Herbert
952179332f Merge pull request #831 from smoogipooo/beat-sync-container-improvements
Beat sync container improvements
2017-05-24 01:05:02 +09:00
Dean Herbert
ef1712a5af Merge branch 'master' into beat-sync-container-improvements 2017-05-24 00:46:14 +09:00
Dean Herbert
acce59cdb3 Merge pull request #830 from smoogipooo/controlpoint-rework
Split out ControlPoints into more specific types
2017-05-24 00:41:59 +09:00
Dean Herbert
0842e00f13 Merge branch 'master' into controlpoint-rework 2017-05-24 00:20:15 +09:00
Dean Herbert
d162a2b033 Merge pull request #832 from peppy/menu-music-osz
Read menu music from osz resource
2017-05-24 00:09:46 +09:00
Dean Herbert
a48a03bf38 Merge branch 'master' into menu-music-osz 2017-05-23 23:56:07 +09:00
Dean Herbert
7e3caa19fd Merge pull request #837 from EVAST9919/fixes
Tidy ups
2017-05-23 23:50:44 +09:00
EVAST9919
564abc1a5b using autosize instead of constant height 2017-05-23 14:32:45 +03:00
EVAST9919
165d6ef1bb Make transition a bit smoother 2017-05-23 12:30:39 +03:00
Dan Balasescu
2d806c7f11 Merge branch 'master' into menu-music-osz 2017-05-23 18:26:48 +09:00
EVAST9919
2e28b10c36 CI fixes and removed useless property 2017-05-23 12:24:16 +03:00
EVAST9919
c7a241246e Better letterbox settings transition 2017-05-23 12:09:32 +03:00
smoogipooo
76fe4af9a6 Fix visual test failing. 2017-05-23 18:06:31 +09:00
smoogipooo
9255297075 Cleanup. 2017-05-23 17:59:45 +09:00
smoogipooo
ae94e6ea85 Redesign hit explosions. 2017-05-23 17:57:34 +09:00
EVAST9919
4b23cc47ea Moved KeyCounter visibility logic to it's own class 2017-05-23 11:53:42 +03:00
EVAST9919
eafe215169 Simplify Hud visibility change 2017-05-23 11:53:12 +03:00
smoogipooo
25a48d832f Make kiai time hit object pulse on bar line beats. 2017-05-23 17:36:43 +09:00
Dean Herbert
0634a3a5c5 Merge branch 'master' into osu-direct 2017-05-23 17:33:20 +09:00
Dean Herbert
0dd52e4e29 Various refactoring 2017-05-23 17:26:28 +09: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
smoogipooo
4c66157a07 Merge branch 'beat-sync-container-improvements' into taiko-visual-update 2017-05-23 16:51:45 +09:00
Dean Herbert
836c33cfb0 Merge branch 'master' into mania-note-input 2017-05-23 16:50:01 +09:00
smoogipooo
a4823bca91 CI fixes. 2017-05-23 16:47:47 +09:00
Dean Herbert
2decb2b2ff Add more flashiness during kiai time 2017-05-23 16:42:47 +09:00
Dean Herbert
73320f9a7e Don't bounce the ripple
Also ripple better.
2017-05-23 16:42:41 +09:00
smoogipooo
61348ff08d Restructure playfield so that various elements are masked. 2017-05-23 16:42:17 +09:00
Dean Herbert
fe7ac20e29 Read menu music from osz resource 2017-05-23 16:38:43 +09:00
smoogipooo
27eef9122a Merge remote-tracking branch 'origin/master' into taiko-visual-update 2017-05-23 16:19:12 +09:00
smoogipooo
7e5bb61a44 Fix line endings. 2017-05-23 16:13:51 +09:00
smoogipooo
aad6f8f5d6 Refactoring of BeatSyncedContainer. 2017-05-23 16:11:46 +09:00
smoogipooo
7066376855 Merge branch 'controlpoint-rework' into beat-sync-container-improvements 2017-05-23 16:07:59 +09:00
smoogipooo
1867cbb381 Revert a bit of BeatSyncedContainer for smaller changeset. 2017-05-23 16:06:30 +09:00