22940373a0
Merge branch 'master' into zoomablescrollcontainer-fix
2019-05-09 13:54:21 +09:00
5c6b4d923f
Reorder methods
2019-05-09 13:53:53 +09:00
d625f3c104
Private method
2019-05-09 13:21:01 +09:00
9457a6128e
Fix game pausing when made inactive while watching a replay
2019-05-09 10:57:55 +09:00
4f697e2bd5
Add licence header
2019-05-08 19:35:20 +09:00
6dea16f365
Move action and hotkey specification local
2019-05-08 19:29:43 +09:00
c91b9c6032
Add missing button
2019-05-08 19:27:53 +09:00
772eb460fb
Move button definitions to their respective classes
2019-05-08 19:03:26 +09:00
0693290ad4
Merge remote-tracking branch 'upstream/master' into refactor-select-footer
2019-05-08 18:43:21 +09:00
b33372ca62
Don't expand mods in button on hover
2019-05-08 18:43:15 +09:00
8906eb874a
Fix CI issues
2019-05-08 18:43:06 +09:00
9a9ac05cd9
Fix post-merge issues
2019-05-08 18:42:54 +09:00
bace829629
Add ability to avoid expand animation in ModDisplay
2019-05-08 18:42:26 +09:00
ff3c226596
Give ZoomableScrollContainer an initial width
2019-05-08 13:37:03 +09:00
288b3deb94
Merge branch 'master' into fix-rank-display
2019-05-07 15:00:51 +09:00
8bc313fb33
Merge branch 'master' into fix-new-inspections
2019-05-07 14:14:40 +09:00
c878d814f6
Merge branch 'master' into pause-via-inactive
2019-05-07 13:35:23 +09:00
f7a570d67a
Fix double confirmation
2019-05-07 13:34:06 +09:00
d7c09e7dbd
Merge remote-tracking branch 'origin/master' into fix-new-inspections
...
# Conflicts:
# osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
# osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
# osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
# osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
# osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Graphics/OsuFont.cs
# osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
# osu.Game/Overlays/Profile/Header/BadgeContainer.cs
# osu.Game/Overlays/Profile/ProfileHeader.cs
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
a1c64d8d26
Merge branch 'master' into fix-retry-sound
2019-05-07 12:40:01 +09:00
8b9cfadd64
Merge branch 'master' into fix-retry-sound
2019-05-07 12:37:22 +09:00
f26a1cff6c
Fix beatmap import crashing during room creation
2019-05-07 12:14:57 +09:00
7fdc79dd68
Improve skip boundary logic to be closer to expectations
...
Supersedes #4693 .
Closes #4676 .
2019-05-05 20:20:41 +09:00
3e3f12f277
Use more local bindables
2019-05-04 17:53:17 +09:00
b9a39fb788
Fix instant pausing when game becomes inactive
...
Resolves #4685 .
2019-05-04 14:54:29 +09:00
41ab82cdc3
Merge branch 'master' into refactor-select-footer
2019-05-03 21:46:41 +09:00
31341bfeb1
use SongSelect's SelectedMods property to ensure it exists
2019-05-03 16:51:33 +08:00
009eaa647a
fixes to FooterButtonRandom
2019-05-03 16:38:15 +08:00
6bdaca1e3b
Fix mod equality checks not working as intended
2019-05-03 10:09:47 +09:00
3b03ca802a
Merge branch 'master' into sh-xh-grading-2
2019-04-30 18:55:35 +03:00
5a9277ec0e
Merge branch 'master' into fix-retry-sound
2019-04-28 23:38:14 +09:00
fa340a9eff
Merge branch 'master' into profile-header-update
2019-04-27 23:48:23 +09:00
db75516e79
Merge branch 'master' into fix-lead-in-issues
2019-04-27 21:01:21 +09:00
d40177f97c
Merge branch 'master' into drawnode-composability
2019-04-27 18:41:19 +09:00
b08fb5136e
Merge branch 'master' into sh-xh-grading-2
2019-04-26 10:38:10 +03:00
a680a38e81
Merge pull request #4675 from nyquillerium/playerloader-tracking
...
Prevent PlayerLoader from tracking the logo after it has been exited.
2019-04-26 13:21:13 +09:00
4e0f21102b
Merge branch 'sh-xh-grading-2' of https://github.com/iiSaLMaN/osu into sh-xh-grading-2
2019-04-25 14:04:12 +03:00
c6b3197dd0
Add AdjustRank and use it in Hidden Mod
2019-04-25 13:56:57 +03:00
3b0d4c1bad
Merge branch 'turn-on-warnings' into profile-header-update
2019-04-25 17:43:10 +09:00
0bd35ab7bb
Turn on warnings, resolve issues
2019-04-25 17:36:17 +09:00
6fdcd98caa
Don't play screen "back" sample when retrying
2019-04-25 14:15:07 +09:00
b911322c92
Merge branch 'master' into fix-lead-in-issues
2019-04-25 12:34:29 +09:00
9fa8f62077
Merge branch 'master' into update-framework
2019-04-25 12:25:17 +09:00
8222923ab8
Only track logo if we're still the current screen
2019-04-24 16:20:51 +09:00
bb69330e9f
Call ProcessFrame on the userOffsetClock after a seek
...
Without doing this, GameplayClock can be left in an incorrect state after a seek (due to the userOffsetClock being its own FramedClock).
2019-04-24 15:28:14 +09:00
efaedafc08
Fix (legacy) AudioLeadIn being used incorrectly.
...
This lead-in is intended to specify a value before zero, not a value before the start time.
Also removes an unnecessary ProcessFrame call (it happens within Seek itself).
2019-04-24 15:28:14 +09:00
0838206ddd
Shorten multiplayer header to multi
2019-04-22 22:44:43 -07:00
0bf17081f6
Merge branch 'master' into update-framework
2019-04-23 11:31:17 +09:00
c88a11a38f
Merge branch 'master' into fix-multiplayer-crash
2019-04-23 09:28:03 +09:00
414d555484
Fix possible exit from non-current screen
2019-04-22 19:24:57 +09:00
