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
|
b33c8226c1
|
Merge pull request #1024 from Tom94/fix-broken-tooltip
Fix OsuTooltipContainer.PopIn not overriding PopOut transforms
|
2017-07-18 18:11:26 +09:00 |
|
Thomas Müller
|
b2dd43075f
|
Update framework
|
2017-07-18 11:57:41 +03:00 |
|
Thomas Müller
|
7acff29bd3
|
Fix OsuTooltipContainer.PopIn not overriding PopOut transforms
|
2017-07-18 11:53:56 +03:00 |
|
Dean Herbert
|
0034b718a9
|
Merge pull request #966 from jai-sharma/remove-dragbar
Remove DragBar and replace with classes that inherit SliderBar
|
2017-07-18 15:43:40 +09:00 |
|
Dean Herbert
|
4b4b03756a
|
Don't use dodgy OnLoaded "event"
|
2017-07-18 15:37:58 +09:00 |
|
Dean Herbert
|
82217be988
|
Fix dodgy event clearing
Also use local ariables where possible.
|
2017-07-18 15:24:52 +09: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
|
ef869cb501
|
Merge pull request #949 from MrTheMake/songselect-preview-fix
Fix not applying song select preview seek
|
2017-07-18 13:09:59 +09:00 |
|
Dean Herbert
|
b5035ec245
|
Merge branch 'master' into songselect-preview-fix
|
2017-07-18 13:05:03 +09:00 |
|
Thomas Müller
|
440878945e
|
Remove remaining usages of AddDelay
|
2017-07-17 18:16:15 +03:00 |
|
Thomas Müller
|
546efc0181
|
Get rid of AddDelay & ResetDelay in osu.Game.Rulesets.Osu
|
2017-07-17 17:05:24 +03:00 |
|
Thomas Müller
|
87bcd526f3
|
Get rid of raw AddDelay calls within osu.Game
|
2017-07-17 16:51:21 +03:00 |
|
Dean Herbert
|
406cf9d0d4
|
Merge pull request #936 from huoyaoyuan/profile
Basic User Profile Page
|
2017-07-17 14:10:52 +09:00 |
|
Dean Herbert
|
93290ef966
|
Rename populate method
|
2017-07-17 13:56:50 +09:00 |
|
Dean Herbert
|
a63124c935
|
User property instead of weirdly named method
|
2017-07-17 13:39:29 +09:00 |
|
Dean Herbert
|
f322c264a0
|
One constant per line
|
2017-07-17 13:24:05 +09:00 |
|
Dean Herbert
|
5d77a5f988
|
Allow closing profile by clicking basically anywhere
|
2017-07-17 10:15:55 +09:00 |
|
Thomas Müller
|
19fb03e737
|
Try different formatting style
|
2017-07-16 18:28:20 +03:00 |
|
Thomas Müller
|
e6916ec57b
|
Update framework
|
2017-07-16 17:48:47 +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
|
5372b94674
|
Remove some unnecessary usings
|
2017-07-14 19:35:44 +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 |
|
Huo Yaoyuan
|
26b36c08a3
|
Prefer ScrollTo in SectionsContainer.
|
2017-07-14 22:56:27 +08:00 |
|
Huo Yaoyuan
|
6cf36da389
|
Merge branch 'master' into profile
|
2017-07-14 22:52:19 +08: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
|
aa15d369c3
|
Merge pull request #1009 from peppy/fix-track-rotation
Fix track rotation
|
2017-07-14 19:48:43 +10:00 |
|
Dan Balasescu
|
fa0c0e3b48
|
Merge branch 'master' into fix-track-rotation
|
2017-07-14 19:38:48 +10:00 |
|
Dan Balasescu
|
68d1e920fd
|
Merge pull request #1016 from peppy/settings-improvements
Settings improvements
|
2017-07-14 19:32:08 +10:00 |
|
Dan Balasescu
|
c13dc943f8
|
Merge branch 'master' into fix-track-rotation
|
2017-07-14 19:25:54 +10:00 |
|
Dan Balasescu
|
a6d917285a
|
Merge branch 'master' into settings-improvements
|
2017-07-14 19:22:45 +10:00 |
|
Dan Balasescu
|
cb213a5f0f
|
Merge pull request #1013 from peppy/right-mouse-scrollbar
Add support for right mouse absolute scrolling (when enabled)
|
2017-07-14 19:22:29 +10:00 |
|
Dan Balasescu
|
3914b3ba13
|
Merge branch 'master' into right-mouse-scrollbar
|
2017-07-14 19:15:00 +10:00 |
|
Dean Herbert
|
b7612af20c
|
Make comment different
|
2017-07-14 18:08:47 +09:00 |
|
Dean Herbert
|
9dba363b08
|
Use button boundaries to decide when to expand sidebar
|
2017-07-14 17:57:01 +09:00 |
|
Dan Balasescu
|
3702d4b921
|
Merge branch 'master' into settings-improvements
|
2017-07-14 18:43:08 +10:00 |
|
Dean Herbert
|
36594afee3
|
Merge pull request #978 from EVAST9919/mods_overlay_fix
Hide "Unranked" text in ModDisplay if play is ranked
|
2017-07-14 17:36:46 +09:00 |
|
Dean Herbert
|
95a40e39ec
|
Merge branch 'master' into mods_overlay_fix
|
2017-07-14 17:31:52 +09:00 |
|
Dean Herbert
|
b957bca4c5
|
Merge branch 'master' into settings-improvements
|
2017-07-14 17:27:09 +09:00 |
|
Dean Herbert
|
e433684899
|
Merge pull request #970 from DrabWeb/drawable-room-update
DrawableRoom design update
|
2017-07-14 15:35:44 +09:00 |
|
Dean Herbert
|
3aeed86392
|
Merge branch 'master' into drawable-room-update
|
2017-07-14 15:29:27 +09:00 |
|
Dean Herbert
|
e2223a24f6
|
Merge pull request #1012 from DrabWeb/medal-splash
Medal splash
|
2017-07-14 14:47:24 +09:00 |
|
Dean Herbert
|
bce4b838d8
|
Formatting
|
2017-07-14 14:40:50 +09:00 |
|
Dean Herbert
|
133bcdec7a
|
Move async loading to a higher level to simplify logic
|
2017-07-14 14:39:15 +09:00 |
|
Dean Herbert
|
980fb18ed6
|
Remove unnecessary alpha/alwayspresent changes
|
2017-07-14 14:30:35 +09:00 |
|