443 Commits

Author	SHA1	Message	Date
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