1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 22:43:22 +08:00
Commit Graph

5353 Commits

Author SHA1 Message Date
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
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
ea4a285329 Fix compile errors. 2017-05-23 14:08:15 +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
d1eb8937b7 Merge pull request #828 from smoogipooo/ColdVolcano/beat-syncing
Add beat syncing container
2017-05-23 11:25:24 +09:00
Dean Herbert
1295b0a7e1 Merge branch 'master' into ColdVolcano/beat-syncing 2017-05-23 10:51:47 +09:00
DrabWeb
62897d302e Remove SettingsButton(old and outdated design), fix channel list scrolling under the header 2017-05-22 22:37:25 -03: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
e6e443dbce Merge pull request #800 from smoogipooo/mania-hitobject-object-conversion
Mania hitobject object conversion
2017-05-22 21:34:17 +09:00
Dean Herbert
51728e48be Merge branch 'master' into mania-hitobject-object-conversion 2017-05-22 21:12:00 +09:00
Dean Herbert
5c5a18833a Merge branch 'master' into channel-selector-tab-item 2017-05-22 20:22:57 +09:00
Dean Herbert
9d411fe07b Merge pull request #815 from huoyaoyuan/sections
Abstract out SectionsContainer from Settings
2017-05-22 20:09:09 +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
Dean Herbert
b494938145 Merge branch 'master' into sections 2017-05-22 19:55:27 +09:00
Dean Herbert
2e730c6840 Merge pull request #826 from smoogipooo/mania-input-base
Add basic framework required to implement mania note input
2017-05-22 19:54:59 +09:00
smoogipooo
6cef3021c7 Adjust sizing to better fit glows within the playfield. 2017-05-22 19:50:01 +09: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