|
|
1ba608f01f
|
Remove line spacing on similar code
|
2019-03-29 00:26:17 -07:00 |
|
|
|
eefc55f89b
|
Fix volume overlay being blocked by other floating overlays
- excluding settings
|
2019-03-29 00:20:16 -07:00 |
|
|
|
81585a8283
|
Merge branch 'master' into resume-cursor-2
|
2019-03-29 15:56:46 +09:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
1217cfa334
|
Merge branch 'master' into fix-login-overlay-behavior
|
2019-03-29 15:03:07 +09:00 |
|
|
|
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 |
|
|
|
6c34842c4e
|
Merge branch 'master' into fix-loaderanimation-testcase
|
2019-03-29 15:02:45 +09:00 |
|
|
|
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 |
|
|
|
6949c233bf
|
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
|
2019-03-29 15:02:12 +09:00 |
|
|
|
c772a38c1b
|
Merge branch 'master' into fix-loaderanimation-testcase
|
2019-03-29 14:55:00 +09:00 |
|
|
|
ccc0853f75
|
Change login overlay's depth and load order
|
2019-03-29 14:53:40 +09:00 |
|
|
|
90a4cb8e04
|
Fix unnecessary positioning
|
2019-03-29 14:49:15 +09:00 |
|
|
|
5495a0a70f
|
Add content to ScreenTestCase as protection against overwriting
|
2019-03-29 14:34:58 +09:00 |
|
|
|
9a32e12435
|
Merge branch 'master' into fix-login-overlay-behavior
|
2019-03-28 22:28:56 -07:00 |
|
|
|
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 |
|
|
|
cabec85544
|
Rework TestCaseLoaderAnimation to avoid timing issues
|
2019-03-29 14:15:57 +09:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
3e28c4ae0a
|
Fix remaining IconUsage changes
|
2019-03-29 14:03:00 +09:00 |
|
|
|
9c57b9eed2
|
Merge branch 'master' into fix-music-controller-offset
|
2019-03-29 14:02:49 +09:00 |
|
|
|
e45c08ad23
|
Adjust comment
|
2019-03-29 14:02:19 +09:00 |
|
|
|
de47e0a8e8
|
Merge remote-tracking branch 'upstream/master' into screen-title-class
|
2019-03-29 14:01:08 +09:00 |
|
|
|
ac58815907
|
Merge pull request #4539 from peppy/better-player-flags
Remove read/write player flags
|
2019-03-29 13:59:29 +09:00 |
|
|
|
95bf0b9ed6
|
Merge remote-tracking branch 'upstream/master' into fix-music-controller-offset
|
2019-03-29 13:57:02 +09:00 |
|
|
|
c4096fb628
|
Remove unused using
|
2019-03-29 13:56:56 +09:00 |
|
|
|
202a0086cc
|
Merge branch 'master' into better-player-flags
|
2019-03-29 13:45:45 +09:00 |
|
|
|
dc6b438f06
|
Merge pull request #4548 from peppy/framed-replay-handler-fixes
Fix FramedReplayInputHandler frame handling
|
2019-03-29 13:37:06 +09:00 |
|
|
|
c72705217a
|
Merge branch 'master' into framed-replay-handler-fixes
|
2019-03-29 12:59:51 +09:00 |
|
|
|
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 |
|
|
|
14cef94a53
|
Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation
|
2019-03-29 12:59:26 +09:00 |
|
|
|
0439216f7e
|
Merge branch 'master' into stable-storyboard-ordering
|
2019-03-29 12:44:09 +09:00 |
|
|
|
a71e9fdb0e
|
Merge branch 'master' into convert-ranking-statistics
|
2019-03-29 12:42:49 +09:00 |
|
|
|
47665f7a81
|
Merge pull request #4020 from HoLLy-HaCKeR/ctb-pp
Add Catch PerformanceCalculator
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-03-29 12:42:26 +09:00 |
|
|
|
e7b38cdc75
|
Remove unnecessary set
|
2019-03-29 12:38:47 +09:00 |
|
|
|
5b0aa7bf8d
|
Split out current/next frame conditionals for readability
|
2019-03-29 12:38:40 +09:00 |
|
|
|
19825cf237
|
Merge branch 'master' into ctb-pp
|
2019-03-29 12:34:17 +09:00 |
|
|
|
4d66b7e1b9
|
Merge pull request #4543 from Aergwyn/wedge-fix
Fix WedgeBackground bleeding into other elements
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-03-29 12:34:03 +09:00 |
|
|
|
e5b49b1657
|
Merge branch 'master' into ctb-pp
|
2019-03-29 12:24:47 +09:00 |
|
|
|
d6f8dbfd5c
|
Merge branch 'master' into wedge-fix
|
2019-03-29 12:23:42 +09:00 |
|
|
|
8d770404c0
|
Merge pull request #4156 from Aergwyn/correct-preview-loop
Correctly loop from preview point in song select
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-03-29 12:16:48 +09:00 |
|
|
|
fed58fba3a
|
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
|
2019-03-29 12:14:28 +09:00 |
|
|
|
26a73b4a65
|
Merge branch 'master' into correct-preview-loop
|
2019-03-29 12:00:58 +09:00 |
|
|
|
8e7e02b824
|
Merge pull request #4533 from peppy/universal-playfield-adjust
Move all playfield adjustments to universal PlayfieldAdjustmentContainer
|
2019-03-29 12:00:16 +09:00 |
|
|
|
ed0bf59e73
|
Merge branch 'master' into universal-playfield-adjust
|
2019-03-29 11:51:44 +09:00 |
|
|
|
aaeb598649
|
Merge pull request #4536 from peppy/key-counter-display
Rename KeyCounterCollection -> KeyCounterDisplay
|
2019-03-29 11:49:44 +09:00 |
|
|
|
1e369628a5
|
Fix incorrect type specification
|
2019-03-29 11:38:45 +09:00 |
|
|
|
82b9dfdeb1
|
Add important section rewind tests
|
2019-03-29 11:37:12 +09:00 |
|
|
|
bab7d78130
|
Remove redundant cast
Co-Authored-By: peppy <pe@ppy.sh>
|
2019-03-29 11:36:40 +09:00 |
|
|
|
785433bb74
|
Merge branch 'master' into universal-playfield-adjust
|
2019-03-29 11:25:54 +09:00 |
|
