fce580d717
Reshuffle namespaces
2017-07-26 13:22:46 +09:00
e68675f970
Rename EasingTypes to Easing
2017-07-22 20:53:53 +02:00
598b3f051e
Address CI concerns and update framework
2017-07-22 11:15:45 +02:00
a7dc8a892b
Update framework
2017-07-21 17:24:09 +02:00
2cd8f6b30c
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-21 11:15:26 +02:00
f7b64a458a
Fix incorrect end time calculation in SongProgressGraph
2017-07-21 10:10:25 +09:00
ed6478be8b
Merge branch 'master' into always-load-storyboard
2017-07-20 20:54:16 +02:00
3bdd4d7d02
Centralise TrackManager.AddItem logic to avoid duplicate adds
2017-07-20 17:46:33 +09:00
67b95926c4
Remove usage of SetExclusive
...
Also immediately disposes WorkingBeatmaps on ValueChanged.
2017-07-20 16:45:44 +09: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
d75e439f94
Fix Player crashing due to null BeatmapInfo (now unused).
2017-07-20 01:27:27 +09:30
38431f8555
Fix remaining test case issues
2017-07-19 19:10:04 +09:00
64ebc01a3b
Remove many now unnecessary null-checks
2017-07-19 15:45:23 +09:00
d0dea33faa
Make Beatmap (bindable) non-nullable.
2017-07-19 15:16:53 +09:00
4d8261fe0b
Merge branch 'master' of https://github.com/ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
# osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
# osu.Game/Overlays/DragBar.cs
2017-07-18 15:16:02 +03:00
c5d23daa6b
Merge remote-tracking branch 'upstream/master' into remove-dragbar
...
# Conflicts:
# osu.Game/Overlays/DragBar.cs
2017-07-18 13:44:23 +09:00
87bcd526f3
Get rid of raw AddDelay calls within osu.Game
2017-07-17 16:51:21 +03:00
19fb03e737
Try different formatting style
2017-07-16 18:28:20 +03:00
032e9df67b
ApplyDelay -> AddDelay
2017-07-16 17:47:29 +03:00
99221260c4
Replace several usages of BeginDelayedSequence with LINQ-style
2017-07-16 17:42:01 +03:00
71105bb9ee
Delay -> ApplyDelay; DelayReset -> ResetDelay
2017-07-16 14:06:46 +03:00
6063219b72
Update framework
2017-07-16 13:59:26 +03: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
fd58c6e835
Nicer generic rolling counters
2017-07-14 19:14:07 +03:00
b5fbb26f8f
Merge branch 'master' of https://github.com/ppy/osu into better-transforms
2017-07-14 16:46:18 +03:00
c73a1ae058
Use TransformTo in rolling counters
2017-07-14 16:46:00 +03:00
c13dc943f8
Merge branch 'master' into fix-track-rotation
2017-07-14 19:25:54 +10:00
95a40e39ec
Merge branch 'master' into mods_overlay_fix
2017-07-14 17:31:52 +09:00
6c9219856d
Add comment
2017-07-14 09:39:40 +09:00
840cc918ea
Use Enabled instead of a private field.
2017-07-13 23:35:19 +02:00
8014cd55a2
Make the skip button clickable only once.
2017-07-13 21:59:17 +02:00
de46f3ab07
Remove all unnecessary parenthesis where object initialisers are used
...
Enforces at CI.
2017-07-13 15:11:33 +09:00
0b1db1502d
removed useless bool
2017-07-12 09:42:38 +03:00
ab8fb2edab
Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_overlay_fix
2017-07-12 09:31:56 +03:00
54f6befd67
Merge branch 'master' into fix-track-rotation
2017-07-12 13:18:16 +09:00
0322e66c25
Merge remote-tracking branch 'upstream/master' into container-collection-readonlylist
2017-07-12 13:07:23 +09:00
9d523ea012
Update framework
2017-07-12 11:06:13 +09:00
4045083dcd
Update sorting comparers in line with framework changes
2017-07-11 21:21:58 +03:00
9bbcc0526d
Disable beatmap changes in specified screens
2017-07-11 18:39:10 +09:00
c4e378571b
Update framework
2017-07-10 11:54:23 +03:00
0e0c32008b
More changes
2017-07-10 15:40:40 +09:00
0e2dc9388a
More changes in-line with framework changes.
2017-07-10 12:55:47 +09:00
33206fcf0e
Use Hide instead of FadeTo(0)
2017-07-08 12:34:24 +03:00
adb88a8d49
Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_overlay_fix
2017-07-08 12:28:41 +03:00
178685292a
Merge branch 'master' of https://github.com/ppy/osu into better-fill-mode
2017-07-08 12:25:08 +03:00
3c425dd07f
Fix CI issue
2017-07-08 18:06:59 +09:00
22a987f6cc
Update test cases to new framework and fix old crashes
2017-07-07 15:05:55 +03:00
6de9776e05
Update framework with tooltip changes
2017-07-07 08:59:17 +03:00
