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

1194 Commits

Author SHA1 Message Date
Dean Herbert 465c95e952 Refactor pause logic so GameplayClockContainer is in control 2019-03-18 20:33:43 +09:00
Dean Herbert 14df9f94e2
Merge branch 'master' into fix-background-loading 2019-03-18 14:59:35 +09:00
Dan Balasescu e0b3149e32
Merge branch 'master' into api-testability 2019-03-18 10:59:06 +09:00
David Zhao 8fc90bb9a0 Remove unused usings 2019-03-14 16:26:34 +09:00
David Zhao 8cdfb1fd61 Remove BlurrableBackgroundScreen, rework tests 2019-03-14 16:09:17 +09:00
David Zhao 8714902349 Handle all blurring directly from background 2019-03-14 14:02:46 +09:00
Dean Herbert 0042cc5337
Merge branch 'master' into mod-ramp-hotfix 2019-03-14 13:02:29 +09:00
David Zhao de6d8fc637 Move user blurring into VIsualSettingsContainer 2019-03-13 18:25:22 +09:00
Dean Herbert f0114d776d Use interface to access API 
Allows for better testability.
 2019-03-13 12:58:18 +09:00
Dean Herbert c1a356161f Allow use rate adjust to fallback to clock rate adjust 2019-03-12 18:14:01 +09:00
Dean Herbert 3c2d8cad0a Add better async logic for ScreenWithBeatmapBackground 2019-03-12 17:32:40 +09:00
Dean Herbert cdeaa80fea Call ResetSpeedAdjustments before adjusting clock 2019-03-12 11:35:25 +09:00
Dean Herbert 13b3036ec6 Fix "wind" mods adjusting rate twice 
This is a hotfix for incorrect framework behaviour.

Closes #4442
 2019-03-12 02:45:45 +09:00
Dean Herbert 1be4c7b813 Fix excess newline 2019-03-12 02:23:23 +09:00
Dean Herbert 38e75421ab Fix HoldForMenuButton getting stuck in a confirming state 
Closes #4446.
 2019-03-12 02:21:34 +09:00
smoogipoo d055b248ac Remove blank line 2019-03-08 15:56:36 +09:00
smoogipoo 7c5ca67691 Merge remote-tracking branch 'origin/master' into gameplay-clock-container 
# Conflicts:
#	osu.Game/Screens/Play/Player.cs
 2019-03-08 15:54:15 +09:00
Dean Herbert ed8c9bc88a Merge remote-tracking branch 'upstream/master' into gameplay-clock-container 2019-03-08 15:07:55 +09:00
Dean Herbert 42efea1e06 Apply review 2019-03-08 15:05:45 +09:00
Dean Herbert 64b6eaa844 Simplify inward bindings 2019-03-07 16:04:11 +09:00
Dean Herbert 58ef397f4f Move all clock related gameplay logic inside GameplayClockContainer 2019-03-07 16:02:24 +09:00
Dean Herbert ffe53411f6 Add back cursor proxying 2019-03-06 17:44:58 +09:00
Dean Herbert acf518c208 Move cursor inside playfield 2019-03-06 17:41:54 +09:00
Dean Herbert 5411c63093 Fix menu cursor not displaying outside of gameplay scaling area 2019-03-06 17:14:08 +09:00
Dean Herbert 6b042eae94
Merge branch 'master' into fix-cursor-in-scale-container 2019-03-05 22:22:56 +09:00
Dean Herbert 8a6fa0915e
Merge branch 'master' into simplify-gameplay-clock 2019-03-05 20:22:46 +09:00
Dean Herbert 76ce3954a0 Rename PauseContainer 2019-03-05 19:30:55 +09:00
Dan Balasescu fafc80818c
Fix typo 
Co-Authored-By: peppy <pe@ppy.sh>
 2019-03-05 18:50:46 +09:00
Dean Herbert fc0b297232 Fix menu cursor not displaying outside of gameplay scaling area 2019-03-05 18:06:24 +09:00
smoogipoo c06dac5b1a Remove null check (beatmap cannot be null) 2019-03-05 17:58:30 +09:00
smoogipoo 2fee7276ae Combine creation + assignment 2019-03-05 17:58:05 +09:00
Dan Balasescu bb6c83ab25
Merge branch 'master' into show-mods-on-loader 2019-03-05 17:46:35 +09:00
Dan Balasescu fd147dae21
Merge branch 'master' into fix-disabled-set-crash 2019-03-05 17:25:13 +09:00
Dean Herbert 93c79023dc Merge remote-tracking branch 'upstream/master' into simplify-gameplay-clock 2019-03-05 16:41:01 +09:00
Dean Herbert 4e33a98dbc Move gameplay clock to own class 2019-03-05 13:53:47 +09:00
Dean Herbert c5cd9972c4 Make restart private 2019-03-05 13:37:51 +09:00
Dean Herbert 01f1018d02 Tidy up clock logic using DI and a GameplayClock 2019-03-05 13:37:51 +09:00
Dean Herbert 5bb0511f0a Fix SquareGraph not correctly filling columns when loaded with a non-zero time 2019-03-05 13:37:28 +09:00
LeNitrous cf51c8aa31 attempt to comply with appveyor 2019-03-01 19:10:32 +08:00
LeNitrous 4e081fe1fc Merge branch 'show-mods-on-loader' of https://github.com/LeNitrous/osu into show-mods-on-loader 2019-03-01 18:41:41 +08:00
Dean Herbert 30e820d107 Fix storyboard potentially being loaded many times 2019-02-28 20:36:00 +09:00
Dean Herbert 53eb0e7e4e More formatting fixes 2019-02-28 20:30:23 +09:00
Dean Herbert 6861163226 Remove pointless method 2019-02-28 20:21:27 +09:00
David Zhao e3338e94d1 Make test cases more compact, add two way toggles 2019-02-28 20:01:15 +09:00
Dan Balasescu 99812bd448
Apply suggestions from code review 
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
 2019-02-28 18:25:58 +09:00
