Thomas Müller
|
b40c897dbd
|
Fix osu logo shockwave playing when transition is aborted
This is a very nice use-case scenario for TransformSequence.OnComplete
|
2017-07-18 15:28:56 +03:00 |
|
Thomas Müller
|
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 |
|
Dean Herbert
|
c5d23daa6b
|
Merge remote-tracking branch 'upstream/master' into remove-dragbar
# Conflicts:
# osu.Game/Overlays/DragBar.cs
|
2017-07-18 13:44:23 +09:00 |
|
Dean Herbert
|
b5035ec245
|
Merge branch 'master' into songselect-preview-fix
|
2017-07-18 13:05:03 +09:00 |
|
Thomas Müller
|
87bcd526f3
|
Get rid of raw AddDelay calls within osu.Game
|
2017-07-17 16:51:21 +03:00 |
|
Thomas Müller
|
19fb03e737
|
Try different formatting style
|
2017-07-16 18:28:20 +03:00 |
|
Thomas Müller
|
032e9df67b
|
ApplyDelay -> AddDelay
|
2017-07-16 17:47:29 +03:00 |
|
Thomas Müller
|
99221260c4
|
Replace several usages of BeginDelayedSequence with LINQ-style
|
2017-07-16 17:42:01 +03:00 |
|
Thomas Müller
|
71105bb9ee
|
Delay -> ApplyDelay; DelayReset -> ResetDelay
|
2017-07-16 14:06:46 +03:00 |
|
Thomas Müller
|
6063219b72
|
Update framework
|
2017-07-16 13:59:26 +03:00 |
|
Thomas Müller
|
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 |
|
Thomas Müller
|
fd58c6e835
|
Nicer generic rolling counters
|
2017-07-14 19:14:07 +03:00 |
|
Thomas Müller
|
b5fbb26f8f
|
Merge branch 'master' of https://github.com/ppy/osu into better-transforms
|
2017-07-14 16:46:18 +03:00 |
|
Thomas Müller
|
c73a1ae058
|
Use TransformTo in rolling counters
|
2017-07-14 16:46:00 +03:00 |
|
Dan Balasescu
|
c13dc943f8
|
Merge branch 'master' into fix-track-rotation
|
2017-07-14 19:25:54 +10:00 |
|
Dan Balasescu
|
3914b3ba13
|
Merge branch 'master' into right-mouse-scrollbar
|
2017-07-14 19:15:00 +10:00 |
|
Dean Herbert
|
95a40e39ec
|
Merge branch 'master' into mods_overlay_fix
|
2017-07-14 17:31:52 +09:00 |
|
Dean Herbert
|
3aeed86392
|
Merge branch 'master' into drawable-room-update
|
2017-07-14 15:29:27 +09:00 |
|
Dean Herbert
|
6c9219856d
|
Add comment
|
2017-07-14 09:39:40 +09:00 |
|
Nabile Rahmani
|
840cc918ea
|
Use Enabled instead of a private field.
|
2017-07-13 23:35:19 +02:00 |
|
Dean Herbert
|
ce204b8e7b
|
Merge remote-tracking branch 'ppy/master' into right-mouse-scrollbar
|
2017-07-14 06:23:07 +09:00 |
|
Nabile Rahmani
|
8014cd55a2
|
Make the skip button clickable only once.
|
2017-07-13 21:59:17 +02:00 |
|
Dean Herbert
|
de46f3ab07
|
Remove all unnecessary parenthesis where object initialisers are used
Enforces at CI.
|
2017-07-13 15:11:33 +09:00 |
|
DrabWeb
|
b196b1d3c6
|
CI fixes, switch RoomInspector to use BeatmapSetCover.
|
2017-07-13 01:24:59 -03:00 |
|
DrabWeb
|
fea40ccc1a
|
Share BeatmapSet cover sprite code.
|
2017-07-13 01:17:47 -03:00 |
|
DrabWeb
|
0624f578eb
|
Update with online beatmap changes.
|
2017-07-13 01:06:46 -03:00 |
|
DrabWeb
|
dc5ec319a2
|
Merge https://github.com/ppy/osu into drawable-room-update
|
2017-07-13 01:00:32 -03:00 |
|
Dean Herbert
|
2c1f3de47a
|
Rename 2X resources to be defaults
|
2017-07-13 10:27:39 +09:00 |
|
Dean Herbert
|
56c817e4b6
|
Merge branch 'master' into osu-direct-search
|
2017-07-13 10:16:27 +09:00 |
|
Dean Herbert
|
9d47dd9ff9
|
Add support for right mouse absolute scrolling (when enabled)
Will likely need to be bindable when hooked up to settings and actually used.
|
2017-07-12 18:57:44 +09:00 |
|
EVAST9919
|
0b1db1502d
|
removed useless bool
|
2017-07-12 09:42:38 +03:00 |
|
EVAST9919
|
ab8fb2edab
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_overlay_fix
|
2017-07-12 09:31:56 +03:00 |
|
Dean Herbert
|
04e99d1369
|
Only apply disable rules when in a screen stack.
|
2017-07-12 13:40:17 +09:00 |
|
Dean Herbert
|
54f6befd67
|
Merge branch 'master' into fix-track-rotation
|
2017-07-12 13:18:16 +09:00 |
|
Dean Herbert
|
0322e66c25
|
Merge remote-tracking branch 'upstream/master' into container-collection-readonlylist
|
2017-07-12 13:07:23 +09:00 |
|
Thomas Müller
|
9d523ea012
|
Update framework
|
2017-07-12 11:06:13 +09:00 |
|
Seth
|
b30721edbe
|
Merge branch 'master' into drawable-room-update
|
2017-07-11 20:42:44 -03:00 |
|
Thomas Müller
|
4045083dcd
|
Update sorting comparers in line with framework changes
|
2017-07-11 21:21:58 +03:00 |
|
Dean Herbert
|
9bbcc0526d
|
Disable beatmap changes in specified screens
|
2017-07-11 18:39:10 +09:00 |
|
DrabWeb
|
b448603d6c
|
CI fixes.
|
2017-07-11 01:42:51 -03:00 |
|
Dean Herbert
|
a9c50786b2
|
Fix osu! logo on main menu ending up in the wrong place
Also switch to using BeginDelayedSequence where possible.
|
2017-07-11 13:27:45 +09:00 |
|
DrabWeb
|
c449491c04
|
Fix RoomInspector covers.
|
2017-07-11 01:18:16 -03:00 |
|
DrabWeb
|
84701846ec
|
Merge https://github.com/ppy/osu into osu-direct-search
|
2017-07-11 00:26:49 -03:00 |
|
Thomas Müller
|
c4e378571b
|
Update framework
|
2017-07-10 11:54:23 +03:00 |
|
Dean Herbert
|
0e0c32008b
|
More changes
|
2017-07-10 15:40:40 +09:00 |
|
Dean Herbert
|
0e2dc9388a
|
More changes in-line with framework changes.
|
2017-07-10 12:55:47 +09:00 |
|
Dean Herbert
|
2c8b8c3f9c
|
Update loop logic in line with framework changes
|
2017-07-09 18:23:34 +09:00 |
|
EVAST9919
|
33206fcf0e
|
Use Hide instead of FadeTo(0)
|
2017-07-08 12:34:24 +03:00 |
|
EVAST9919
|
adb88a8d49
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_overlay_fix
|
2017-07-08 12:28:41 +03:00 |
|
Thomas Müller
|
178685292a
|
Merge branch 'master' of https://github.com/ppy/osu into better-fill-mode
|
2017-07-08 12:25:08 +03:00 |
|