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

471 Commits

Author SHA1 Message Date
Dean Herbert b2872b47d0
Merge branch 'master' into UserDimLogic 2019-02-28 17:18:04 +09:00
Dean Herbert 26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
David Zhao 882fff1631 Assert storyboard visibilty at both steps of toggle 2019-02-27 17:56:44 +09:00
David Zhao 14ffd9efe8 Add fake storyboard to visually assess storyboard dim 2019-02-27 17:02:04 +09:00
David Zhao d750023c52 Fix TestCasePlayerLoader not having a background stack 2019-02-25 22:05:49 +09:00
David Zhao 16fa30f71e Fix bindable 2019-02-25 13:27:44 +09:00
David Zhao ccc86b66fa Use local private bindable in Player.cs 2019-02-25 13:15:37 +09:00
David Zhao af4606f3d2 Create new test for StoryboardReplacesBackground 2019-02-25 12:35:01 +09:00
David Zhao 24f5bc7a75 Add documentation and move storyboard init logic 2019-02-24 20:03:24 +09:00
David Zhao f4acd6e48f Move PlayerLoader tests out of constructor, Improve Documentation 2019-02-24 18:10:59 +09:00
David Zhao ab3fa91a2f
Merge branch 'master' into UserDimLogic 2019-02-22 20:38:10 +09:00
Dean Herbert 3fe4b8fd1c Update variable names 
Also cleans up some weird code
 2019-02-22 17:51:39 +09:00
David Zhao 263972a048 Remove DimLevel bindable from ScreenWithBeatmapBackground 2019-02-22 17:00:00 +09:00
smoogipoo d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
David Zhao 97db8abd59 Remove unused includes 2019-02-21 18:34:11 +09:00
David Zhao 0677194f46 Move all storyboard show logic into UserDimContainer 2019-02-21 18:14:58 +09:00
David Zhao ad5e81f0cd Add test case for background preview, fix unit tests 2019-02-21 15:24:26 +09:00
David Zhao 1bd1b6b099 Move user dim logic into UserDimContainer instead 2019-02-20 16:53:57 +09:00
David Zhao af049004dd Add test cases for transitioning into pause overlay and into results 2019-02-18 19:53:55 +09:00
David Zhao 80800f2931 Match up fade behavior with current master 2019-02-18 16:34:11 +09:00
David Zhao 9be25c3758 Fix unit tests 2019-02-18 16:00:59 +09:00
David Zhao f241d67e5f Use conditional operator isntead of if 2019-02-18 15:23:03 +09:00
David Zhao df148f8787 Fix background dim not being disabled on playerloader exit 2019-02-18 12:55:42 +09:00
David Zhao 8693d6a76b
Merge branch 'master' into UserDimLogic 2019-02-15 17:11:21 +09:00
David Zhao 6da9f94ae3 Fix regression with background dim 2019-02-15 16:17:01 +09:00
David Zhao 3a74ad678a clean up unused includes 2019-02-14 18:41:10 +09:00
David Zhao e2a312a663 Move user dimming logic into its own container 2019-02-14 17:47:53 +09:00
Dean Herbert 166cdab2e8 Remove unnecessary null check 2019-02-13 14:14:57 +09:00
Dean Herbert 2ea839c475 Fix crashes on beatmap not being set correctly in player 2019-02-12 19:18:22 +09:00
smoogipoo 91302ea0bc Merge remote-tracking branch 'origin/master' into iscreen 
# Conflicts:
#	osu.Game/Screens/Multi/Match/MatchSubScreen.cs
#	osu.Game/Screens/Multi/Multiplayer.cs
#	osu.Game/Screens/Multi/MultiplayerSubScreen.cs
#	osu.Game/Screens/OsuScreen.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
 2019-01-29 21:21:36 +09:00
smoogipoo 7b1c1f3728 Move toolbar showing and overlay activation to OsuGame 
Now exposed through IOsuScreen.
 2019-01-28 15:42:06 +09:00
smoogipoo 8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09:00
Dean Herbert 8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert 1730ad143f
Merge branch 'master' into fix-key-counter 2019-01-23 18:22:08 +09:00
chrisny286 bb56c4a1a7 use Color4.Black and White + using osuTK.Graphics 2019-01-23 09:08:34 +01:00
chrisny286 f4ebab2d3a Fix backgrounds being transparent in some scaling modes 
by replacing `.FadeTo` at the necessary places with `.FadeColour`.
restoring the `.FadeColour` in `fadeOut` of the Player Screen which is ran in every exit scenario.
 2019-01-23 08:52:25 +01:00
Dean Herbert f107a922b4 Add tests for key counter inside player heirarchy 2019-01-23 14:51:25 +09:00
Dean Herbert 74539b5e5c Merge remote-tracking branch 'upstream/master' into letterboxing 2019-01-07 18:52:48 +09:00
Dean Herbert 7d1163a7d2 Remove unnecessary null check 2019-01-04 15:49:23 +09:00
Dean Herbert c528a3896d Formatting and naming 2019-01-04 15:34:32 +09:00
Dean Herbert 3953f829c8 Add letterbox/screen scaling support 2019-01-04 13:36:02 +09:00
Dean Herbert b6dc6c4a74
Merge branch 'master' into do_not_use_local_user_for_autoplay_score 2019-01-04 13:11:17 +09:00
smoogipoo a62405d82d Fix plays with mods not submitting 2018-12-27 22:17:03 +09:00
smoogipoo bb08bf10a0 Fix post-merge issues 2018-12-22 16:26:27 +09:00
smoogipoo daa6292e08 Split results screen to allow for extensibility 2018-12-22 15:39:06 +09:00
Dean Herbert 71e5ce59da Fix crash on exiting player during results transition 2018-12-13 16:23:51 +09:00
Roman Kapustin c6c255718b Handle ModAutoplay during score construction in the Player 2018-12-03 22:37:26 +03:00
smoogipoo 795933d1a1 CreateScoreInfo -> CreateScore 2018-11-30 18:32:08 +09:00
smoogipoo a6b0e35b2d Fix post-rebase issues 2018-11-30 18:31:54 +09:00