Dean Herbert
7034f24c45
Merge branch 'master' into direct-favourites-sort
2019-03-31 12:54:54 +09:00
Dan Balasescu
ae7cc64571
Merge pull request #4561 from peppy/fix-stable-import
...
Fix stable import failing
2019-03-31 12:04:31 +09:00
Joehu
92673c6d1e
Add ability to sort by favourites on osu!direct
2019-03-30 19:24:16 -07:00
Dean Herbert
73de146fb4
Update test null check to match
2019-03-31 01:42:38 +09:00
Dean Herbert
d53e6f7e0e
Remove unused references
2019-03-31 01:34:50 +09:00
Dean Herbert
5d91c3bcfc
Fix replay handler nullref crashes
2019-03-31 01:33:56 +09:00
Dean Herbert
42eaabe24c
Fix editor blueprints being misplaced
...
Regressed with PlayfieldAdjustmentContainer changes.
2019-03-31 01:29:37 +09:00
Dean Herbert
41d776b090
Fix stable import failing
...
Regressed due to null GameHost. Fixes the new reports in #4043 .
2019-03-30 23:56:38 +09:00
Dean Herbert
6738bd54c0
Merge pull request #4557 from Joehuu/remove-comments-issues
...
Remove unnecessary comments on issue templates
2019-03-30 13:01:43 +09:00
Dean Herbert
230a260212
Merge branch 'master' into remove-comments-issues
2019-03-30 12:54:48 +09:00
Dean Herbert
ff75a37acf
Merge pull request #4559 from peppy/update-framework
...
Update framework
2019-03-30 12:53:53 +09:00
Dean Herbert
22519ddacc
Update framework
2019-03-30 12:45:09 +09:00
Aergwyn
47711eef42
Reword issue descriptions
...
Co-Authored-By: Joehuu <madamba.joehu@outlook.com>
2019-03-29 07:51:28 -07:00
smoogipoo
772545dd22
Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design
2019-03-29 18:21:20 +09:00
Joehu
85abcb3de0
Remove regular issue template
2019-03-29 01:15:04 -07:00
Joehu
669397b14b
Specify labels by the template's purpose
2019-03-29 01:12:42 -07:00
Joehu
e4ef542710
Remove unnecessary comments on issue templates
2019-03-29 01:03:42 -07:00
David Zhao
952a12bb19
Return logo relativepositionaxes on content out
2019-03-29 16:54:34 +09:00
David Zhao
352b4b20d9
Correct the sizes of TestCaseLogoFacadeContainer
2019-03-29 16:28:25 +09:00
Joehu
1ba608f01f
Remove line spacing on similar code
2019-03-29 00:26:17 -07:00
Joehu
eefc55f89b
Fix volume overlay being blocked by other floating overlays
...
- excluding settings
2019-03-29 00:20:16 -07:00
Dean Herbert
81585a8283
Merge branch 'master' into resume-cursor-2
2019-03-29 15:56:46 +09:00
Dean Herbert
b8580cde6d
Merge pull request #4549 from Joehuu/fix-login-overlay-behavior
...
Fix login overlay blocking toolbar input
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-03-29 15:17:27 +09:00
smoogipoo
2967c876ea
Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design
...
# Conflicts:
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs
# osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
# osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
2019-03-29 15:11:00 +09:00
Dean Herbert
1217cfa334
Merge branch 'master' into fix-login-overlay-behavior
2019-03-29 15:03:07 +09:00
Dean Herbert
315ff33d3a
Merge pull request #4554 from smoogipoo/fix-loaderanimation-testcase
...
Rework TestCaseLoaderAnimation to avoid timing issues
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-03-29 15:02:51 +09:00
Dean Herbert
6c34842c4e
Merge branch 'master' into fix-loaderanimation-testcase
2019-03-29 15:02:45 +09:00
Dean Herbert
4225d41a84
Merge pull request #4443 from jorolf/screen-title-class
...
Add ScreenTitle class
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-03-29 15:02:38 +09:00
Dean Herbert
6949c233bf
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
2019-03-29 15:02:12 +09:00
Dean Herbert
c772a38c1b
Merge branch 'master' into fix-loaderanimation-testcase
2019-03-29 14:55:00 +09:00
Dean Herbert
ccc0853f75
Change login overlay's depth and load order
2019-03-29 14:53:40 +09:00
Dean Herbert
90a4cb8e04
Fix unnecessary positioning
2019-03-29 14:49:15 +09:00
Dean Herbert
5495a0a70f
Add content to ScreenTestCase as protection against overwriting
2019-03-29 14:34:58 +09:00
Joseph Madamba
9a32e12435
Merge branch 'master' into fix-login-overlay-behavior
2019-03-28 22:28:56 -07:00
Dean Herbert
a1fa497ec0
Merge pull request #4546 from Joehuu/fix-music-controller-offset
...
Fix offset of music controller when toolbar is hidden
Co-authored-by: Dean Herbert <pe@ppy.sh>
Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-03-29 14:26:28 +09:00
smoogipoo
cabec85544
Rework TestCaseLoaderAnimation to avoid timing issues
2019-03-29 14:15:57 +09:00
Dean Herbert
bda8ce2dbb
Merge pull request #4537 from peppy/stable-storyboard-ordering
...
Add stable storyboard element ordering
Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-03-29 14:15:26 +09:00
Dean Herbert
3e8952b087
Merge pull request #4521 from peppy/hitobject-drawable-representation
...
Fix DrawableRuleset drawable creation method's name
2019-03-29 14:08:23 +09:00
Dean Herbert
3e28c4ae0a
Fix remaining IconUsage changes
2019-03-29 14:03:00 +09:00
Dan Balasescu
9c57b9eed2
Merge branch 'master' into fix-music-controller-offset
2019-03-29 14:02:49 +09:00
Dan Balasescu
e45c08ad23
Adjust comment
2019-03-29 14:02:19 +09:00
Dean Herbert
de47e0a8e8
Merge remote-tracking branch 'upstream/master' into screen-title-class
2019-03-29 14:01:08 +09:00
Dan Balasescu
ac58815907
Merge pull request #4539 from peppy/better-player-flags
...
Remove read/write player flags
2019-03-29 13:59:29 +09:00
Dean Herbert
95bf0b9ed6
Merge remote-tracking branch 'upstream/master' into fix-music-controller-offset
2019-03-29 13:57:02 +09:00
Dean Herbert
c4096fb628
Remove unused using
2019-03-29 13:56:56 +09:00
Dean Herbert
202a0086cc
Merge branch 'master' into better-player-flags
2019-03-29 13:45:45 +09:00
Dan Balasescu
dc6b438f06
Merge pull request #4548 from peppy/framed-replay-handler-fixes
...
Fix FramedReplayInputHandler frame handling
2019-03-29 13:37:06 +09:00
Dean Herbert
c72705217a
Merge branch 'master' into framed-replay-handler-fixes
2019-03-29 12:59:51 +09:00
Dean Herbert
ad44116845
Merge pull request #4542 from smoogipoo/convert-ranking-statistics
...
Fix incorrect statistics being shown in results
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-03-29 12:59:44 +09:00
Dean Herbert
14cef94a53
Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation
2019-03-29 12:59:26 +09:00
