1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-26 03:52:57 +08:00
Commit Graph

1012 Commits

Author SHA1 Message Date
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
smoogipoo
8d11596b2f Minor cleanups 2018-01-24 17:48:42 +09:00
Michael Manis
794ae5380a Intverted conditionals. 2018-01-22 01:06:27 -05:00
Michael Manis
530e0afa2c Use IsCurrentScreen instead of a bool for both checks now. 2018-01-21 22:27:15 -05:00
Michael Manis
964c6da9a4 Use IsCurrentScreen instead of a bool 2018-01-21 22:00:18 -05:00
Michael Manis
806da21760 Removed rreduntant initialization. 2018-01-21 20:24:19 -05:00
Michael Manis
ad2df8d8df Fixed tilde-key crash at end of beatmap. 2018-01-21 20:09:44 -05:00
TocoToucan
4875443e12 Resolve merge conflicts 2018-01-21 18:11:43 +03:00
smoogipoo
2ebb3d6e0e Fix ReplayLoader not being treated as having a replay loaded
Player checks for HasReplayLoaded in Player.load(), but the replay is attached in ReplayPlayer.LoadComplete(), which is too late.
2018-01-17 17:37:14 +09:00
Dean Herbert
0796d33e66
Merge branch 'master' into fix-skipbutton-ordering 2018-01-15 15:54:18 +09:00
smoogipoo
7c41925144 ProvidesUserCursor -> ProvidingUserCursor, and update xmldoc 2018-01-15 14:07:09 +09:00
TocoToucan
0c4fcdf6d8 Remove not used breakOverlay field 2018-01-12 23:59:36 +03:00
TocoToucan
3795411fd1 Do not assign hudOverlay's and breakOverlay's members in Player class 2018-01-12 23:33:24 +03:00
smoogipoo
d0b177e233 Proxying isn't needed anymore 2018-01-12 19:50:09 +09:00
smoogipoo
16d739580b IProvideLocalCursor -> IProvideCursor 2018-01-12 19:37:03 +09:00
smoogipoo
512e4d2c9f Rewrite the way that cursor overrides are done game-wide 2018-01-12 18:13:17 +09:00
smoogipoo
2e235660ad Fix skip button appearing below osu!mania's stage 2018-01-12 13:25:49 +09:00
james58899
1985e5bdb2
fix background dim 2018-01-12 12:21:37 +08:00
Dean Herbert
9ec8f130a6 Ensure changes are only applied when we are the current screen 2018-01-10 13:24:26 +09:00
Dean Herbert
fcb197f7b6 Simplify logic 2018-01-09 22:21:15 +09:00
Dean Herbert
2518d16a77 Denote unused variable 2018-01-09 21:34:31 +09:00
Dean Herbert
c2fadcfc1f
Merge branch 'master' into background-blur 2018-01-09 21:20:05 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
Dean Herbert
d9a80dae5d Male NoFail use an applicable interface 2017-12-31 04:10:29 +09:00
ColdVolcano
df62ca14b7 Don't unbind when not necessary 2017-12-29 23:41:36 -06:00
ColdVolcano
3845c7ac7d Remove bluring of storyboard 2017-12-28 14:31:34 -06:00
Dan Balasescu
3bfa6bd9fd
Merge branch 'master' into better-notification-delays 2017-12-27 23:26:57 +09:00
Dean Herbert
324a7d6377 Merge remote-tracking branch 'upstream/master' into better-testcase-player 2017-12-27 20:26:38 +09:00
Dean Herbert
9fb958eadc Make TestCasePlayer more usable
No results screen crash, no unnecessary leadin time.
2017-12-26 14:23:14 +09:00
ColdVolcano
044e4d0acd Add blur to background in Player 2017-12-25 19:11:49 -06:00
Dean Herbert
71a94d6b44 Add a bindable Enabled flag to NotificationManager
Also better handles delays before notifications are displayed.
2017-12-25 20:53:23 +09:00
Dean Herbert
6f5f4f76e5 Use Logger.Error when exceptions are involved 2017-12-25 18:21:15 +09:00
Dean Herbert
13fee5402a Remove unnecessary using
visual studio doesn't save
2017-12-21 23:20:11 +09:00
Dean Herbert
87e790080b Remove manual audio thread synchronisation logic
No longer required as calls are blocking.
2017-12-21 22:22:28 +09:00
Seokho Song
6fbd06f967 Fix Not update retry counter on PauseOverlay
I've find "You've retried xx time(s)" message that something weird.
That is not displayed pause overlay and only see count on FailOverlay
I change code that PauseContainer.Retries property can be set call-back function.

