naoey
bfcbb47b77
Clean up some more leftover code
2019-06-30 10:56:20 +05:30
welsar55
d6561531a3
Merge branch 'master' into combobreak
2019-06-29 11:55:10 -05:00
Welsar55
a22c166575
Make ComboEffects its own class
2019-06-29 11:28:40 -05:00
naoey
d8f6bbc90e
Disable replay button when replay is unavailable
2019-06-29 12:49:03 +05:30
naoey
7d9e215744
Code quality fixes
2019-06-29 12:29:12 +05:30
naoey
424711d24b
Fix replay button shake container
...
- Add license headers
- Slightly reduce bottom margin of button in score screen
2019-06-29 12:26:37 +05:30
naoey
bc52f76556
Move replay button to score card
2019-06-29 10:55:30 +05:30
Welsar55
a57218e50e
Move to LocalSkinOverride
2019-06-28 20:45:11 -05:00
iiSaLMaN
d37cefbad8
Implement IApplicableToHUD
2019-06-29 04:23:59 +03:00
naoey
53d6d74537
Update to match upstream changes
2019-06-28 09:33:13 +05:30
naoey
ab0bb8b678
Implement replay downloading with ArchiveDownloadModelManager
2019-06-28 09:33:13 +05:30
Welsar55
826699a7e7
Remove unneeded bindable
2019-06-26 12:16:44 -05:00
Welsar55
7dd1479050
Add combobreak sound
2019-06-26 00:20:33 -05:00
Dean Herbert
40cf573368
Fix pause not correctly showing pause screen
2019-06-25 23:15:58 +09:00
Dean Herbert
f9dad0f640
Merge remote-tracking branch 'upstream/master' into gamewide-backbutton
2019-06-25 20:23:49 +09:00
smoogipoo
8c96e4c1fa
Move back button to OsuGame
2019-06-25 18:33:08 +09:00
Dean Herbert
7bc7df2249
Reduce background brightness at PlayerLoader
2019-06-25 17:22:10 +09:00
Dean Herbert
f91467eddc
Fix licence header
2019-06-24 18:34:23 +09:00
Dean Herbert
fad1ced1b5
Add correct conditionals to allow exit
2019-06-24 18:15:27 +09:00
Dean Herbert
d70248338d
Merge remote-tracking branch 'upstream/master' into quickEscape
2019-06-24 18:14:48 +09:00
Dean Herbert
26d5c2d85a
Remove local implementation of bindable in OsuCheckbox
2019-06-17 19:37:24 +09:00
Dean Herbert
021d0273f9
Split out user activity from user status ( #4619 )
...
Split out user activity from user status
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-12 20:14:03 +09:00
Dean Herbert
20b43c20c8
Rename variables to remove redundant "screen" terminology
2019-06-12 16:33:15 +09:00
Dean Herbert
a9c229b1ec
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-06-12 16:00:35 +09:00
Lucas A
15893bbb75
Drop UserActivity prefix for subclasses nested in UserActivity + Change status messages.
2019-06-11 19:41:48 +02:00
Dean Herbert
606be3d7ce
Merge branch 'master' into backgrounded-beatmap-status-lookups
2019-06-12 00:22:47 +09:00
Dean Herbert
00ee45fe46
Merge remote-tracking branch 'origin/update-visibility-container' into update-framework
2019-06-11 19:36:13 +09:00
Dean Herbert
609a82bc94
Update VisibilityContainer usage in line with framework
2019-06-11 15:13:58 +09:00
Lucas A
141775d98c
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-06-10 21:41:00 +02:00
smoogipoo
f090e292c9
Move ArchiveModelManager import process to async flow
2019-06-10 13:42:22 +09:00
Dean Herbert
5c2ea0b1a7
Move dispose to end of file
2019-06-10 01:14:46 +09:00
Dean Herbert
d964f6ba9e
Tween track frequency on pause
2019-06-10 00:56:35 +09:00
Lucas A
a2bc5b538e
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-06-05 16:59:38 +02:00
Dean Herbert
9c214c3f0e
Add animation on failing
2019-06-04 16:13:16 +09:00
Dean Herbert
4ca34bd5e8
Update osu! in line with audio subsystem refactor
2019-05-28 17:06:01 +09:00
Lucas A
a819dd764f
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-25 11:02:19 +02:00
Dean Herbert
359e5b71a5
Fix race condition causing player to never restart
2019-05-16 17:13:03 +09:00
Lucas A
55663b3576
Nest all UserActivities into UserActivity
2019-05-12 17:38:02 +02:00
Lucas A
5ac6bd8204
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-12 11:53:30 +02: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
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
Dean Herbert
9457a6128e
Fix game pausing when made inactive while watching a replay
2019-05-09 10:57:55 +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
bace829629
Add ability to avoid expand animation in ModDisplay
2019-05-08 18:42:26 +09:00
Lucas A
a5f758b977
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-07 18:27:14 +02: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
8b9cfadd64
Merge branch 'master' into fix-retry-sound
2019-05-07 12:37:22 +09:00
Lucas A
d5d31282e5
Rename InitialScreenStatus to InitialScreenActivity in Editor / Player classes
2019-05-05 20:55:42 +02: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
Lucas A
a4a2ce5ec0
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-02 21:36:28 +02:00
Lucas A
5d4aa5a12e
Add ScreenStatus property to change the OsuScreen's status + Renamed old ScreenStatus property to InitialScreenStatus
2019-05-02 20:51:19 +02:00
iiSaLMaN
3b03ca802a
Merge branch 'master' into sh-xh-grading-2
2019-04-30 18:55:35 +03:00
Lucas A
7e42068a14
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-04-28 19:48:35 +02:00
Dean Herbert
5a9277ec0e
Merge branch 'master' into fix-retry-sound
2019-04-28 23:38:14 +09:00
Dean Herbert
db75516e79
Merge branch 'master' into fix-lead-in-issues
2019-04-27 21:01:21 +09:00
Dean Herbert
d40177f97c
Merge branch 'master' into drawnode-composability
2019-04-27 18:41:19 +09:00
iiSaLMaN
b08fb5136e
Merge branch 'master' into sh-xh-grading-2
2019-04-26 10:38:10 +03:00
Dean Herbert
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
KingLuigi4932
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
KingLuigi4932
c6b3197dd0
Add AdjustRank and use it in Hidden Mod
2019-04-25 13:56:57 +03:00
smoogipoo
0bd35ab7bb
Turn on warnings, resolve issues
2019-04-25 17:36:17 +09:00
Dean Herbert
6fdcd98caa
Don't play screen "back" sample when retrying
2019-04-25 14:15:07 +09:00
David Zhao
8222923ab8
Only track logo if we're still the current screen
2019-04-24 16:20:51 +09:00
Dean Herbert
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
Dean Herbert
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
Dan Balasescu
8fc0bf24c7
Merge branch 'master' into fix-hold-for-menu-icon
2019-04-22 18:57:43 +09:00
Dean Herbert
48e82d4b1c
Fix hold for menu button's icon being incorrect
2019-04-22 18:47:28 +09:00
Dean Herbert
6856571f17
Fix incorrect seek target
2019-04-22 18:45:58 +09:00
Dean Herbert
55c5ef898d
Remove delay on entering player
2019-04-22 18:29:58 +09:00
Dean Herbert
908eee9942
Fix pause tests
2019-04-22 18:29:51 +09:00
Dean Herbert
6f2bc943eb
Fix rank display on break info display
2019-04-21 12:04:15 +08:00
Lucas A
fe8c705f1b
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-04-20 09:42:32 +02:00
Dean Herbert
2d7b3094ba
Merge branch 'master' into player-mod-reinstantiation
2019-04-17 16:42:57 +08:00
smoogipoo
12b6bc48bd
Use .With() wherever possible
2019-04-17 17:24:09 +09:00
smoogipoo
09568be270
Merge remote-tracking branch 'origin/master' into facade-container
...
# Conflicts:
# osu.Game/Screens/Play/PlayerLoader.cs
2019-04-17 17:17:33 +09:00
smoogipoo
5a3d6a0258
Fix post-merge errors
2019-04-17 16:11:59 +09:00
Dean Herbert
bb539af1a0
Merge branch 'master' into player-mod-reinstantiation
2019-04-16 22:35:21 +08:00
Lucas A
5887008fb3
Merge branch 'master' into user-status-wiring
2019-04-15 11:43:53 +02:00
DrabWeb
c766631ad6
Check for breaks using GameplayClock time.
2019-04-13 11:39:22 -03:00
Lucas A
361c0ec9f2
Allow UserStatusSoloGame to provide metadata such as the ruleset the current beatmap is played in
2019-04-13 13:18:44 +02:00
Lucas A
da5d6cb1d4
Add Beatmap fields to UserStatusSoloGame & UserStatusEditing so they can carry metadata about the played / edited beatmap
2019-04-12 22:54:35 +02:00
smoogipoo
0222424aef
Make mods IReadOnlyList<Mod> gamewide
...
Prevents potential multiple evaluations of enumerable.
2019-04-10 17:20:36 +09:00
smoogipoo
85d3ff4846
Merge remote-tracking branch 'origin/master' into no-workingbeatmap-mods
...
# Conflicts:
# osu.Game/Screens/Play/GameplayClockContainer.cs
2019-04-10 12:06:51 +09:00
smoogipoo
4310f07a5c
Rename SelectedMods -> Mods
2019-04-10 12:03:57 +09:00
smoogipoo
4c571acd67
Reinstantiate mods for every player
2019-04-09 13:33:16 +09:00
smoogipoo
c584967eb1
Remove mods from workingbeatmap
2019-04-09 12:59:32 +09:00
smoogipoo
772bef91fa
Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
...
# Conflicts:
# osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
2019-04-08 23:01:12 +09:00
David Zhao
a690302d00
Apply reviews
2019-04-08 15:24:09 +09:00
DrabWeb
e76897d6a7
Fix ResumeContainers appearing when resuming during breaks.
2019-04-07 16:32:55 -03:00
Dean Herbert
46ecaf3d6c
Merge branch 'master' into facade-container
2019-04-05 21:14:21 +09:00
David Zhao
7047f305a1
Apply reviews, add safety for multiple facades
2019-04-05 12:02:47 +09:00
David Zhao
b2857384b8
Remove unnecessary logo assignment
2019-04-04 12:08:05 +09:00
David Zhao
15b2b6af7d
Clean up remaining assignments of logo relativePositionAxes
2019-04-04 11:28:36 +09:00
David Zhao
8a40b27e8f
Remove need for logo relativePositionAxes none
2019-04-03 20:32:53 +09:00
David Zhao
2ed945605e
Fix Axes.None requirement for FacadeContainer
2019-04-03 19:57:22 +09:00
Dean Herbert
efd7bea771
Add further xmldoc
2019-04-03 17:01:11 +09:00
Dean Herbert
50f8ab3dfb
Fix gameplay offset handling on seeks
2019-04-03 16:58:20 +09:00
Dean Herbert
f1952c0816
Update font awesome usage
2019-04-02 19:55:24 +09:00
smoogipoo
a56e29347f
Adjust namespaces
2019-04-02 14:51:28 +09:00
David Zhao
020be50f03
Merge remote-tracking branch 'upstream/master' into facade-container
2019-04-02 11:28:44 +09:00
Dean Herbert
c39c37a18d
Apply more missed cases
2019-04-01 12:44:46 +09:00
Dean Herbert
612db31c38
Apply newline additions
2019-04-01 12:16:32 +09:00
David Zhao
952a12bb19
Return logo relativepositionaxes on content out
2019-03-29 16:54:34 +09:00
Dean Herbert
6949c233bf
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
2019-03-29 15:02:12 +09:00
Dean Herbert
202a0086cc
Merge branch 'master' into better-player-flags
2019-03-29 13:45:45 +09:00
Dean Herbert
fed58fba3a
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
2019-03-29 12:14:28 +09:00
Dan Balasescu
d410054ec8
Merge branch 'master' into key-counter-display
2019-03-29 11:22:59 +09:00
Dean Herbert
7715606188
Merge branch 'master' into sprite-icon-compatibility
2019-03-29 11:15:34 +09:00
David Zhao
9d66a5e4b2
Ensure logo stops tracking before suspend animation
2019-03-28 16:29:35 +09:00
David Zhao
039e451ab1
ensure logo is where it already needs to be on resume
2019-03-28 16:14:28 +09:00
David Zhao
bfe44eb33d
Remove SizeForFlow magic number
2019-03-28 15:40:58 +09:00
David Zhao
061527a260
Add new automated tests for logofacade, reset interpolation
2019-03-27 20:04:01 +09:00
Dean Herbert
de80fc0eac
Update icon usage to match framework changes
2019-03-27 19:29:27 +09:00
David Zhao
2e3791be1c
Fix incorrect usage of LogoFacade
2019-03-27 18:11:12 +09:00
David Zhao
ca7a20585d
Apply reviews, delete playerloader test
2019-03-27 17:28:53 +09:00
David Zhao
384eee3395
Remove DI requirement for the Facade in PlayerLoader
2019-03-27 11:32:26 +09:00
David Zhao
3fe52be77f
Better tests, add documentation
2019-03-26 17:22:36 +09:00
Dean Herbert
a88f23e555
Convert remaining two flags to ctor parameters
2019-03-26 16:53:44 +09:00
Dean Herbert
83863d35c3
Remove AllowLeadIn flag
2019-03-26 16:35:00 +09:00
Dean Herbert
8658de5108
Rename KeyCounterCollection -> KeyCounterDisplay
...
Also fix not working
2019-03-26 13:52:48 +09:00
Dean Herbert
b4d785c76c
Don't update gameplay loop while paused
2019-03-26 13:36:17 +09:00
Dean Herbert
256a579de0
Allow player to not pause on focus loss
2019-03-26 13:17:00 +09:00
Dean Herbert
b75ea295db
Rename KeyCounterCollection -> KeyCounterDisplay
...
Also fix not working
2019-03-26 11:28:43 +09:00
David Zhao
35bf262d19
Merge remote-tracking branch 'upstream/master' into facade-container
2019-03-26 11:11:13 +09:00
David Zhao
a0f6718145
Better tests and implementation
2019-03-26 10:48:29 +09:00
Dean Herbert
245f463e3f
Don't update gameplay loop while paused
2019-03-25 20:31:55 +09:00
Dean Herbert
8ad4009c33
osu! resume overlay
2019-03-25 20:31:55 +09:00
David Zhao
d37968d88d
Add better test for facade containers
2019-03-24 15:18:38 +09:00
Dean Herbert
11b474e194
Handle released for safety
2019-03-24 12:19:09 +09:00
Dean Herbert
0d72104235
Refactor for formatting sanity
2019-03-24 12:03:06 +09:00
Dean Herbert
8ad19fc2d4
Merge branch 'master' into menu-globalaction-select
2019-03-24 11:58:52 +09:00
David Zhao
6e98a8dd7c
Initial implementation
2019-03-22 20:01:58 +09:00
David Zhao
e93311fdc9
DI facade
2019-03-22 19:01:32 +09:00
Dean Herbert
9e6cdd7bd5
Combine conditionals and clarify comment
2019-03-22 14:42:51 +09:00
Dean Herbert
5b8fd6822e
Move storyboard logic region down
2019-03-22 14:39:20 +09:00
Dean Herbert
15f9a6b9df
Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
2019-03-21 16:04:18 +09:00
Dean Herbert
67a65b80fc
Merge branch 'master' into visual-settings-container
2019-03-20 20:48:30 +09:00
Dean Herbert
ba89bfee0c
Define explicit method to add background
...
Also cleans up some redundant/misplaced comments.
2019-03-20 20:16:45 +09:00
Dean Herbert
8865d53992
Reword comment
2019-03-20 20:04:07 +09:00
David Zhao
2e9d823af4
Add comment regarding HandlePositionalInput
2019-03-20 19:59:54 +09:00
David Zhao
2ff7aa6c2e
Remove handle positional input
2019-03-20 19:49:37 +09:00
David Zhao
bc6e8ce7b4
Merge branch 'visual-settings-container' of https://github.com/nyquillerium/osu into visual-settings-container
2019-03-20 19:48:57 +09:00
Dean Herbert
01f795b046
Make restart public rather than reimplementing
2019-03-20 19:45:04 +09:00
David Zhao
8543e8c36f
Put loadcomplete next to other protected overrides
2019-03-20 19:42:39 +09:00
Dean Herbert
cda5bc28c8
Add proper comment
2019-03-20 19:41:20 +09:00
David Zhao
9013afe412
Query for input manager once
2019-03-20 19:35:40 +09:00
David Zhao
fbfef844de
Add test case for resuming PlayerLoader
2019-03-20 17:18:42 +09:00
David Zhao
a5916f995e
Use the previous conditional instead
2019-03-20 16:54:42 +09:00
David Zhao
e9034c8a30
Move blurring logic into Update instead
2019-03-20 16:50:47 +09:00
Dean Herbert
f43e7a880c
Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
2019-03-20 15:27:06 +09:00
Dean Herbert
6f1610be79
Merge branch 'master' into ruleset-container-refactor
2019-03-20 14:55:58 +09:00
Dean Herbert
5f288650bf
Fix misses/typos
2019-03-20 14:49:33 +09:00
David Zhao
15637f9c4a
Rework instant blur logic such that updateVisuals doesn't need to be public
2019-03-20 14:17:35 +09:00
Dean Herbert
baea7230bc
Rename RulesetContainer to DrawableRuleset
2019-03-19 23:47:31 +09:00
Dean Herbert
68f28326a2
Refactor RulesetContainer for readability
2019-03-19 20:21:31 +09:00
David Zhao
a8e2072286
Make blurtarget private, improve documentation
2019-03-19 20:15:28 +09:00
David Zhao
dc26e90a8d
Remove unused usings
2019-03-19 13:16:06 +09:00
David Zhao
df37973e84
Move showstoryboard into player
2019-03-19 13:13:19 +09:00
David Zhao
27a92e017c
rename back to UserDimContainer
2019-03-19 13:06:14 +09:00
David Zhao
f1b2073bf6
Merge remote-tracking branch 'upstream/master' into visual-settings-container
2019-03-19 13:01:05 +09:00
Dean Herbert
4f075f4740
Add more comprehensive testing
2019-03-18 20:33:43 +09:00
Dean Herbert
9433a97747
Add resume requesting support and fix exit scenarios
2019-03-18 20:33:43 +09:00
Dean Herbert
536b5e0dab
Remove PausableGameplayContainer
2019-03-18 20:33:43 +09:00
Dean Herbert
f13003c53b
Simplify and localise storyboard logic in Player.cs
2019-03-18 20:33:43 +09:00
Dean Herbert
bcaff9f7b4
Add basic pause tests
2019-03-18 20:33:43 +09:00
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
