Commit Graph

11234 Commits

Author SHA1 Message Date
f57b234cc3 Expose Beatmap in BeatSyncedContainer 2017-05-24 01:44:47 +09:00
462bbd02ba Simplify expression. 2017-05-24 01:38:28 +09:00
7628cdf522 Return first control point in the list if the time is before it. 2017-05-24 01:38:04 +09:00
af9b02746a make fields readonly 2017-05-23 18:19:01 +02:00
b12300391b Merge branch 'master' 2017-05-24 01:17:09 +09:00
952179332f Merge pull request #831 from smoogipooo/beat-sync-container-improvements
Beat sync container improvements
2017-05-24 01:05:02 +09:00
64cee72464 Merge branch 'master' of git://github.com/ppy/osu into channel-selector-tab-item 2017-05-23 17:51:46 +02:00
320e7b358e revert framework 2017-05-23 17:50:28 +02:00
ef1712a5af Merge branch 'master' into beat-sync-container-improvements 2017-05-24 00:46:14 +09:00
acce59cdb3 Merge pull request #830 from smoogipooo/controlpoint-rework
Split out ControlPoints into more specific types
2017-05-24 00:41:59 +09:00
7d28290a4a update framework 2017-05-23 17:35:40 +02:00
7ad10009e6 Merge branch 'master' of git://github.com/ppy/osu into channel-selector-tab-item 2017-05-23 17:32:48 +02:00
0842e00f13 Merge branch 'master' into controlpoint-rework 2017-05-24 00:20:15 +09:00
d162a2b033 Merge pull request #832 from peppy/menu-music-osz
Read menu music from osz resource
2017-05-24 00:09:46 +09:00
a48a03bf38 Merge branch 'master' into menu-music-osz 2017-05-23 23:56:07 +09:00
7e3caa19fd Merge pull request #837 from EVAST9919/fixes
Tidy ups
2017-05-23 23:50:44 +09:00
0603be5937 Unregister OnBeatmapChanged() when exiting song selection 2017-05-23 15:30:15 +02:00
178f8127b8 overall fixes 2017-05-23 16:01:00 +03:00
2ca0794b37 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-23 14:45:38 +03:00
564abc1a5b using autosize instead of constant height 2017-05-23 14:32:45 +03:00
165d6ef1bb Make transition a bit smoother 2017-05-23 12:30:39 +03:00
2d806c7f11 Merge branch 'master' into menu-music-osz 2017-05-23 18:26:48 +09:00
2e28b10c36 CI fixes and removed useless property 2017-05-23 12:24:16 +03:00
c7a241246e Better letterbox settings transition 2017-05-23 12:09:32 +03:00
76fe4af9a6 Fix visual test failing. 2017-05-23 18:06:31 +09:00
9255297075 Cleanup. 2017-05-23 17:59:45 +09:00
ae94e6ea85 Redesign hit explosions. 2017-05-23 17:57:34 +09:00
4b23cc47ea Moved KeyCounter visibility logic to it's own class 2017-05-23 11:53:42 +03:00
eafe215169 Simplify Hud visibility change 2017-05-23 11:53:12 +03:00
25a48d832f Make kiai time hit object pulse on bar line beats. 2017-05-23 17:36:43 +09:00
0634a3a5c5 Merge branch 'master' into osu-direct 2017-05-23 17:33:20 +09:00
0dd52e4e29 Various refactoring 2017-05-23 17:26:28 +09:00
9cb614fee7 Merge pull request #827 from smoogipooo/mania-note-input
Implement mania note input
2017-05-23 17:22:59 +09:00
4c66157a07 Merge branch 'beat-sync-container-improvements' into taiko-visual-update 2017-05-23 16:51:45 +09:00
836c33cfb0 Merge branch 'master' into mania-note-input 2017-05-23 16:50:01 +09:00
a4823bca91 CI fixes. 2017-05-23 16:47:47 +09:00
2decb2b2ff Add more flashiness during kiai time 2017-05-23 16:42:47 +09:00
73320f9a7e Don't bounce the ripple
Also ripple better.
2017-05-23 16:42:41 +09:00
61348ff08d Restructure playfield so that various elements are masked. 2017-05-23 16:42:17 +09:00
fe7ac20e29 Read menu music from osz resource 2017-05-23 16:38:43 +09:00
27eef9122a Merge remote-tracking branch 'origin/master' into taiko-visual-update 2017-05-23 16:19:12 +09:00
7e5bb61a44 Fix line endings. 2017-05-23 16:13:51 +09:00
aad6f8f5d6 Refactoring of BeatSyncedContainer. 2017-05-23 16:11:46 +09:00
7066376855 Merge branch 'controlpoint-rework' into beat-sync-container-improvements 2017-05-23 16:07:59 +09:00
1867cbb381 Revert a bit of BeatSyncedContainer for smaller changeset. 2017-05-23 16:06:30 +09:00
836bf930a0 More cleanups. 2017-05-23 15:29:38 +09:00
2344f37a3c Always add TimingChange control points. 2017-05-23 15:26:07 +09:00
002a0e99a2 Use SortedList + BinarySearch to find control points at time values. 2017-05-23 15:20:32 +09:00
6bfd7e0fb0 xmldocs. 2017-05-23 14:11:37 +09:00
ea4a285329 Fix compile errors. 2017-05-23 14:08:15 +09:00