ColdVolcano
|
207d6e4ac3
|
Update to new syntax of OnNewBeat
|
2017-05-23 20:01:20 -05:00 |
|
ColdVolcano
|
c6d744eb7c
|
Merge branch 'master' of ppy/osu into menu-flashes
|
2017-05-23 20:00:02 -05:00 |
|
Dean Herbert
|
ef1712a5af
|
Merge branch 'master' into beat-sync-container-improvements
|
2017-05-24 00:46:14 +09: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 |
|
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
|
0dd52e4e29
|
Various refactoring
|
2017-05-23 17:26:28 +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
|
1295b0a7e1
|
Merge branch 'master' into ColdVolcano/beat-syncing
|
2017-05-23 10:51:47 +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 |
|
smoogipooo
|
3235e280a9
|
Add to csproj.
|
2017-05-22 17:32:18 +09:00 |
|
Dan Balasescu
|
a438a8b8d3
|
Merge branch 'master' into ColdVolcano/beat-syncing
|
2017-05-22 17:27:22 +09:00 |
|
smoogipooo
|
70d7f61f7c
|
More inversion for logic simplification.
|
2017-05-22 17:19:39 +09:00 |
|
smoogipooo
|
f81ffa636d
|
Use BindTo instead of taking the game's beatmap bindable.
|
2017-05-22 17:18:11 +09:00 |
|
smoogipooo
|
609aac6453
|
Better kiai mode detection.
|
2017-05-22 17:18:05 +09:00 |
|
smoogipooo
|
b241140496
|
Proper kiai mode detection.
|
2017-05-22 17:18:00 +09:00 |
|
smoogipooo
|
abe9c464a8
|
Invert if statements.
|
2017-05-22 17:17:54 +09:00 |
|
Huo Yaoyuan
|
63259a3457
|
Fix depth of header background.
Thanks to the order of adding to parent container, the depth value is actually not needed.
|
2017-05-22 16:00:03 +08:00 |
|
Huo Yaoyuan
|
85684e5fee
|
Do not scroll headers to when scrolling position is negative.
|
2017-05-22 15:54:58 +08:00 |
|
Huo Yaoyuan
|
d0ff9e6576
|
Merge branch 'master' into sections
|
2017-05-22 12:52:27 +08:00 |
|
ColdVolcano
|
059af0850b
|
Changes in-line with framework
|
2017-05-21 23:47:08 -05:00 |
|
Dean Herbert
|
d3495545c5
|
Merge branch 'master' into songselect-fixes
|
2017-05-22 12:29:18 +09:00 |
|
Dean Herbert
|
7f08d60008
|
Merge branch 'master' into generic-interface
|
2017-05-22 11:35:50 +09:00 |
|
Dean Herbert
|
04f0dcc255
|
Merge branch 'master' into replay-no-pausing
|
2017-05-22 11:09:31 +09:00 |
|
Dean Herbert
|
4b17bb8e69
|
Merge branch 'master' into mania-pattern-changes
|
2017-05-22 10:25:17 +09:00 |
|
smoogipooo
|
0a0139aded
|
Remove the concept of beatmap events, rename BreakEvent -> BreakPeriod.
|
2017-05-22 10:12:33 +09:00 |
|
Dean Herbert
|
93182e5da3
|
Merge branch 'master' into generic-interface
|
2017-05-22 09:52:40 +09:00 |
|
Dean Herbert
|
82cf94bbff
|
Move spinner colours to local definition for now
We don't want to start polluting the OsuColours namespace with non-UI colours.
|
2017-05-22 09:50:45 +09:00 |
|
MrTheMake
|
e9c2b51012
|
Random the difficulty too
|
2017-05-22 01:59:10 +02:00 |
|