2cd8f6b30c
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-21 11:15:26 +02:00
d6968ca09c
Remove FullyLoaded logic
...
Always parse storyboards for now.
Let's not optimise this until it is necessary. It was leading to weird threading problems due to the load call in Player's async load method.
2017-07-20 11:01:50 +09:00
d69470f2ae
Fix TestWorkingBeatmap broken by attempting to load storyboard
2017-07-20 09:22:39 +09:00
c4619f614a
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-19 19:15:51 +02:00
da92fccdb0
Merge branch 'master' into non-null-beatmap
2017-07-19 18:32:42 +09:00
d7dddec328
Set zero-difficulty values local to the dummy beatmap
2017-07-19 18:32:11 +09:00
0b53f1a7e3
Reference system
2017-07-19 18:09:59 +09:00
a01209cfe0
Simplify comparator
2017-07-19 18:09:59 +09:00
d0dea33faa
Make Beatmap (bindable) non-nullable.
2017-07-19 15:16:53 +09:00
632d2e8ba5
Dummy beatmap has dummy ruleset
2017-07-19 15:16:48 +09:00
3289d93f22
Give the dummy beatmap a background
2017-07-19 15:16:42 +09:00
007b343854
Fix incorrect equality check when TimingPointAt returns a default T
2017-07-19 15:16:40 +09:00
21984ba764
Move DummyWorkingBeatmap to a more global level (OsuScreen)
2017-07-19 15:16:39 +09:00
e47faf4e85
Add a dummy beatmap provider for use in BeatmapInfoWedge
2017-07-19 15:16:33 +09:00
6f59e5feec
Add null check on stream
2017-07-19 14:56:27 +09:00
a5e610a7ba
Update framework and fix compilation
...
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
3aeed86392
Merge branch 'master' into drawable-room-update
2017-07-14 15:29:27 +09:00
de46f3ab07
Remove all unnecessary parenthesis where object initialisers are used
...
Enforces at CI.
2017-07-13 15:11:33 +09:00
b196b1d3c6
CI fixes, switch RoomInspector to use BeatmapSetCover.
2017-07-13 01:24:59 -03:00
fea40ccc1a
Share BeatmapSet cover sprite code.
2017-07-13 01:17:47 -03:00
9d523ea012
Update framework
2017-07-12 11:06:13 +09:00
40225238d9
Set RelativeSizeAxes for updated FillMode behavior
2017-06-28 12:24:23 +03:00
62dee59672
Shapes namespace
...
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
f439237bd7
Set a more sane default for TimingControlPoint's BeatLength
2017-06-15 14:19:06 +09:00
ffbb46f668
Update in line with framework.
2017-06-12 12:48:47 +09:00
4abad17b92
Fix Black Space after } and Symbol Spacing
2017-06-08 14:48:42 +08:00
223c75327f
Remove key/val in favor of local variables + method call.
2017-05-30 20:59:53 +09:00
5b5c2e4717
Back to using val...
2017-05-30 20:37:30 +09:00
0728aea6a4
Fixes + cleanup.
2017-05-30 20:26:39 +09:00
93a33be596
val -> value, val -> line (in cases where a key is not used).
2017-05-30 19:52:43 +09:00
0175b91927
Cleanups.
2017-05-30 19:52:21 +09:00
94ae730a20
Merge branch 'master' into storyboards
2017-05-29 17:49:51 +09:00
6101fe98e1
Always ApplyDefaults after parsing beatmaps to make sure hit objects are in their most loaded state.
2017-05-29 12:10:29 +09:00
e46e1d96a7
Move logic to handleEvent
2017-05-27 00:20:19 -05:00
a523dfc388
Allow variables of variables
...
Some storyboards like to do tricky stuff
2017-05-27 00:13:46 -05:00
0b770d1225
Allow for variables in storyboards
2017-05-26 23:55:34 -05:00
4ee11764b8
Merge branch 'master' into osu-direct
2017-05-24 12:16:34 +09:00
53f489b447
Remove using
2017-05-24 11:50:12 +09:00
0a385055dc
Remove Func<T>'d-ness.
2017-05-24 02:53:08 +09: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
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
0842e00f13
Merge branch 'master' into controlpoint-rework
2017-05-24 00:20:15 +09:00
0634a3a5c5
Merge branch 'master' into osu-direct
2017-05-23 17:33:20 +09:00
fe7ac20e29
Read menu music from osz resource
2017-05-23 16:38:43 +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
