Commit Graph

3362 Commits

Author SHA1 Message Date
c6d744eb7c Merge branch 'master' of ppy/osu into menu-flashes 2017-05-23 20:00:02 -05:00
dee6a1e2be Merge branch 'master' into songselect-fix 2017-05-24 09:45:34 +09:00
24f64c8815 More formatting 2017-05-24 02:38:05 +02:00
67774192dd Formatting fixes 2017-05-24 02:30:32 +02:00
0616256bd0 CI fix 2017-05-24 02:23:52 +02:00
09adb23591 Fix scheduled task not being canceled 2017-05-24 02:22:30 +02:00
be1ae2bd8e Remove ??, value can never be null 2017-05-23 15:08:02 -03:00
b477e5cd9e Fix potential nullref 2017-05-24 02:53:21 +09:00
0a385055dc Remove Func<T>'d-ness. 2017-05-24 02:53:08 +09:00
7a4b476121 Tab character 2017-05-23 14:46:23 -03:00
aa9a636c3c Indentation 2017-05-23 14:42:57 -03:00
7b9eacc213 CI fixes 2017-05-23 14:41:30 -03:00
fbbcc80a3e Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct 2017-05-23 14:34:58 -03:00
4f17a4fe91 Make result counts scroll with the panels 2017-05-23 14:34:34 -03:00
41824e0179 Add comment. 2017-05-24 02:24:10 +09:00
2d1df8fd8a xmldoc fixes. 2017-05-24 02:22:28 +09:00
9e7f384203 Fix returning incorrect control points for non-timing points. 2017-05-24 02:19:22 +09:00
813b09189c Remove unused parameter 2017-05-24 02:09:31 +09:00
7e827c4f11 Add amplitude adjust 2017-05-24 01:45:01 +09:00
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
64cee72464 Merge branch 'master' of git://github.com/ppy/osu into channel-selector-tab-item 2017-05-23 17:51:46 +02:00
ef1712a5af Merge branch 'master' into beat-sync-container-improvements 2017-05-24 00:46:14 +09: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
a48a03bf38 Merge branch 'master' into menu-music-osz 2017-05-23 23:56:07 +09:00
0603be5937 Unregister OnBeatmapChanged() when exiting song selection 2017-05-23 15:30:15 +02: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
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
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
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
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
fe7ac20e29 Read menu music from osz resource 2017-05-23 16:38:43 +09:00
aad6f8f5d6 Refactoring of BeatSyncedContainer. 2017-05-23 16:11:46 +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
3cdfd2eef5 Split ControlPoint into different types.
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
3e0aaa1aa0 Add basic beat response to osu! logo 2017-05-23 12:29:43 +09:00
1295b0a7e1 Merge branch 'master' into ColdVolcano/beat-syncing 2017-05-23 10:51:47 +09:00