Dean Herbert b2872b47d0
Merge branch 'master' into UserDimLogic 2019-02-28 17:18:04 +09:00
David Zhao 69b1c76dce Actually implement blurring fix 2019-02-28 16:51:17 +09:00
Dan Balasescu 3a1066ff02
Merge branch 'master' into toquantity-1 2019-02-28 15:57:51 +09:00
Joehu 2241e1af9d Use ToQuantity for words with number prefixes 2019-02-27 21:55:45 -08:00
Dean Herbert 2dbf7d122c
Merge branch 'master' into use-pattern-matching 2019-02-28 14:53:07 +09:00
Dean Herbert e2c6a8bc07 Use pattern matching wherever possible 2019-02-28 14:35:00 +09:00
Dean Herbert 0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert 42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert 26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Dean Herbert 3e1f283281 Merge remote-tracking branch 'upstream/master' into more-inspections 2019-02-28 13:09:18 +09:00
Dean Herbert c8793911a8 Enable more stringent inspectcode style inspections 2019-02-27 21:25:40 +09:00
Dean Herbert 3af7d4939c Add debounce testing 2019-02-27 19:11:09 +09:00
Dean Herbert 43a1df6e5c Inline cancellation token source creation 2019-02-27 18:58:53 +09:00
Dean Herbert 6f5d4ce2e2 Debounce SquareGraph some more 2019-02-27 18:58:45 +09:00
Dean Herbert 8c4a59e57e Fix SquareGraph more 2019-02-27 18:58:34 +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
Dean Herbert 56697339b3
Merge branch 'master' into fix-disabled-set-crash 2019-02-27 11:14:42 +09:00
David Zhao d750023c52 Fix TestCasePlayerLoader not having a background stack 2019-02-25 22:05:49 +09:00
Dean Herbert 80737b9ef8 Remove "silent" parameter; consolidate import logic 2019-02-25 18:24:06 +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 3a9835fcdd Merge branch 'UserDimLogic' of https://github.com/nyquillerium/osu into UserDimLogic 2019-02-24 18:11:08 +09:00
David Zhao f4acd6e48f Move PlayerLoader tests out of constructor, Improve Documentation 2019-02-24 18:10:59 +09:00
Dean Herbert b140fc973a
Merge branch 'master' into UserDimLogic 2019-02-24 17:48:59 +09:00
Dean Herbert 2281a0235d Fix regression causing playback rate to display incorrectly 2019-02-24 15:27:06 +09:00
David Zhao ab3fa91a2f
Merge branch 'master' into UserDimLogic 2019-02-22 20:38:10 +09:00
smoogipoo d61dfe888e Fix venera fonts not being correctly specified 2019-02-22 19:42:09 +09:00
Dean Herbert 3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
Dean Herbert 0431582959 Remove excess new line 2019-02-22 17:57:49 +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
David Zhao 65cdac60c3 Add tests to make sure the background is always the same through screen transitions 2019-02-22 14:43:05 +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
smoogipoo cc33f230b4 Merge remote-tracking branch 'origin/master' into osu-fontusage 2019-02-20 20:37:48 +09:00
Jamie Taylor 9b3f2fdd24
Change RelativePositionAxes default on osu! logo to be both 2019-02-20 19:34:55 +09:00
smoogipoo 4db5531e4b Replace copy-constructor/method with extension method 2019-02-20 19:32:30 +09:00
David Zhao 49c5a9fc30
Merge branch 'master' into UserDimLogic 2019-02-20 17:30:34 +09:00
David Zhao d703a9511a Fix background dim previews 2019-02-20 17:20:45 +09:00
David Zhao 1bd1b6b099 Move user dim logic into UserDimContainer instead 2019-02-20 16:53:57 +09:00
smoogipoo dbfa95b9e7 Made medium the default font weight 2019-02-20 16:52:36 +09:00
smoogipoo 0693ab8e7d Merge remote-tracking branch 'origin/master' into osu-fontusage 
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
 2019-02-20 15:04:08 +09:00
smoogipoo a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
smoogipoo 703df77000 Update in-line with framework IsActive changes 2019-02-19 19:16:03 +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