Signed-off-by: Seokho Song <0xdevssh@gmail.com>
2017-12-21 20:40:31 +09:00
Aergwyn
016057ab01 readd storyboard to beatmap + minor cleanup 2017-11-30 16:49:53 +01:00
Dan Balasescu
a574b092f6
Merge branch 'master' into change-transition-blur-rate 2017-11-27 10:42:32 +09:00
Dean Herbert
69e388dd52 Adjust background blur rate 2017-11-26 17:08:14 +09:00
Unknown
7be55df790 fix being stuck in gameplay if exit is pressed too fast
The reliance on `pauseOverlay.Alpha == 1` created a race condition that, when you pressed Exit while the pauseoverlay is still fading in, could get you stuck in gameplay.
The game wants to show the pause overlay but also thinks it's already paused and returns early.
2017-11-25 19:09:05 +01:00
Dean Herbert
9565a9c352 Fix TestCasePlayer not working as expected 2017-11-23 20:42:07 +09:00
FreezyLemon
18b0b77f0a Added requested changes. Mainly changing lambdas to direct function references. 2017-11-22 21:41:50 +01:00
FreezyLemon
a033eb46d3 Changed to LoadComponentAsync call instead of adding an AsyncLoadWrapper instance. 2017-11-21 16:12:23 +01:00
smoogipoo
c30d31e037 Remove extra alternateFailConditions function in Player 2017-11-21 17:30:19 +09:00
Brayzure
da30d76f9b Implement Score Processor Mod Interface
- Add a delegate whenever we want to register an additional fail condition
2017-11-20 02:15:29 -05:00
Brayzure
de4d8eb196 Implement Sudden Death and Perfect
- Two additional fail conditions
2017-11-18 01:28:09 -05:00
Dean Herbert
8011048540 Fix hard crash when clicking play button with no map selected
Resolves #1507.
2017-11-15 20:03:18 +09:00
Dean Herbert
a2cb9d4086 Fix audio not playing during player loading
Regression due to changed audio initialisation logic.
2017-11-13 19:43:00 +09:00
Dean Herbert
7d4e1b6f22 Don't require a local storage variable for restoring playback speed 2017-11-11 13:03:46 +09:00
EVAST9919
4b21c83f35 Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-11-10 17:24:26 +03:00
Dean Herbert
bc54d4dd4f Ensure we wait for audio track reset before proceeding with player execution 2017-11-10 18:32:15 +09:00
Dean Herbert
6fa02ce9bb Use internal less
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
2017-11-01 17:10:54 +09:00
EVAST9919
7a72f2e3f5 Make sure we restore the clock rate on exiting 2017-10-14 05:15:18 +03:00
EVAST9919
0ec7d2dcf6 Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-06 15:56:08 +03:00
EVAST9919
feb0b1852f Remove the dangerous function 2017-10-03 20:05:50 +03:00
EVAST9919
b6ed977e1e Fix hard crash and fix breaks have been initialized twice 2017-10-02 09:04:03 +03:00
EVAST9919
6d97da8b19 Add replay speed adjustment 2017-10-02 04:42:38 +03:00
EVAST9919
3cd6319ffa Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-27 00:32:38 +03:00
Damnae
2d4616fd43 Apply beatmap settings when creating the DrawableStoryboard. 2017-09-25 11:03:57 +02:00
Damnae
0996867112 Move StoryboardReplacesBackground and StoryboardAspect properties to Storyboard. 2017-09-25 10:40:22 +02:00
EVAST9919
2da3ea00b6 Bind break overlay to accuracy 2017-09-23 16:42:18 +03:00
EVAST9919
18a714df74 Move every class to it's own file 2017-09-20 22:33:07 +03:00
EVAST9919
740e766201 BreakOverlay and LetterboxOverlay implementation 2017-09-15 19:39:55 +03:00
Damnae
757a159516 Display a non-parallax background at the appropriate size when storyboards do not replace it. 2017-09-15 14:31:54 +02:00
Damnae
f5368505ab Load the storyboard asynchronously if it wasn't loaded with the beatmap. 2017-09-15 11:58:37 +02:00
Damnae
4a15762139 Don't create drawables for hidden storyboards. 2017-09-15 11:58:37 +02:00
Damnae
c8cdf6787e Better property name. 2017-09-15 11:58:31 +02:00
Damnae
7c3ce7e830 Unbind events affecting the background after gameplay has ended. 2017-09-15 09:16:56 +02:00
Damnae
cb8029af9e Add a setting to hide storyboards. 2017-09-15 09:16:56 +02:00
Damnae
ddaf28d7f6 Integrate storyboards with gameplay. 2017-09-15 09:16:56 +02:00
smoogipooo
2e0218f388 Move AllObjectsJudged into ScoreProcessor as AllJudged
Changes to OsuScoreProcessor were required to make sure that ticks and slider heads weren't ignored.
2017-09-12 22:01:08 +09:00
Dean Herbert
c5a20e3372 Remove permitNulls 2017-08-22 18:28:32 +09:00
Dean Herbert
803cbddfe2 Ensure score's user is set directly from API
Previously would fail in visualtests due to `OsuGame` case.
2017-08-22 16:59:54 +09:00
Dean Herbert
16e96888ab Update KeyCounterCollection to support action-based buttons 2017-08-21 12:39:22 +09:00
Dean Herbert
723e27353c HitRenderer -> RulesetContainer 2017-08-09 13:28:29 +09:00
Dean Herbert
e75f438c29 Add difficulty application mods
Also fixes circular references when using IJsonSerializable.
2017-08-07 08:54:54 +09:00
Dean Herbert
224de9cc1e Implement NoFail mod 2017-08-07 08:54:54 +09:00
Huo Yaoyuan
df3f75b842 Merge branch 'master' into fixes 2017-07-31 17:51:34 +08:00
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Huo Yaoyuan
e0b1057b87 Merge branch 'master' into fixes 2017-07-24 20:50:33 +08:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller
2cd8f6b30c Merge branch 'master' of github.com:ppy/osu into better-transforms
# Conflicts:
#	osu-framework
2017-07-21 11:15:26 +02:00
Thomas Müller
ed6478be8b Merge branch 'master' into always-load-storyboard 2017-07-20 20:54:16 +02:00
Dean Herbert
c1a3e4a008 Remove unnecessary using 2017-07-20 20:06:24 +09:00
Dean Herbert
451f92772a Merge branch 'master' into fixes 2017-07-20 19:46:50 +09:00
Dean Herbert
3bdd4d7d02 Centralise TrackManager.AddItem logic to avoid duplicate adds 2017-07-20 17:46:33 +09:00
Dean Herbert
67b95926c4 Remove usage of SetExclusive
Also immediately disposes WorkingBeatmaps on ValueChanged.
2017-07-20 16:45:44 +09:00
Dean Herbert
d6968ca09c Remove FullyLoaded logic
Always parse storyboards for now.

