Shane Woolcock
|
a483dfd2d7
|
Allow confineMouseTracker to be null
|
2020-10-05 11:54:39 +10:30 |
|
Shane Woolcock
|
5859755886
|
Use current OverlayActivationMode to determine confine logic
|
2020-10-05 11:11:46 +10:30 |
|
Shane Woolcock
|
4b6f893408
|
Merge branch 'master' into confine-during-gameplay
# Conflicts:
# osu.Game/Configuration/OsuConfigManager.cs
# osu.Game/OsuGame.cs
# osu.Game/Screens/Play/Player.cs
|
2020-10-05 10:23:37 +10:30 |
|
Dean Herbert
|
136843c8e4
|
Make DrawableStoryboardSample a SkinnableSound
Allows sharing pause logic with gameplay samples.
|
2020-09-29 14:25:39 +09:00 |
|
Joehu
|
c5b684bd2e
|
Fix typo in log when beatmap fails to load
|
2020-09-23 00:30:20 -07:00 |
|
Lucas A
|
82e314da59
|
Fix merge conflicts.
|
2020-09-03 21:56:47 +02:00 |
|
Dan Balasescu
|
84b3604192
|
Merge branch 'master' into game-overlay-activation-mode
|
2020-09-03 13:34:22 +09:00 |
|
smoogipoo
|
7e1844ed77
|
Fix track adjusments being reset incorrectly
|
2020-09-01 18:07:19 +09:00 |
|
smoogipoo
|
26b4226b55
|
Fix ModTimeRamp not working
|
2020-09-01 16:55:10 +09:00 |
|
Lucas A
|
dd093f44d8
|
Cast base immutable bindable to mutable for testing purposes and make InitialOverlayActivationMode property protected
|
2020-08-31 11:26:55 +02:00 |
|
Dean Herbert
|
3b03116179
|
Remove unnecessary using statement
|
2020-08-21 16:45:59 +09:00 |
|
Dean Herbert
|
f7e4feee34
|
Update remaining Player components to use WorkingBeatmap again
|
2020-08-21 15:25:57 +09:00 |
|
Dean Herbert
|
93a8bc3d5a
|
Remove local reset method in GameplayClockContainer
|
2020-08-17 22:36:09 +09:00 |
|
Dean Herbert
|
d9debef156
|
Add explicit LoadTrack method
|
2020-08-17 15:38:16 +09:00 |
|
Lucas A
|
589d4eeb52
|
Remove setting.
|
2020-08-16 17:18:40 +02:00 |
|
Shane Woolcock
|
85b3fff9c8
|
Update mouse confine when gameplay state changes
|
2020-08-16 23:11:09 +09:30 |
|
Lucas A
|
84cb36b6a8
|
Defer subscriptions for updateOverlayActivationMode() to OnEntering()
|
2020-08-13 10:57:18 +02:00 |
|
Lucas A
|
f74e162bbc
|
Fix overlay activation mode being updated when player is not current screen.
|
2020-08-10 20:27:42 +02:00 |
|
Lucas A
|
052bb06c91
|
Add ability to open overlays during gameplay breaks.
|
2020-08-10 20:13:50 +02:00 |
|
Bartłomiej Dach
|
9a09f97478
|
Extract constant to avoid double initial value spec
|
2020-08-08 21:21:30 +02:00 |
|
smoogipoo
|
2e3ecf71c7
|
Pass track from Player to components
|
2020-08-06 18:31:08 +09:00 |
|
Lucas A
|
71895964f4
|
Refactor overlay activation logic and reword tip.
|
2020-08-05 11:21:09 +02:00 |
|
Lucas A
|
30c7a6f6a7
|
Fix CI issue and use method instead of triggering change on bindable.
|
2020-08-03 21:33:18 +02:00 |
|
Lucas A
|
242a035f7e
|
Apply review suggestions.
|
2020-08-03 21:25:45 +02:00 |
|
Lucas A
|
25ebb8619d
|
Add tests.
|
2020-08-03 16:04:11 +02:00 |
|
Lucas A
|
fe97d472df
|
Enable back overlays when a replay is loaded.
|
2020-08-02 21:53:13 +02:00 |
|
Lucas A
|
f1ba576438
|
Disable overlay activation when in gameplay.
|
2020-08-02 21:34:35 +02:00 |
|
Dean Herbert
|
fea6389f69
|
Hide HUD elements during break time by default
|
2020-07-22 12:41:06 +09:00 |
|
Dean Herbert
|
a6c6e391ca
|
Fix player not exiting immediately on Alt-F4
|
2020-06-23 17:38:30 +09:00 |
|
Dean Herbert
|
add1265d53
|
Block screen suspend while gameplay is active
|
2020-06-18 23:48:00 +09:00 |
|
Dean Herbert
|
64550fe87c
|
Merge branch 'master' into fix-draining-in-between-break-sections
|
2020-06-02 16:06:08 +09:00 |
|
smoogipoo
|
de0b6ec9f1
|
Create abstract implementation
|
2020-05-26 17:00:41 +09:00 |
|
smoogipoo
|
e5de382760
|
Merge branch 'master' into storyboard-overlay-layer
|
2020-05-20 15:08:45 +09:00 |
|
Bartłomiej Dach
|
ce4301c5b8
|
Add overlay layer to player by proxying
|
2020-05-19 19:47:50 +02:00 |
|
smoogipoo
|
6d70f4b410
|
Merge branch 'master' into allowgameplayoverlays-hide-skip
|
2020-05-18 19:54:38 +09:00 |
|
Lucas A
|
4096463d02
|
Move SkipOverlay internal alpha manipulation to a nested container and adjust visual tests.
|
2020-05-15 19:43:01 +02:00 |
|
Lucas A
|
7874045b1f
|
Allow disabling SkipOverlay through AllowGameplayOverlays.
|
2020-05-12 23:05:56 +02:00 |
|
Dean Herbert
|
de50b725d5
|
Fix mod failure checks executing actual game logic
|
2020-05-12 20:08:35 +09:00 |
|
Dan Balasescu
|
6841bd5609
|
Merge branch 'master' into taiko-scroller
|
2020-05-11 11:10:55 +09:00 |
|
Bartłomiej Dach
|
ee2ff77b89
|
Merge branch 'master' into fix-draining-in-between-break-sections
|
2020-05-10 17:57:44 +02:00 |
|
Lucas A
|
30dd158c33
|
Rename property to AllowGameplayOverlays and update XMLDoc accordingly.
|
2020-05-08 09:37:50 +02:00 |
|
Lucas A
|
83be5455d3
|
Disable the display of HUD through DisplayHud property.
|
2020-05-07 08:52:36 +02:00 |
|
Lucas A
|
aff74db80d
|
Publicly expose HUDOverlay in Player.
|
2020-05-05 10:40:10 +02:00 |
|
Dean Herbert
|
cea6be5e52
|
Expose as JudgementResult instead of "passing" state
|
2020-05-03 23:55:44 +09:00 |
|
Dean Herbert
|
ff1d63060d
|
Add and consume passing state in GameplayBeatmap
|
2020-05-01 20:08:18 +09:00 |
|
Dean Herbert
|
a91c63819b
|
Refactor updateCompletionState implementation for legibility and code share
|
2020-04-21 11:55:28 +09:00 |
|
Salman Ahmed
|
e12e3391fb
|
Base wait steps duration on the delay used for results display
With `* 2` for safety of not potentially going to the next step and the delegate not executed yet.
|
2020-04-20 06:42:33 +03:00 |
|
Salman Ahmed
|
6d276890a7
|
Fix results screen pushed after rewinding in-between push delay
|
2020-04-19 05:59:56 +03:00 |
|
Salman Ahmed
|
7e64bec94f
|
Use HasCompleted in Player
|
2020-04-19 05:58:22 +03:00 |
|
Salman Ahmed
|
7fab07670e
|
Remove no longer necessary usage of IsBreakTime
|
2020-04-05 21:35:09 +03:00 |
|
smoogipoo
|
1f797207f7
|
Rework lookups to not require total playfield columns
|
2020-04-03 12:31:05 +09:00 |
|
Dean Herbert
|
4f5557096c
|
Fix auto mod results not displaying correctly
|
2020-03-29 22:51:28 +09:00 |
|
Bartłomiej Dach
|
3a3bfe9a5e
|
Reorder children to fix pause overlay z-order
|
2020-03-27 21:19:49 +01:00 |
|
Bartłomiej Dach
|
adc759771f
|
Hook up score processor in player
|
2020-03-27 19:47:42 +01:00 |
|
Dan Balasescu
|
5e1cb0e9e9
|
Merge branch 'master' into fix-minia-mod-replay-recording
|
2020-03-27 19:26:41 +09:00 |
|
Dean Herbert
|
f75c082601
|
Fix osu!mania replays recording incorrectly when key mod applied
|
2020-03-27 15:50:11 +09:00 |
|
Dean Herbert
|
07462120e4
|
Split break tracking into its own component
|
2020-03-26 15:30:23 +09:00 |
|
Dean Herbert
|
d372ddaadd
|
Move break overlay to a location it is not affected by gameplay scale
|
2020-03-26 12:50:18 +09:00 |
|
Dean Herbert
|
800e395bc8
|
Merge branch 'master' into replay-recording
|
2020-03-25 20:20:59 +09:00 |
|
Dean Herbert
|
a7bfaad60f
|
More correctly handle rulesets which don't support replay recording
|
2020-03-24 15:44:39 +09:00 |
|
Dean Herbert
|
022465f546
|
Add encoding and import support
|
2020-03-24 14:51:52 +09:00 |
|
Dean Herbert
|
617149fb27
|
Implement in player
|
2020-03-23 20:06:18 +09:00 |
|
Dean Herbert
|
729e006c3a
|
Merge branch 'master' into video-offset
|
2020-03-21 20:03:46 +09:00 |
|
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 |
|