955 Commits

Author	SHA1	Message	Date
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
ocboogie	aa466d0e84	PlayerLoader creates a new instance of the Player class on Restart	2017-04-17 21:32:38 -07:00
smoogipooo	786446354e	Fix post-rebase errors.	2017-04-18 09:00:53 +09:00
smoogipooo	2767fbd81a	Implement Beatmap conversion testing.	2017-04-18 08:57:09 +09:00
Dean Herbert	a4e2f34ee7	Make a RulesetDatabase.	2017-04-17 17:43:48 +09:00
smoogipooo	3845ab2a72	Add comment.	2017-04-15 05:55:38 +09:00
smoogipooo	0a1376c2db	Remove PlayMode game-wide.	2017-04-15 05:22:41 +09:00
smoogipooo	a89af273be	Make BeatmapInfo expose Ruleset instead of PlayMode.	2017-04-15 05:01:36 +09:00
smoogipooo	59bfc7abad	Move statics to RulesetCollection to avoid conflicts later on.	2017-04-15 04:53:37 +09:00
Dean Herbert	9d753a7798	Merge branch 'master' into song-progress-graph	2017-04-14 19:24:13 +09:00
Dean Herbert	ea0631ede8	Encapsulate progress update logic better.	2017-04-14 18:23:34 +09:00
Dean Herbert	acd7a5b254	Hook up beatmap object density to progress display.	2017-04-14 17:58:37 +09:00
Dean Herbert	09195a03a2	Merge remote-tracking branch 'upstream/master' into song-progress-graph ... # Conflicts: # osu.Game/Overlays/DragBar.cs	2017-04-14 11:25:00 +09:00
Dean Herbert	262a2c9f0e	Add exception for failing.	2017-04-13 19:13:09 +09:00
Dean Herbert	5f8baf874d	Use interpolatedSourceClock's IsRunning value for consistency.	2017-04-13 18:31:23 +09:00
Dean Herbert	94bf1d65b6	Fix thread race conditions on pausing close to a fail.	2017-04-13 11:41:08 +09:00
ocboogie	6c6ef946bd	Some more clean up	2017-04-12 04:01:52 -07:00
ocboogie	8cad09370d	Fixed pause and fail screen overlap	2017-04-12 00:20:41 -07:00
Dan Balasescu	bc98e53aff	I helped.	2017-04-12 00:09:45 +09:00
Dean Herbert	1a1607aaaa	Improve the look of the transition on hotkey retry (and retry in general).	2017-04-11 19:58:57 +09:00
Andrey Zavadskiy	1879a05c7b	Removed using	2017-04-10 06:10:12 +03:00
Andrey Zavadskiy	e73f543c4f	Applied suggestions	2017-04-10 06:06:10 +03:00
Andrey Zavadskiy	a7264aa84c	Warning fix	2017-04-09 17:53:16 +03:00
Andrey Zavadskiy	425e96c45c	Moved logic to it's own class	2017-04-09 17:44:19 +03:00
Andrey Zavadskiy	4ab4f65c83	Retry on Tilde key	2017-04-09 16:26:31 +03:00
Dean Herbert	0d4f457265	Improve transitions when exiting play mode.	2017-04-07 20:46:35 +09:00
Dean Herbert	54d1afb655	Fade in HitRenderer post entering animation.	2017-04-07 20:38:57 +09:00
Dean Herbert	39175905e4	Fix crashes on completing a taiko map (where a strong his is the last hit in the map).	2017-04-07 16:56:09 +09:00
Dean Herbert	7e99fc47e2	wip	2017-04-07 16:54:54 +09:00
Dean Herbert	12d2102a88	Merge remote-tracking branch 'upstream/master' into song-progress-graph ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Modes/UI/HudOverlay.cs # osu.Game/Screens/Play/PauseOverlay.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj	2017-04-07 09:22:18 +09:00
Dean Herbert	7c63c8394b	Remove unnecessary depth setting.	2017-04-06 15:36:03 +09:00
Dean Herbert	a18367454d	InGameOverlay -> MenuOverlay.	2017-04-06 15:34:52 +09:00
Dean Herbert	6285f3eea8	Merge branch 'master' into pause_buttons_refactor	2017-04-06 15:00:48 +09:00
Dean Herbert	4aafc172ca	Allow playfield to specify whether it has a cursor or not.	2017-04-05 17:38:57 +09:00
Andrey Zavadskiy	62655b70c9	Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor	2017-04-04 18:41:37 +03:00
Dean Herbert	7c74951454	Update bindables. ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCaseResults.cs # osu.Game/Screens/Ranking/ResultModeButton.cs # osu.Game/Screens/Ranking/Results.cs	2017-04-04 11:34:13 +09:00
smoogipooo	27132958c8	Merge remote-tracking branch 'origin/master' into taiko-drawable-generation ... Conflicts: osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj	2017-04-03 14:19:31 +09:00
Dean Herbert	6f1fff4ee7	Update async load usage to new style.	2017-04-02 15:56:12 +09:00
Andrey Zavadskiy	f70de7439b	Moved title and description to each class	2017-04-01 21:42:12 +03:00
Andrey Zavadskiy	ebc814f06a	Typos fix	2017-04-01 21:17:24 +03:00
Andrey Zavadskiy	3574dac780	Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor	2017-04-01 21:03:19 +03:00
Dean Herbert	fa7c72a099	Refactor ReplayInputHandler creation for more flexibility.	2017-03-31 15:59:53 +09:00
smoogipooo	eed50784ba	Make player work with TaikoHitRenderer.	2017-03-29 11:35:57 +09:00
Dean Herbert	f7dc7e9bb9	Update references.	2017-03-28 21:26:20 +09:00
Andrey Zavadskiy	687f71e410	Fixes	2017-03-28 11:45:48 +03:00
Andrey Zavadskiy	60be69d3b0	Fixes	2017-03-28 11:41:08 +03:00
Andrey Zavadskiy	62693a6a59	Again separate classes	2017-03-28 10:49:58 +03:00
Andrey Zavadskiy	9774f826ab	Pause and fail overlays -> StopOverlay	2017-03-28 06:08:31 +03:00
Andrey Zavadskiy	5461c6516a	Refactor PauseOverlay, FailDialog -> FailOverlay	2017-03-28 04:53:57 +03:00
DrabWeb	f1f6f2041f	Null track handling in player	2017-03-23 23:57:33 -03:00
smoogipooo	2074812f46	Move ScoreProcessor and Score to Scoring/.	2017-03-24 09:51:52 +09:00
DrabWeb	0a11d035fe	Formatting	2017-03-23 09:07:13 -03:00
DrabWeb	938f5eaf58	Dragging	2017-03-23 07:38:08 -03:00
DrabWeb	546a3d0914	Merge branch 'song-progress-graph' of https://github.com/DrabWeb/osu into song-progress-graph	2017-03-23 07:15:53 -03:00
Dean Herbert	4d61424abd	Merge branch 'master' into song-progress-graph	2017-03-23 17:44:22 +09:00
Dean Herbert	681ed38941	Use const whenever possible.	2017-03-23 13:52:38 +09:00
Dean Herbert	54e1b24fe9	Enforce readonly private members where possible.	2017-03-23 13:50:08 +09:00
DrabWeb	818bdd8e88	SongProgress in HudOverlay	2017-03-22 09:27:04 -03:00
Dean Herbert	f9f31ca092	Add statefulness to MenuCursor.	2017-03-17 20:45:27 +09:00
smoogipooo	9a4af8f194	GetScore -> CreateScore.	2017-03-17 02:03:12 +09:00
smoogipooo	2394e7ff78	Make CheckFailed not actually trigger internal things, and make private.	2017-03-17 01:36:30 +09:00
smoogipooo	b13340c3c8	Move CheckFailed outside of Schedule().	2017-03-17 00:30:23 +09:00
smoogipooo	2a2caeba32	Add better failing support to ScoreProcessor.	2017-03-16 13:39:57 +09:00
smoogipooo	c82ae011fb	Make ScoreProcessors take generic judgements.	2017-03-16 12:45:23 +09:00
smoogipooo	c0e29652a6	Initial attempt at making mods apply better.	2017-03-12 22:13:43 +09:00
smoogipooo	64aab090d5	Instantiate HitRenderer with WorkingBeatmap.	2017-03-12 18:03:13 +09:00
smoogipooo	529cabb001	Make HudOverlay not dependent on Ruleset.	2017-03-10 16:16:07 +09:00
smoogipooo	4015b87965	General fixes.	2017-03-10 13:09:50 +09:00
smoogipooo	31f6cbd8cf	Rename ScoreOverlay -> HUDOverlay, move to osu.Game, make it not overridable by rulesets.	2017-03-10 12:14:13 +09:00
Dean Herbert	d7497330b2	Reduce warning/suggestion count to zero.	2017-03-09 15:52:40 +09:00
Dean Herbert	da751804b6	Reduce error count.	2017-03-09 14:24:16 +09:00
Dean Herbert	02cab41d34	Move InputManager to a higher and more implicit level. ... Also makes KeyCounterCollection work with replays.	2017-03-07 19:30:48 +09:00
Dean Herbert	4430255ec4	Merge remote-tracking branch 'upstream/master' into replay ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs # osu.Desktop/OsuGameDesktop.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs # osu.Game/Database/BeatmapDatabase.cs # osu.Game/Graphics/Cursor/OsuCursorContainer.cs # osu.Game/IPC/BeatmapImporter.cs # osu.Game/Modes/Mod.cs # osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs # osu.Game/Modes/UI/Playfield.cs # osu.Game/Screens/Play/Player.cs # osu.Game/Screens/Play/PlayerInputManager.cs	2017-03-07 13:50:08 +09:00
Dean Herbert	0cad5d7d41	Fix most warnings.	2017-03-07 13:05:57 +09:00
Dean Herbert	57cbecba83	Required changes for framework merge (https://github.com/ppy/osu-framework/pull/554).	2017-03-06 22:08:02 +09:00
Dean Herbert	76ef8c1a6c	Add bindable mods and autoplay support.	2017-03-06 14:52:37 +09:00
Dean Herbert	faf07ab51a	Use generics everywhere.	2017-03-06 13:59:11 +09:00
Dean Herbert	7afcac3660	Move PreferredPlayMode to WorkingBeatmap.	2017-03-05 17:45:40 +09:00
Dean Herbert	7a6a614358	Don't show pause menu when watching replays.	2017-03-04 21:35:26 +09:00
Dean Herbert	adb6f01e39	Create class hierarchy for Score/Replay storage.	2017-03-04 15:32:41 +09:00
Dean Herbert	9e1383fa48	Merge remote-tracking branch 'upstream/master' into replay ... # Conflicts: # osu.Game.Modes.Catch/CatchRuleset.cs # osu.Game.Modes.Mania/ManiaRuleset.cs # osu.Game.Modes.Taiko/TaikoRuleset.cs # osu.Game/Screens/Play/Player.cs	2017-03-04 13:17:01 +09:00
Dean Herbert	3a8246f56d	Move PauseOverlay to correct namespace.	2017-03-03 10:17:39 +09:00
Dean Herbert	c4ca18eeba	Remove references to PassThrough.	2017-03-02 16:28:51 +09:00
Dean Herbert	b6e7e054c3	wankoz	2017-03-01 22:56:20 +09:00
Dean Herbert	58ae9e888d	Basic partial replay support.	2017-03-01 22:04:20 +09:00
Jorolf	522034020e	Moved Bindable init	2017-02-28 11:44:12 +01:00
Jorolf	8b3477820f	Disable mousewheel while playing	2017-02-28 00:08:34 +01:00
Thomas Müller	1585ae842a	Update framework	2017-02-26 11:22:58 +09:00
Dean Herbert	7483b69477	Remove unnecessary Dispose logic.	2017-02-25 10:44:19 +09:00
Dean Herbert	5096f6b83d	Fix memory leak from Player's InputManager.	2017-02-24 21:01:05 +09:00
Dean Herbert	c5552dfb27	Merge remote-tracking branch 'upstream/master' into remove-usings	2017-02-24 11:29:34 +09:00
Thomas Müller	2689de0c0c	Update framework and add "Async" suffix to asynchronous methods	2017-02-23 22:32:10 +01:00
Thomas Müller	a5dfa7ab06	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
Dean Herbert	aef0eb49a1	Add loading screen.	2017-02-22 21:53:59 +09:00
Dean Herbert	2d2660c1c5	Improve transition when retrying a beatmap.	2017-02-22 14:14:37 +09:00
Dean Herbert	32ce8cf723	Audio class renames in line with framework changes.	2017-02-18 17:35:04 +09:00
Dean Herbert	e6ef9f67aa	GameMode -> Screen.	2017-02-17 19:23:58 +09:00
Dean Herbert	d570a6d308	Handle cases where HitObjects were not parsed.	2017-02-15 12:38:10 +09:00
Dean Herbert	343e48c195	Merge branch 'master' into followpoints	2017-02-13 22:23:57 +09:00
Damnae	2d155f6a5c	Bring back the delay to what it was before.	2017-02-10 10:48:25 +01:00
Damnae	6f37c02868	Fix followpoints needing a DelayReset.	2017-02-10 10:07:52 +01:00
Damnae	a504c73f33	Load beatmap data from an optional osb file.	2017-02-09 15:19:09 +01:00
Damnae	38b25a7df3	Add hit object stacking.	2017-02-09 07:28:40 +01:00
Dean Herbert	50bd80cb0c	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Dean Herbert	4f89cc0784	Merge pull request #298 from peppy/skip-button ... Make skip button work.	2017-02-03 12:47:53 +09:00
Drew DeVault	52fb345e79	Merge branch 'master' into song-select-filtering	2017-02-02 09:25:27 -08:00
Drew DeVault	c88a2fbf8a	Replace incorrectly removed background logic ... I had earlier thought that removing this would solve the weirdness with starting the beatmap on any but the first difficulty, and forgot to replace it when I found the actual cause.	2017-02-01 19:32:30 -05:00
Dean Herbert	7ce5fc08ee	Merge branch 'master' into skip-button ... # Conflicts: # osu.Game/Graphics/UserInterface/BackButton.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj	2017-02-01 14:05:58 +09:00
DrabWeb	0d53d3c4ff	Fixed quitting not working	2017-01-31 22:33:28 -04:00
Dean Herbert	046732b7e3	Merge remote-tracking branch 'upstream/master' into song-select-filtering	2017-02-01 10:09:14 +09:00
DrabWeb	c92418e000	Made Player.canPause one line	2017-01-31 21:02:58 -04:00
DrabWeb	13da75f149	Fixed a bug where the user can double press escape to exit the song	2017-01-31 20:44:59 -04:00
DrabWeb	bcd41a2c8f	Moved pause overlay action setting to the initialiser in Player, moved pause overlay displaying be handled in OnExiting instead of OnKeyDown, removed clockWasStarted and used sourceClock.IsRunning instead	2017-01-31 20:28:50 -04:00
Drew DeVault	624d51204f	Fix issue with background on player ... Not sure why this only happens on my branch, I didn't touch this code.	2017-01-31 19:14:54 -05:00
DrabWeb	91a5d0b3cf	Made requested changes	2017-01-31 09:17:47 -04:00
DrabWeb	740f6e5595	Moved delaying resuming to Player	2017-01-30 09:06:26 -04:00
DrabWeb	ad33ae9431	Removed unnecessary change	2017-01-30 06:24:44 -04:00
DrabWeb	015832f242	Changed PauseOverlay to layout with FlowContainers and not positioning, made the retry counter in PauseOverlay have the number bolded, made it so if the player presses escape before the clock is started in Player then Exit is called instead of Pause	2017-01-30 06:14:28 -04:00
DrabWeb	d70cbd37dd	Made the pause progress graph it's own class, to be implemented, made it so the user couldn't double click the pause buttons and made it so the action wasn't called a second time when the mouse button was released, made PopIn and PopOut in PauseOverlay one line each, made Player.IsPaused a public getter with a private getter/setter, implemented restarting in Player	2017-01-30 04:08:14 -04:00
DrabWeb	28967cf77a	Renamed Player.isPaused to IsPaused, did a small patch suggested for how the player can click through the pause menu onto the Playfield(only partially works, upstream changes need to be made for full functionality), made Retry default to Resume until retrying is implemented, minor cleanups	2017-01-29 05:04:48 -04:00
DrabWeb	582599a8de	Made PauseButton more visually responsive, added force option to Player.Pause, added very basic implementation of the progress bar	2017-01-28 16:55:42 -04:00
DrabWeb	feba3f35ba	Changed the roles of PauseOverlay and player in pausing, PauseOverlay is now only the UI portion and doesn't do things like actually pause the game, and only calls actions and hides itself, whereas Player actually pauses the game and brings up the pause overlay in the first place	2017-01-27 15:28:39 -04:00
DrabWeb	601a5ed39c	Reverted Player to upstream	2017-01-27 14:29:51 -04:00
Dean Herbert	3e7503e860	Make skip button work.	2017-01-27 21:57:22 +09:00
Dean Herbert	420e61fa97	TwoLayerButton	2017-01-27 21:08:36 +09:00
DrabWeb	3ed88ea043	Added PauseOverlay.TogglePaused, renamed OnPlay and similar to OnResume, made Pause and Play public, added proper testing for the visual test(pause button instead of auto-pause, logging actions), made PauseOverlay's fade duration a constant instead of statically typed	2017-01-27 07:11:22 -04:00
DrabWeb	81de5a2097	Made the pause overlay be at -1 depth so it renders on top of everything(used to allow circles to draw on top)	2017-01-27 06:36:43 -04:00
DrabWeb	f35974021a	Set actions for retry/quit, moved setting paused to PopIn and PopOut, added null propogation for the sound samples for PauseButton(sometimes in the visual tests the audio doesn't load for whatever reason), added a gradient to the background of the PauseOverlay visual test(same as the one in the menu button system test), wired up the retry and quit actions in Player, made the quit action quit the map, retry still does nothing	2017-01-27 06:19:52 -04:00
Dean Herbert	5787b43586	wip	2017-01-27 19:14:44 +09:00
DrabWeb	fe265c01cb	Added current work on pause overlay	2017-01-27 05:24:49 -04:00
Dean Herbert	139cac5e57	Add fail dialog and flow.	2017-01-27 00:41:34 +09:00
Dean Herbert	8c7bb4990c	Add support for failing.	2017-01-27 00:38:21 +09:00
Dean Herbert	70271fee35	Move PlayerInputManager to own file.	2017-01-27 00:38:21 +09:00
Dean Herbert	1853bbdda8	Move window/volume configuration to framework level.	2017-01-25 18:44:51 +09:00
TocoToucan	259c0964fd	Specify ScoreProcessor.Judgements.Capacity in order to avoid List<T> internal auto reallocations	2017-01-16 23:14:35 +03:00
Drew DeVault	e81073695f	Implement disable mouse buttons	2017-01-13 17:17:04 -05:00
n4b3l	aebe87fefc	better implementation	2016-12-19 16:09:29 +01:00
n4b3l	09f9f86b06	check if dimLevel is null on exit	2016-12-19 14:03:10 +01:00
n4b3l	df305989d0	use config bindable directly	2016-12-18 10:48:59 +01:00
n4b3l	0fbd2d8bc8	removed random enter	2016-12-17 21:03:14 +01:00
n4b3l	224e6a877a	responsive to dim changes	2016-12-17 20:59:41 +01:00
n4b3l	36049cc493	smoother transition	2016-12-17 20:29:20 +01:00
n4b3l	c73fbe6e42	Remove unnecessary casts	2016-12-17 15:06:56 +01:00
n4b3l	ba81222af6	basic background dim	2016-12-16 17:13:24 +01:00
Dean Herbert	6cfb174f02	Fix exiting results screen returning to player.	2016-12-08 20:03:18 +09:00
Dean Herbert	bbc11c77ca	Add (temporary) transitions to songselect and player.	2016-12-07 20:47:28 +09:00
Dean Herbert	74e3a87f78	Add *very* basic ranking screen.	2016-11-29 23:59:56 +09:00
Dean Herbert	2947121e48	Hook up ScoreProcessor to Scoreoverlay etc.	2016-11-29 21:28:43 +09:00
Dean Herbert	9d2a69f1e2	Add concept of ScoreProcessor.	2016-11-29 20:30:16 +09:00
Dean Herbert	9871960112	Basic score flow.	2016-11-29 17:34:16 +09:00
Dean Herbert	396ca9fe91	Remove HitJudgementResolver; reimplement in DrawableHitObject.	2016-11-26 16:51:51 +09:00
Dean Herbert	f9f72f25a2	Add basic flow for hitobject judgement.	2016-11-25 16:26:50 +09:00
Dean Herbert	6c69bd2ba3	Fix regression causing crash on using z/x in player mode.	2016-11-24 21:27:12 +09:00
Dean Herbert	3e9c398652	Update input handler logic to match framework changes.	2016-11-21 21:36:11 +09:00
Thomas Müller	57e7c7097d	Update framework and add rudimentary fading to song select screen.	2016-11-20 12:16:54 +01:00
Thomas Müller	f8788bb24b	Update the background according to the currently selected beatmap and blur it within song select.	2016-11-19 17:39:43 +01:00
Dean Herbert	b61521a93c	Tidy up Player.cs.	2016-11-16 15:48:35 +09:00
Huo Yaoyuan	53deaf2a00	Merge branch 'master'	2016-11-16 10:51:39 +08:00