1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-27 02:37:18 +08:00

3341 Commits

Author SHA1 Message Date
smoogipooo
7628cdf522 Return first control point in the list if the time is before it. 2017-05-24 01:38:04 +09:00
Jorolf
af9b02746a make fields readonly 2017-05-23 18:19:01 +02:00
Dean Herbert
b12300391b Merge branch 'master' 2017-05-24 01:17:09 +09:00
Jorolf
64cee72464 Merge branch 'master' of git://github.com/ppy/osu into channel-selector-tab-item 2017-05-23 17:51:46 +02:00
Dean Herbert
ef1712a5af Merge branch 'master' into beat-sync-container-improvements 2017-05-24 00:46:14 +09:00
Jorolf
7ad10009e6 Merge branch 'master' of git://github.com/ppy/osu into channel-selector-tab-item 2017-05-23 17:32:48 +02:00
Dean Herbert
0842e00f13 Merge branch 'master' into controlpoint-rework 2017-05-24 00:20:15 +09:00
Dean Herbert
a48a03bf38 Merge branch 'master' into menu-music-osz 2017-05-23 23:56:07 +09:00
MrTheMake
0603be5937 Unregister OnBeatmapChanged() when exiting song selection 2017-05-23 15:30:15 +02: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
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
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
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
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
Dean Herbert
fe7ac20e29 Read menu music from osz resource 2017-05-23 16:38:43 +09:00
smoogipooo
aad6f8f5d6 Refactoring of BeatSyncedContainer. 2017-05-23 16:11:46 +09:00
smoogipooo
1867cbb381 Revert a bit of BeatSyncedContainer for smaller changeset. 2017-05-23 16:06:30 +09:00
smoogipooo
836bf930a0 More cleanups. 2017-05-23 15:29:38 +09:00
smoogipooo
2344f37a3c Always add TimingChange control points. 2017-05-23 15:26:07 +09:00
smoogipooo
002a0e99a2 Use SortedList + BinarySearch to find control points at time values. 2017-05-23 15:20:32 +09:00
smoogipooo
6bfd7e0fb0 xmldocs. 2017-05-23 14:11:37 +09:00
smoogipooo
3cdfd2eef5 Split ControlPoint into different types.
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
Dean Herbert
3e0aaa1aa0 Add basic beat response to osu! logo 2017-05-23 12:29:43 +09:00
Dean Herbert
1295b0a7e1 Merge branch 'master' into ColdVolcano/beat-syncing 2017-05-23 10:51:47 +09:00
DrabWeb
9798117d53 Move RoomStatus to a class instead of enum 2017-05-22 21:13:57 -03:00
DrabWeb
4681beab5d CI fixes 2017-05-22 13:22:14 -03:00
DrabWeb
cf0e7887b5 Unused using 2017-05-22 13:14:56 -03:00
DrabWeb
8b505a9e8b Remove tab character 2017-05-22 13:06:52 -03:00
DrabWeb
25b457e994 Proper Bindable usage 2017-05-22 13:05:18 -03:00
DrabWeb
65df2d2b70 MultiplayerRoomStatus -> RoomStatus 2017-05-22 12:46:41 -03:00
DrabWeb
2c16d9c3a7 CurrentBeatmap -> Beatmap 2017-05-22 12:45:40 -03:00
DrabWeb
03f6cded84 MultiplayerRoom -> Room 2017-05-22 12:44:58 -03:00
DrabWeb
261ea4c176 CoverBackgroundSprite for actually async cover loading 2017-05-22 12:41:59 -03:00
DrabWeb
35814e47e4 Colour -> GetAppropriateColour, adjust status change transition 2017-05-22 12:37:19 -03:00
Dean Herbert
5c5a18833a Merge branch 'master' into channel-selector-tab-item 2017-05-22 20:22:57 +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
ColdVolcano
9235cbff8d Apply suggestions 2017-05-22 05:59:16 -05:00
ColdVolcano
63196df541 Typo fix
Forgot the pharenteses
2017-05-22 05:05:54 -05:00
ColdVolcano
601b840713 Apply suggestions 2017-05-22 04:55:33 -05:00
ColdVolcano
f2b5be27c8 CI Fixes 2017-05-22 04:53:32 -05:00
ColdVolcano
a1547f12d4 Applied suggestions + Update Framework 2017-05-22 04:38:21 -05:00
ColdVolcano
1ea60fd393 Merge pull request #828 into menu-flashes 2017-05-22 04:15:46 -05:00
Dan Balasescu
fc90cfa604 Update BeatSyncedContainer.cs 2017-05-22 17:50:05 +09:00