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
|
dee6a1e2be
|
Merge branch 'master' into songselect-fix
|
2017-05-24 09:45:34 +09:00 |
|
MrTheMake
|
24f64c8815
|
More formatting
|
2017-05-24 02:38:05 +02:00 |
|
MrTheMake
|
67774192dd
|
Formatting fixes
|
2017-05-24 02:30:32 +02:00 |
|
MrTheMake
|
0616256bd0
|
CI fix
|
2017-05-24 02:23:52 +02:00 |
|
MrTheMake
|
09adb23591
|
Fix scheduled task not being canceled
|
2017-05-24 02:22:30 +02:00 |
|
DrabWeb
|
be1ae2bd8e
|
Remove ??, value can never be null
|
2017-05-23 15:08:02 -03:00 |
|
Dean Herbert
|
b477e5cd9e
|
Fix potential nullref
|
2017-05-24 02:53:21 +09:00 |
|
smoogipooo
|
0a385055dc
|
Remove Func<T>'d-ness.
|
2017-05-24 02:53:08 +09:00 |
|
DrabWeb
|
7a4b476121
|
Tab character
|
2017-05-23 14:46:23 -03:00 |
|
DrabWeb
|
aa9a636c3c
|
Indentation
|
2017-05-23 14:42:57 -03:00 |
|
DrabWeb
|
7b9eacc213
|
CI fixes
|
2017-05-23 14:41:30 -03:00 |
|
DrabWeb
|
fbbcc80a3e
|
Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct
|
2017-05-23 14:34:58 -03:00 |
|
DrabWeb
|
4f17a4fe91
|
Make result counts scroll with the panels
|
2017-05-23 14:34:34 -03:00 |
|
smoogipooo
|
41824e0179
|
Add comment.
|
2017-05-24 02:24:10 +09:00 |
|
smoogipooo
|
2d1df8fd8a
|
xmldoc fixes.
|
2017-05-24 02:22:28 +09:00 |
|
smoogipooo
|
9e7f384203
|
Fix returning incorrect control points for non-timing points.
|
2017-05-24 02:19:22 +09:00 |
|
Dean Herbert
|
813b09189c
|
Remove unused parameter
|
2017-05-24 02:09:31 +09:00 |
|
Dean Herbert
|
7e827c4f11
|
Add amplitude adjust
|
2017-05-24 01:45:01 +09:00 |
|
Dean Herbert
|
f57b234cc3
|
Expose Beatmap in BeatSyncedContainer
|
2017-05-24 01:44:47 +09:00 |
|
smoogipooo
|
462bbd02ba
|
Simplify expression.
|
2017-05-24 01:38:28 +09:00 |
|
smoogipooo
|
7628cdf522
|
Return first control point in the list if the time is before it.
|
2017-05-24 01:38:04 +09:00 |
|
Dean Herbert
|
b12300391b
|
Merge branch 'master'
|
2017-05-24 01:17:09 +09: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
|
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 |
|
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 |
|
DrabWeb
|
8a364c6068
|
CI fixes
|
2017-05-22 03:37:36 -03:00 |
|
DrabWeb
|
aa40f88258
|
Add UserStatusOffline
|
2017-05-22 03:32:02 -03:00 |
|
DrabWeb
|
a73cf92994
|
Add second UserPanel to visual test, center cover sprite
|
2017-05-22 03:27:08 -03:00 |
|
DrabWeb
|
bdab545ca4
|
Use BeatmapBackgroundSprite
|
2017-05-22 03:15:22 -03:00 |
|
DrabWeb
|
77affc1eb7
|
Split onto multiple lines
|
2017-05-22 03:13:55 -03:00 |
|
DrabWeb
|
7ce3b73ecd
|
Added UserPanel and UserStatus
|
2017-05-22 03:11:42 -03:00 |
|
DrabWeb
|
3c35badf06
|
Unused using
|
2017-05-22 02:03:53 -03:00 |
|
DrabWeb
|
6bf0ca59fe
|
Make FilterControl not scroll with the panels
|
2017-05-22 02:03:26 -03: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 |
|
DrabWeb
|
d1df895844
|
Unused using
|
2017-05-22 01:16:59 -03:00 |
|
DrabWeb
|
26bf9dd64b
|
Remove unused Background
|
2017-05-22 01:13:51 -03:00 |
|
DrabWeb
|
800a319470
|
Remove newline
|
2017-05-22 01:08:35 -03:00 |
|
DrabWeb
|
0c30b2c698
|
Remove folder from osu.Game.csproj
|
2017-05-22 01:07:26 -03:00 |
|
DrabWeb
|
0795089d86
|
Merge https://github.com/ppy/osu into drawable-multiplayer-room
|
2017-05-22 01:06:05 -03:00 |
|
DrabWeb
|
82fdf1a918
|
Bindables, avatars, more cleanup
|
2017-05-22 01:01:55 -03:00 |
|
Dean Herbert
|
d3495545c5
|
Merge branch 'master' into songselect-fixes
|
2017-05-22 12:29:18 +09:00 |
|
DrabWeb
|
e5ee7096f8
|
Initial cleanup
|
2017-05-22 00:07:15 -03: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 |
|
DrabWeb
|
c4e6870c12
|
Merge https://github.com/ppy/osu into roompanel
|
2017-05-21 22:37:00 -03:00 |
|
DrabWeb
|
bc980b60ac
|
Add files to project, update with framework changes
|
2017-05-21 22:36:46 -03: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 |
|