Let's not optimise this until it is necessary. It was leading to weird threading problems due to the load call in Player's async load method.
2017-07-20 11:01:50 +09:00
Dean Herbert
d69470f2ae Fix TestWorkingBeatmap broken by attempting to load storyboard 2017-07-20 09:22:39 +09:00
Thomas Müller
c4619f614a Merge branch 'master' of github.com:ppy/osu into better-transforms
# Conflicts:
#	osu-framework
2017-07-19 19:15:51 +02:00
smoogipooo
d75e439f94 Fix Player crashing due to null BeatmapInfo (now unused). 2017-07-20 01:27:27 +09:30
Dean Herbert
38431f8555 Fix remaining test case issues 2017-07-19 19:10:04 +09:00
Dean Herbert
64ebc01a3b Remove many now unnecessary null-checks 2017-07-19 15:45:23 +09:00
Dean Herbert
d0dea33faa Make Beatmap (bindable) non-nullable. 2017-07-19 15:16:53 +09:00
Huo Yaoyuan
cd7c04c54d Simplify misc null-coalescing expression. 2017-07-18 12:30:10 +08:00
Thomas Müller
19fb03e737 Try different formatting style 2017-07-16 18:28:20 +03:00
Thomas Müller
99221260c4 Replace several usages of BeginDelayedSequence with LINQ-style 2017-07-16 17:42:01 +03:00
Dean Herbert
54f6befd67 Merge branch 'master' into fix-track-rotation 2017-07-12 13:18:16 +09:00
Thomas Müller
9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
Dean Herbert
9bbcc0526d Disable beatmap changes in specified screens 2017-07-11 18:39:10 +09:00
Dean Herbert
ee96d39b93 Shuffle sound samples around and make more conformant 2017-06-28 10:19:04 -07:00
John Neijzen
9b0e1c26a3 Clean Up Code 2017-06-07 19:53:37 +08:00
Dean Herbert
5568df1aee Remove StandardHUDOverlay
This class hierarchy was originally when we had different HUDs for rulesets, but this is no longer the case. Skins will be able to build off the base (new) HUDOverlay without issue, so there is no real need for the abstract class for now.

