RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,697 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

3979 Commits

Author SHA1 Message Date
smoogipoo cea353975f Update with further framework-side changes 2019-06-04 11:04:28 +09:00
smoogipoo 53a39e9142 Merge remote-tracking branch 'origin/master' into audio-refactor-update 2019-06-04 10:50:33 +09:00
David Zhao 465aa4e0f6 Prevent idle state from being updated incorrectly 2019-05-31 14:06:18 +09:00
Dean Herbert a20eda7b5f Fix remaining cases to work without things 2019-05-28 23:54:42 +09:00
Dean Herbert 4ca34bd5e8 Update osu! in line with audio subsystem refactor 2019-05-28 17:06:01 +09:00
Dan Balasescu 553d786b94
Merge branch 'master' into fix-logo-tracking-crash 2019-05-17 19:23:14 +09:00
Dean Herbert 359e5b71a5 Fix race condition causing player to never restart 2019-05-16 17:13:03 +09:00
Dean Herbert 958598d13b Fix crash on switching from main menu to gameplay too fast 2019-05-15 19:39:36 +09:00
Dean Herbert 4b508915f6 Centralise caching of components at OsuGame level 2019-05-13 17:10:25 +09:00
Dean Herbert 038e49701e Move conditional to within BreakPeriod 2019-05-12 16:25:25 +09:00
Dean Herbert 1391aa342c
Merge branch 'master' into break-pause 2019-05-12 16:15:24 +09:00
Dean Herbert 3566da73cc
Merge branch 'master' into fix-more-pause-cases 2019-05-12 15:57:45 +09:00
Dean Herbert 9add2562f9
Close beatmap options when suspending (#4761) 
Close beatmap options when suspending
 2019-05-12 15:50:10 +09:00
Dean Herbert 790700d8bf Use more correct calculation 2019-05-12 15:40:58 +09:00
Joehu 175daac16a Close beatmap options when suspending 2019-05-11 21:26:42 -07:00
Joehu 29cec54b3c Fix beatmap carousel overlapping beatmap info wedge 2019-05-11 20:08:45 -07:00
smoogipoo bde2d552b6 Merge remote-tracking branch 'origin/master' into fix-more-pause-cases 
# Conflicts:
#	osu.Game.Tests/Visual/Gameplay/TestCasePause.cs
 2019-05-10 22:16:59 +09:00
smoogipoo 01eb1a34a9 Remove unused variable 2019-05-10 22:15:33 +09:00
smoogipoo d2479acbf2 Fix incorrect value being clamped 2019-05-10 18:04:58 +09:00
Dean Herbert fdf67aaa11 Clamp values 2019-05-10 17:18:39 +09:00
smoogipoo 6a957ad27f Fix pause triggered when already paused 2019-05-10 15:51:12 +09:00
smoogipoo 7c105fd99f Fix testcase players pausing on window unfocus 2019-05-10 15:39:25 +09:00
Dean Herbert 9248e6290c Use FrameStabilityClock to denote current position on song progress 2019-05-09 18:09:26 +09:00
Dean Herbert 5942072128 Add a tween when clicking to seek 2019-05-09 18:07:38 +09:00
Dan Balasescu 22940373a0
Merge branch 'master' into zoomablescrollcontainer-fix 2019-05-09 13:54:21 +09:00
smoogipoo 5c6b4d923f Reorder methods 2019-05-09 13:53:53 +09:00
David Zhao d625f3c104 Private method 2019-05-09 13:21:01 +09:00
Dean Herbert 9457a6128e Fix game pausing when made inactive while watching a replay 2019-05-09 10:57:55 +09:00
Dean Herbert 4f697e2bd5 Add licence header 2019-05-08 19:35:20 +09:00
Dean Herbert 6dea16f365 Move action and hotkey specification local 2019-05-08 19:29:43 +09:00
Dean Herbert c91b9c6032 Add missing button 2019-05-08 19:27:53 +09:00
Dean Herbert 772eb460fb Move button definitions to their respective classes 2019-05-08 19:03:26 +09:00
Dean Herbert 0693290ad4 Merge remote-tracking branch 'upstream/master' into refactor-select-footer 2019-05-08 18:43:21 +09:00
Dean Herbert b33372ca62 Don't expand mods in button on hover 2019-05-08 18:43:15 +09:00
Dean Herbert 8906eb874a Fix CI issues 2019-05-08 18:43:06 +09:00
Dean Herbert 9a9ac05cd9 Fix post-merge issues 2019-05-08 18:42:54 +09:00
Dean Herbert bace829629 Add ability to avoid expand animation in ModDisplay 2019-05-08 18:42:26 +09:00
David Zhao ff3c226596 Give ZoomableScrollContainer an initial width 2019-05-08 13:37:03 +09:00
Dan Balasescu 288b3deb94
Merge branch 'master' into fix-rank-display 2019-05-07 15:00:51 +09:00
Dean Herbert 8bc313fb33
Merge branch 'master' into fix-new-inspections 2019-05-07 14:14:40 +09:00
Dean Herbert c878d814f6
Merge branch 'master' into pause-via-inactive 2019-05-07 13:35:23 +09:00
Dean Herbert f7a570d67a Fix double confirmation 2019-05-07 13:34:06 +09:00
smoogipoo 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
Dan Balasescu a1c64d8d26
Merge branch 'master' into fix-retry-sound 2019-05-07 12:40:01 +09:00
Dan Balasescu 8b9cfadd64
Merge branch 'master' into fix-retry-sound 2019-05-07 12:37:22 +09:00
smoogipoo f26a1cff6c Fix beatmap import crashing during room creation 2019-05-07 12:14:57 +09:00
Dean Herbert 7fdc79dd68 Improve skip boundary logic to be closer to expectations 
Supersedes #4693.
Closes #4676.
 2019-05-05 20:20:41 +09:00
Dean Herbert 3e3f12f277 Use more local bindables 2019-05-04 17:53:17 +09:00
Dean Herbert b9a39fb788 Fix instant pausing when game becomes inactive 
Resolves #4685.
 2019-05-04 14:54:29 +09:00
Dean Herbert 41ab82cdc3
Merge branch 'master' into refactor-select-footer 2019-05-03 21:46:41 +09:00