Dean Herbert
855f0a4253
Fix bracket style
2020-03-19 14:38:49 +09:00
Dean Herbert
17c3455b36
Fix potentially invalid push in player while already exiting
2020-03-19 14:10:59 +09:00
smoogipoo
3628814e4e
Merge branch 'fix-score-population' into results-screen
2020-03-17 17:48:39 +09:00
smoogipoo
1c4296f5e7
Implement the new results screen
2020-03-17 17:43:16 +09:00
smoogipoo
daa5e63d0d
Fix replay scores not being populated via player
2020-03-17 16:42:55 +09:00
voidedWarranties
76c832518f
Render video as a part of the storyboard
2020-03-07 21:32:03 -08:00
voidedWarranties
d68d7edea3
Start background video playback based on provided offset
2020-03-07 14:08:13 -08:00
Dean Herbert
a59c3d997d
Refactor implementation to better match what already existed
2020-03-06 18:00:17 +09:00
naoey
3d344a076d
Add test for disabled keycounter, don't discard change event values
2020-03-03 06:17:25 +05:30
naoey
bca58ddb42
Make KeyCounter stop counting during breaks
2020-02-29 21:18:43 +05:30
Dean Herbert
f18a1cde53
Fix crash when reaching results screen on single threaded execution mode
2020-02-29 08:39:27 +09:00
recapitalverb
c753cb46c5
Use [Resolved] wherever possible
2020-02-14 20:14:00 +07:00
Dean Herbert
884a5fbad4
Fix osu! gameplay cursor not adjusting to mod/convert circle size changes
2020-02-14 14:30:15 +09:00
Salman Ahmed
4cd4055e7c
Rename to AlwaysVisible and add XMLDoc
2020-02-03 20:00:43 +03:00
Salman Ahmed
51ed289c59
Revert namings and behaviour changes
2020-02-03 19:59:58 +03:00
Salman Ahmed
351cb8ac1a
Rename Visible to HasReplayLoaded and change default value
...
Doesn't make sense to be true by default
2020-02-03 15:47:52 +03:00
Dean Herbert
b330aec03e
Drain starting at the first hitobject, not gameplay start
2019-12-27 16:16:30 +09:00
Dean Herbert
cac011edc1
Merge branch 'master' into hp-drain
2019-12-26 23:51:12 +09:00
Dean Herbert
033bb15500
Fix early-escape not continuing to results screen ( #7362 )
...
Fix early-escape not continuing to results screen
2019-12-26 23:50:21 +09:00
Dean Herbert
a041f32072
Use cleaner solution via cancellation of older schedule
2019-12-26 19:05:32 +09:00
smoogipoo
8903f286ef
Fix escape not continuing to results screen
2019-12-26 18:27:48 +09:00
smoogipoo
522847987b
Implement break/gameplay start times
2019-12-26 15:00:58 +09:00
smoogipoo
b348abcd07
Only drain health in non-break times
2019-12-26 14:59:49 +09:00
smoogipoo
977fb3d1bf
Make processors and break overlay frame-stable
2019-12-26 14:59:49 +09:00
smoogipoo
a4b1c79e18
Initial implementation of HP drain
2019-12-26 14:59:49 +09:00
smoogipoo
90cb9d9162
Simplify scoreprocesor/healthprocessor implementations
2019-12-26 14:59:49 +09:00
smoogipoo
7414a6aadd
Merge remote-tracking branch 'huoyaoyuan/master' into health-processor
...
# Conflicts:
# osu.Game.Rulesets.Catch/CatchRuleset.cs
# osu.Game.Rulesets.Mania/ManiaRuleset.cs
# osu.Game.Rulesets.Taiko/TaikoRuleset.cs
2019-12-26 14:56:54 +09:00
smoogipoo
c7936e40d5
Protect against potential nullref
2019-12-23 19:13:36 +09:00
smoogipoo
76f2fb378f
Separate score and health parts of ScoreProcessor
2019-12-19 20:03:14 +09:00
smoogipoo
49bf8d27d1
Move CreateScoreProcessor() to Ruleset
2019-12-17 20:08:13 +09:00
Dean Herbert
b5db927d93
Merge branch 'master' into cinema-mod
2019-12-17 12:56:06 +09:00
Dean Herbert
7559012fb7
Merge remote-tracking branch 'upstream/master' into lighten-playfield-during-breaks
2019-12-12 19:55:09 +09:00
Dean Herbert
d15f49f60f
Also hide the break overlay
2019-12-12 16:13:02 +09:00
Dean Herbert
37a94988a3
Merge branch 'improve-hud-hiding' into cinema-mod
2019-12-12 16:12:19 +09:00
smoogipoo
5861eca80d
Make DrawableRuleset take a converted beatmap
2019-12-12 15:58:11 +09:00
Dean Herbert
a93d57b77e
Merge branch 'master' into lighten-playfield-during-breaks
2019-12-12 11:57:21 +09:00
Dean Herbert
d2ada90434
Merge branch 'master' into single-scoreprocessor
2019-12-12 11:36:45 +09:00
Albie
4a1c6db3ed
Merge branch 'master' into cinema-mod
2019-12-11 18:00:17 +00:00
smoogipoo
48f1dad4aa
Remove abstract ScoreProcessor class
2019-12-11 17:25:06 +09:00
Dean Herbert
75f9250645
Don't automatically pause when window is inactive if in break time
2019-12-11 15:46:07 +09:00
Salman Ahmed
53daa37eaa
Fix failing tests
2019-12-10 23:06:13 +03:00
Albie
a61f8cc2c3
Merge branch 'master' into cinema-mod
2019-12-10 17:06:53 +00:00
Salman Ahmed
38f1a8bc17
Bind UserDimContainer.IsBreakTime from Player
2019-12-10 15:14:47 +03:00
Albie
7864899249
Merge branch 'master' into cinema-mod
2019-11-28 16:42:01 +00:00
smoogipoo
f504370867
Make player block exit if pausable
2019-11-28 15:58:26 +09:00
Dean Herbert
6b8983b489
Consider intro and outro time as "break" time
2019-11-25 19:02:11 +09:00
Albie
9fdbb2a58e
change name of interface and expose method instead of seperate values
2019-11-25 07:24:29 +00:00
Albie
9a8e3fe1da
add brackets
2019-11-24 07:44:35 +00:00
Albie
1d6665fe57
improve code quality using resharper and codefactor advice
2019-11-24 07:42:39 +00:00
Albie
b8e5796af5
add forced video/storyboard and disabled dim for mod inside new interface
2019-11-24 07:37:06 +00:00
Dean Herbert
46a94821d4
Add support for consecutive skips
2019-11-21 18:59:55 +09:00
Dean Herbert
cd1dd0f898
Fix adjustments not being removed correctly on retry from pause
2019-11-06 10:38:04 +09:00
Dean Herbert
6dde755ef2
Merge branch 'master' into add-retry-button
2019-11-02 21:23:16 +09:00
Dean Herbert
551032803d
Fix GameplayClockContainer operating on beatmap's track after s… ( #6688 )
...
Fix GameplayClockContainer operating on beatmap's track after screen exited
2019-11-02 21:22:13 +09:00
Dan Balasescu
8a5d3ab40a
Merge branch 'master' into add-retry-button
2019-11-02 10:51:14 +09:00
Dean Herbert
daa0ebe2b5
Add xmldoc
2019-11-01 15:51:45 +09:00
Dean Herbert
14453da1d2
Centralise MakeCurrent call
2019-11-01 15:51:10 +09:00
Dean Herbert
84d17f3702
Add retry button
2019-11-01 15:41:51 +09:00
Dean Herbert
dcc8f6e827
Better group cancel conditional
2019-11-01 14:43:52 +09:00
Dean Herbert
ac02bb005d
Fix GameplayClockContainer operating on beatmap's track after scren exited
2019-11-01 14:11:18 +09:00
nwabear
b0e21c2749
Fixed Issue #6442
2019-10-25 14:57:49 -05:00
Dean Herbert
47c1f36f9d
Add ValidForResume check
2019-10-04 11:41:53 +08:00
Dean Herbert
71985c7ef1
Update fail logic to match
2019-10-04 11:23:42 +08:00
Joehu
a69b9f1148
Fix alt-f4 being blocked during gameplay
2019-10-02 11:16:31 -07:00
smoogipoo
db24cfbead
Merge remote-tracking branch 'origin/master' into auto-restart-mod-perfect
...
# Conflicts:
# osu.Game/Screens/Play/Player.cs
2019-09-19 17:57:04 +09:00
smoogipoo
c76e27549a
Remove spacing
2019-09-19 14:56:52 +09:00
iiSaLMaN
da4d83063e
Simplify LINQ expression
2019-09-19 08:31:11 +03:00
iiSaLMaN
9de0bcae1e
Check for blocking fail mods by default
2019-09-19 07:58:54 +03:00
iiSaLMaN
ecd721e8c5
Add bypass fail property to Player
2019-09-18 22:49:28 +03:00
Dean Herbert
2fcc8c2d72
Simplify implementation, play fail animation during restart
2019-09-19 01:45:59 +09:00
Dean Herbert
ff3a7c1d13
Merge remote-tracking branch 'upstream/master' into auto-restart-mod-perfect
2019-09-19 01:36:29 +09:00
Dean Herbert
2381b4c003
Move video behind storyboard
2019-09-16 00:20:56 +09:00
Andrei Zavatski
437e121056
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video
2019-09-13 13:39:58 +03:00
smoogipoo
cf2f841b4d
Fix player not correctly exiting after an unpause
2019-09-13 15:42:58 +09:00
Dean Herbert
7ca51d3866
Fix resume overlay being drawn below cursor
...
Closes #5905 .
2019-09-02 11:20:55 +09:00
Andrei Zavatski
d4291556ee
Remove unused using
2019-08-31 02:57:14 +03:00
Andrei Zavatski
fd958ec1ab
Remove unused property accessor
2019-08-31 02:56:41 +03:00
Andrei Zavatski
d55be4d59c
Implement DimmableVideo component
2019-08-30 23:48:38 +03:00
Andrei Zavatski
58a0b4e19b
Add basic layout for player
2019-08-30 23:19:55 +03:00
Dean Herbert
7aeeb65ae7
Tidy up Player's container loading logic
...
Fixes drawable ruleset being loaded before skin sources are finished, by loading them as a separate operation (to avoid children being loaded first).
2019-08-27 18:27:21 +09:00
Dean Herbert
5e362d10b1
Add ruleset-specific legacy skin providers
...
This moves implementation of osu! skinnables to OsuLegacySkin.
2019-08-26 12:21:49 +09:00
iiSaLMaN
c2b3c28c79
Use IsBreakTime for checking if currently in a break
...
Rather than iterating over all breaks to find which is in current time
2019-08-07 16:15:53 +03:00
Dean Herbert
dda078277a
Minor variable name changes
2019-08-06 23:05:12 +09:00
iiSaLMaN
2a68bb2749
onCompletionEvent -> pushResults
2019-08-06 14:11:43 +03:00
iiSaLMaN
dd701eaa62
Safely cancel the completion task on restart or immediate exit
2019-08-06 14:10:03 +03:00
Dean Herbert
8b67f88d16
Don't expose dimmable container creation in player
2019-07-12 12:04:45 +09:00
Dean Herbert
46f7bb885b
Move classes to local namespaces
...
Also renames test scene to more appropriate name.
2019-07-12 11:50:06 +09:00
David Zhao
321266e96f
Make UserDimContainer abstract
2019-07-11 13:17:28 +09:00
David Zhao
7929104b8a
move default into StoryboardContainer, fix load bug, remove comment
2019-07-10 12:24:05 +09:00
David Zhao
41afe89c0b
delete no longer needed bindable
2019-07-10 00:46:34 +09:00
David Zhao
5bb21ecae0
remove storyboard region
2019-07-09 16:50:37 +09:00
David Zhao
89cb8a0cac
Move storyboard initialization to new StoryboardContainer
2019-07-09 16:23:59 +09:00
David Zhao
0cf4bf2352
Manually set clock for storyboard if loading before being given a parent
2019-07-08 18:46:12 +09:00
Salman Ahmed
744e651a37
Merge branch 'master' into applicable-to-hud
2019-07-02 05:24:56 +03:00
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
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
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
smoogipoo
8c96e4c1fa
Move back button to OsuGame
2019-06-25 18:33:08 +09:00
Dean Herbert
fad1ced1b5
Add correct conditionals to allow exit
2019-06-24 18:15:27 +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
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
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
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
Lucas A
a5f758b977
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-07 18:27:14 +02:00
Lucas A
d5d31282e5
Rename InitialScreenStatus to InitialScreenActivity in Editor / Player classes
2019-05-05 20:55:42 +02: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
Lucas A
7e42068a14
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-04-28 19:48:35 +02:00
iiSaLMaN
b08fb5136e
Merge branch 'master' into sh-xh-grading-2
2019-04-26 10:38:10 +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
Lucas A
fe8c705f1b
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-04-20 09:42:32 +02: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
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
DrabWeb
e76897d6a7
Fix ResumeContainers appearing when resuming during breaks.
2019-04-07 16:32:55 -03:00
Dean Herbert
6949c233bf
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
2019-03-29 15:02:12 +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
256a579de0
Allow player to not pause on focus loss
2019-03-26 13:17:00 +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
01f795b046
Make restart public rather than reimplementing
2019-03-20 19:45:04 +09:00
Dean Herbert
f43e7a880c
Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
2019-03-20 15:27:06 +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
David Zhao
a8e2072286
Make blurtarget private, improve documentation
2019-03-19 20:15:28 +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
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
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
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
Dean Herbert
fc0b297232
Fix menu cursor not displaying outside of gameplay scaling area
2019-03-05 18:06:24 +09:00
Dan Balasescu
fd147dae21
Merge branch 'master' into fix-disabled-set-crash
2019-03-05 17:25:13 +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
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
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
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
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
smoogipoo
a8ad7d4670
Add silent import parameter
2018-11-30 18:27:13 +09:00
smoogipoo
4c1abdcd8c
Save score upon map completion
2018-11-30 18:25:14 +09:00
smoogipoo
8eff49bccd
Remove User from Replay
2018-11-30 18:25:14 +09:00
Dean Herbert
3727955911
Refactors/renames
2018-11-30 16:35:45 +09:00
smoogipoo
219929eb47
Score -> ScoreInfo
2018-11-28 18:33:01 +09:00
smoogipoo
ed02847752
Beatmap -> BeatmapInfo + add foreign key
2018-11-28 17:26:39 +09:00
smoogipoo
5fd6e6ca77
Re-namespacing
2018-11-28 16:12:57 +09:00
Dean Herbert
7f73fc2d39
Require holding back button to quit gameplay
...
Avoids accidental presses and streamlines logic with on-screen element.
2018-11-07 01:49:21 +09:00
Paul Teng
d8f97a32c7
Make sure restart on fail actually fails
2018-10-31 07:03:37 -04:00
Paul Teng
007dfedbb7
Combine RestartOnFail into FailOverride
2018-10-30 07:12:06 -04:00
Paul Teng
fd774c6a09
Allow restarts in ModPerfect
2018-10-14 11:18:52 -04:00
ekrctb
99fc04c8af
Change signature to new event handler
2018-10-02 12:02:47 +09:00
Dean Herbert
03084aa04b
Revert async changes
2018-08-31 07:07:10 +09:00
smoogipoo
e7a5816d27
Use GetAsync for all samples
2018-08-27 17:30:16 +09:00
smoogipoo
2fb62827e2
Soft-handle errors when beatmap contains no objects
2018-08-22 16:01:58 +09:00
Dean Herbert
7097ecb740
Fix discrepancies in how elements of play mode fade when restarting/exiting
2018-08-02 19:08:23 +09:00
Dean Herbert
8c3583ac54
Remove newline
2018-07-30 14:55:03 +09:00
phosphene47
d32a3ff052
Esc at the end of play should push to result screen
...
Closes #3060
2018-07-28 08:34:51 +10:00
Dean Herbert
44a2ae5f9a
Fix incorrect variable usage
2018-07-23 08:33:47 +02:00
Dean Herbert
3c59ccadd0
Fix gameplay always skipping to first hitobject time
...
Regresssed with previous build
2018-07-22 22:19:58 +02:00
Dean Herbert
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
Dean Herbert
241437c819
Remove unnecessary counting change logic
2018-07-20 17:08:25 +09:00
Dean Herbert
82ddbb3f5d
Delay key count stop
2018-07-19 01:18:07 +09:00
Dean Herbert
8414fe9d05
Add key counter exceptions for paused state
2018-07-18 22:19:32 +09:00
Dean Herbert
a01361f833
Set restart count
2018-07-18 22:05:24 +09:00
Dean Herbert
c2cdf12986
Better pause logic
2018-07-18 19:59:04 +09:00
Dean Herbert
b967fe714b
Fix lead-in time now being long enough in many cases
2018-07-17 14:29:22 +09:00
Dean Herbert
da300baff1
Update hide logic
2018-07-17 00:06:51 +09:00
Dean Herbert
ca7b61367f
Merge branch 'master' into correctQuickFade
2018-07-17 00:02:15 +09:00
HoutarouOreki
453d58bcbd
Hide Content instead of particular overlays
2018-07-15 01:10:05 +02:00
Berkan Diler
c8697e1743
Fix KeyCounter counting clicks when game is paused
2018-07-14 03:08:28 +02:00
HoutarouOreki
1e48582dc2
Instantly hide pause menu for quick retry
2018-07-11 13:49:37 +02:00
Dean Herbert
8cf1553fd5
Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player
2018-06-29 20:30:42 +09:00
Dean Herbert
750f5a86c3
Fix catch test failing due to disabled bindable
2018-06-29 16:49:11 +09:00
Dean Herbert
d7ce4ab6fd
Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player
2018-06-27 12:36:10 +09:00
Dean Herbert
d9e7a324c0
Revert HudOverlay to private field
2018-06-13 11:30:22 +09:00
smoogipoo
67aa52fb1d
Use bindable binding
2018-06-12 19:34:49 +09:00
smoogipoo
c70c7a476b
Always display the key counter during replay/autoplay
2018-06-12 17:59:59 +09:00
smoogipoo
b9391b3c6b
Fix bindable not working under non-debug due to weak references
2018-06-11 18:18:24 +09:00
Aergwyn
792d3b8215
allow "go back" keybind in play
2018-06-09 09:14:58 +02:00
Dean Herbert
0b4f5af52e
Add setting to toggle standardised or exponential scoring display
...
Also adjusts exponential scoring to be closer to stable. Log wasn't cutting it.
2018-06-08 03:17:12 +09:00
Dean Herbert
f3c9049660
Merge branch 'master' into disallow-beatmap-change
2018-06-07 15:34:19 +09:00
smoogipoo
d516a0a05c
Store platform offset clock in variable for visibility
2018-06-07 13:42:31 +09:00
smoogipoo
3745f9000b
Merge remote-tracking branch 'origin/master' into remove-decoder-offset
2018-06-07 13:37:19 +09:00
Dan Balasescu
c30861186b
Merge branch 'master' into disallow-beatmap-change
2018-06-06 20:26:17 +09:00
smoogipoo
4086ff7313
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
# osu.Game/Screens/Menu/Intro.cs
# osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
Dean Herbert
55921efffb
Rewrite much state logic
2018-06-06 16:17:51 +09:00
Dean Herbert
86be1bef6b
Use UserTriggered in Player
2018-06-06 15:10:15 +09:00
Dean Herbert
64eda27547
Update framework
2018-06-03 03:05:53 +09:00
smoogipoo
a3470f9ec3
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
...
# Conflicts:
# osu.Game/Overlays/Music/PlaylistOverlay.cs
# osu.Game/Screens/OsuScreen.cs
2018-05-28 18:01:15 +09:00
smoogipoo
8ae2a3696f
Apply platform universal offset at player level
2018-05-28 03:31:46 +09:00
Dean Herbert
975ce82177
Ensure autoplay tests actually increase score above zero
2018-05-26 14:46:05 +09:00
smoogipoo
8004b8af4d
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
2018-05-23 17:38:02 +09:00
Dean Herbert
156d7fb25a
Change depth of HUD
...
Yes, this is intentional.
2018-05-22 02:08:21 +09:00
Dean Herbert
ebda287e81
Share code with HoldToConfirm implementations elsewhere
2018-05-22 01:44:06 +09:00
Dean Herbert
841336a181
Merge branch 'master' into exit_replay_button
2018-05-21 23:45:06 +09:00
Aergwyn
b7e3ea348b
expose two Bindables with split logic instead of one with mixed logic
2018-05-21 15:53:55 +02:00
Aergwyn
1482bca147
Rename for better understanding
...
ShowOverlays -> AllowOverlays
ShowOverlaysOnEnter -> HideOverlaysOnEnter
2018-05-21 09:42:29 +02:00
Dean Herbert
e2389ad7a4
Allow using back button on PlayerLoader and Replay
2018-05-18 13:32:05 +09:00
Dean Herbert
0234bbc37f
Move definition inline
2018-05-14 19:14:17 +09:00
smoogipoo
115c2dc239
Move hud below the skip button
2018-05-14 18:02:18 +09:00
smoogipoo
64fba5f6d1
Proxy the ruleset cursor above the break overlay
2018-05-14 15:36:56 +09:00
smoogipoo
43409127b7
Place break overlay underneath the hud
2018-05-14 15:36:42 +09:00
smoogipoo
9128e64c9a
Rename OriginalBeatmap back to Beatmap
2018-05-07 10:29:38 +09:00
smoogipoo
4ecdea8b2e
Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer
2018-05-07 10:17:54 +09:00
smoogipoo
77e661489d
Merge branch 'i-beatmap' into beatmap-conversion-rework
2018-05-07 10:00:24 +09:00
smoogipoo
1aefd71b65
Merge remote-tracking branch 'origin/master' into i-beatmap
2018-05-07 09:58:53 +09:00
Roman Kapustin
f8630115d6
Do not expose HoldToQuit.HoldToQuitButton
2018-05-03 23:29:58 +03:00
UselessToucan
d18a8ec9f5
Merge branch 'master' into exit_replay_button
2018-04-28 20:48:16 +03:00
TocoToucan
e6d7136a92
Fix HoldToQuit appearance and set HoldToQuitButton.ExitAction
2018-04-21 20:21:09 +03:00
TocoToucan
21454d1f10
Revert "Add 'End replay' button"
...
This reverts commit c34ef42f00
2018-04-21 19:27:17 +03:00
TocoToucan
c34ef42f00
Add 'End replay' button
2018-04-20 12:50:19 +03:00
Dean Herbert
8bf25542cb
Add PlayerLoader TestCase and fix dummy beatmap load procedure
2018-04-20 17:30:27 +09:00
smoogipoo
03a5df84c6
Initial rework of beatmap conversion process
2018-04-19 22:04:12 +09:00
smoogipoo
66b3b295e7
Use IBeatmap wherever possible
2018-04-19 20:44:38 +09:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
FreezyLemon
46d859a660
exit player earlier if a dummy map is loaded
2018-03-25 13:25:48 +02:00
FreezyLemon
a3d8048aca
abort loading and exit player for dummy maps
2018-03-22 21:46:35 +01:00
Dean Herbert
9ad4e9284a
Add skin source fallback chain
2018-03-20 16:40:11 +09:00
Dean Herbert
13f64a1d12
Merge branch 'master' into cursor-trail
2018-03-14 11:42:40 +09:00
smoogipoo
33c721bcbb
Fix post-merge errors
2018-03-12 09:51:32 +09:00
smoogipoo
6e51b74890
Merge remote-tracking branch 'origin/master' into rewrite-break-overlay
2018-03-12 09:47:05 +09:00
Dean Herbert
487a03d0d7
Merge branch 'master' into cursor-trail
2018-03-11 02:07:05 +09:00
Dean Herbert
6d91889ca6
Move player-specific configuration bindables back to player
2018-03-08 22:16:47 +09:00
TocoToucan
2cb197d0c4
Replace ConfigureBackgroundUpdate with OnEntering
2018-03-08 11:35:00 +03:00
Dean Herbert
6a768e378a
Merge branch 'master' into rewrite-break-overlay
2018-03-07 17:00:34 +09:00
TocoToucan
697ad63d72
Resolve merge conflicts
2018-03-05 22:24:25 +03:00
Dean Herbert
792a3ac469
SkipButton -> SkipOverlay
2018-03-06 00:10:53 +09:00
Dean Herbert
c6c55c40ed
Rewrite BreakOverlay
...
No longer relies on Schedule calls (could not be rewound).
Also no longer sucks.
2018-03-04 00:51:24 +09:00
Dean Herbert
bd510e5356
Merge remote-tracking branch 'upstream/master' into clock-fixes
2018-03-02 21:01:53 +09:00
Dean Herbert
bda673e6fe
Merge branch 'master' into player-reduced-parallax
2018-02-28 23:15:25 +09:00
Dean Herbert
f9faf8e3d8
Localise offset clock usage out of Player as much as possible
2018-02-28 22:01:52 +09:00
Dean Herbert
01fcf9c813
Update in line with framework changes
2018-02-28 22:01:48 +09:00
Dean Herbert
dd6cf1379e
Reduce parallax effect during gameplay
...
This also cleans up some shared code in OsuScreen.
2018-02-28 11:42:47 +09:00
Dean Herbert
f64afc738d
Fix incorrect exit block conditional
...
Resolves #2130 .
2018-02-27 23:59:34 +09:00
Dean Herbert
cff17f1864
Update in line with inverse ShoudProcessClock default
2018-02-27 17:23:38 +09:00
Dean Herbert
8e78a7b114
Fix HUD using incorrect clock for time display
2018-02-27 17:23:38 +09:00
Dean Herbert
37d2a2c3cc
Rename clock types to match across classes
2018-02-27 17:23:38 +09:00
Dean Herbert
3d52ead213
Rename sourceClock
2018-02-27 17:23:38 +09:00
Dean Herbert
fee258f2f2
Rework PauseContainer to better pause
2018-02-27 17:23:38 +09:00
Dean Herbert
d4f1723ae6
Remove unnecessary secondary argument from HUDOverlay
2018-02-27 17:23:38 +09:00
Dean Herbert
0635ae2293
Include missing offset
2018-02-27 17:23:38 +09:00
Dean Herbert
9c0dfb7c8c
Avoid creating an extra framed clock in SkipButton
2018-02-27 17:23:38 +09:00
Dean Herbert
e0faf14a3e
Actually consume ReplacesBackground
2018-02-19 12:33:07 +09:00
Dean Herbert
9760f30ce9
Tidy things up to make more sense
2018-02-16 12:08:36 +09:00
Dean Herbert
f22f9b5de0
Merge branch 'master' into PlayerBase
2018-02-16 11:26:57 +09:00
TocoToucan
c57e8785e2
Move all storyboard loading to Player itself
2018-02-15 23:57:53 +03:00
TocoToucan
86f200e257
Fix possible nullref
2018-02-09 22:04:39 +03:00
TocoToucan
a86a4f49cf
Resolve "Pressing escape on continuing causes the game to return to song select" problem without removing Delay
2018-02-09 21:20:49 +03:00
TocoToucan
a860dd7208
Preview visual settings at the “loading” screen
2018-02-09 00:06:24 +03:00
TocoToucan
d437c1d7ec
Introduce PlayerBase class
2018-02-08 23:28:42 +03:00
Dean Herbert
df65443f07
Merge branch 'master'
...
Conflicts:
osu-framework
osu.Game/Screens/Play/Player.cs
2018-01-30 18:31:03 +09:00