We can add it back if a need for it arises; for the moment I'd like to avoid as many Standard* classes as possible.
2017-06-05 17:18:07 +09:00
Dean Herbert
5eab611255 Fix some possible nullrefs on beatmap load failure 2017-05-26 17:36:38 +09:00
smoogipooo
3cdfd2eef5 Split ControlPoint into different types.
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
MrTheMake
57b9ed0f54 Do not pause a running replay if the window is not focused. 2017-05-20 18:56:50 +02:00
Dean Herbert
561b517dec Merge branch 'master' into skip-redesign 2017-05-20 00:42:04 +09:00
Dean Herbert
20156d26f9 Don't rely on parent's clock 2017-05-19 22:12:09 +09:00
Dean Herbert
aef82acb0d Update skip button design 2017-05-19 21:54:14 +09:00
Dean Herbert
da31d129ee Merge branch 'master' into mania-beatmap-conversion 2017-05-19 18:18:59 +09:00
Dean Herbert
a7d16ac213 Move skip logic to inside SkipButton 2017-05-19 18:18:21 +09:00
smoogipooo
9191c4f3e3 Remove LegacyBeatmapConverter. 2017-05-19 16:31:56 +09:00
smoogipooo
67cf64062a Add flag to determine whether the beatmap requested for conversion is for the current ruleset. 2017-05-19 16:02:40 +09:00
Dean Herbert
bfd37d0350 Fix audio beginning to play when potentially paused due to inactive window
Also removes all usage of Delay() in Player.
Resolves #793.
2017-05-19 13:53:09 +09:00
Dean Herbert
41c252760d Move all pause logic into PauseContainer 2017-05-17 21:57:01 +09:00
Dean Herbert
88a70e407c Fix and simplifty pause logic
Resolves #770
2017-05-17 20:11:41 +09:00
Dean Herbert
6487bf45cf
Eagerly attempt to pause the game when the window is not focused 2017-05-16 17:59:14 +09:00
Dean Herbert
622b155fda OsuConfig -> OsuSetting 2017-05-15 10:56:27 +09:00
Dean Herbert
ab1768ef80 Merge branch 'master' into tidy-up 2017-05-09 10:27:29 +09:00
Dean Herbert
48368779ab Avoid polluting Player with HUD-specific code. 2017-05-08 11:48:40 +09:00
Huo Yaoyuan
4f8549f220 Standardise usages of exceptions. 2017-05-07 00:38:17 +08:00
Dean Herbert
9c4f813da1 Remove unnecessary hide/show logic.
Also change the way the overlay appears when actually playing.
2017-05-05 13:14:44 +09:00
Dean Herbert
c9ba1ac4f6 Adjust namespaces.
Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.
2017-05-05 13:00:05 +09:00
EVAST9919
475eb6fe5f Cleanup 2017-05-04 17:29:52 +03:00
EVAST9919
7e1efcc20b Added ModsContainer 2017-05-02 22:34:07 +03:00
Dan Balasescu
f261a077d2 General fixes/cleanup in Player. 2017-04-26 20:37:47 +09:00
Dean Herbert
c2108b7706 Use object initialiser. 2017-04-26 18:32:47 +09:00
Dean Herbert
b6f838f536 Fix potential nullref. 2017-04-26 18:32:40 +09:00
Dean Herbert
4656a7170a Add very basic lead-in support. 2017-04-26 18:17:25 +09:00
Dean Herbert
9d14b6e1e9 Make SongProgress return the actual time value via OnSeek. 2017-04-26 18:17:17 +09:00
Dean Herbert
01caaf44f3 Add a decoupled clock to allow for lead-in and lead-out time. 2017-04-26 18:16:55 +09:00
Dean Herbert
d476482493 Add basic seeking support when a replay is loaded. 2017-04-25 22:59:51 +09:00
Jorolf
1d2f19b5a2 change background dim from integer to double 2017-04-22 18:34:03 +02:00
Dean Herbert
caf3d311cd
Merge remote-tracking branch 'upstream/master' into speed-adjust-mods 2017-04-21 20:55:20 +09:00
Dean Herbert
d94035e9da Merge branch 'master' into general-fixes 2017-04-21 20:42:46 +09:00
Dean Herbert
3f832731c9
Add DoubleTime, HalfTime and Nightcore support. 2017-04-21 17:33:37 +09:00
Dean Herbert
5fdc9819cf
Add basic UO support (now called Audio Offset). 2017-04-21 16:20:05 +09:00
Dean Herbert
5aa90df819
Allow OsuScreens to decide whether ruleset switching should be allowed.
Tidies up ToolbarModeSelector a lot by using DI.
2017-04-21 16:03:59 +09:00
Dean Herbert
1707c2458e
Update exception name. 2017-04-20 12:11:03 +09:00
Dean Herbert
873599b359
Fix conversion regression. 2017-04-20 11:36:50 +09:00
Dean Herbert
a47870b376
Apply Ruleset to Scores. Reduce complexity of score creation. 2017-04-20 11:16:08 +09:00
Dean Herbert
3b95fbab7d
Add score statistic tracking (osu!). 2017-04-19 16:29:27 +09:00
Dean Herbert
49f4981f1c
Fix CI issues. 2017-04-18 22:28:16 +09:00
Dean Herbert
a0d9c14526
Add temporary means of getting the user which is responsible for a resulting play. 2017-04-18 22:22:14 +09:00
Dean Herbert
d51b37cb44
Add a basic implementation of the new design results screen. 2017-04-18 22:22:14 +09:00
Dean Herbert
edd71c0560
Tidy up and comment PlayerLoader logic. 2017-04-18 16:56:01 +09:00
Dean Herbert
2ccb8b154f
Change conditional ordering to allow player to always run its fadeOut sequence. 2017-04-18 16:47:30 +09:00
Dean Herbert
24deaf05b6 Merge branch 'master' into player-loader-restart 2017-04-18 16:36:25 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
ocboogie
1f7373db8f Removed unneeded restarting variable 2017-04-17 23:52:38 -07:00
ocboogie
be8d32688b Fixed HotkeyRetryOverlay just going to a black screen 2017-04-17 22:36:03 -07:00
ocboogie
5c48fa6cb1 Removed testing line 2017-04-17 21:35:48 -07:00