2828 Commits

Author	SHA1	Message	Date
Dean Herbert	c48c62ea04	Merge branch 'master' into player_loader_input_toggles	2018-05-21 16:20:08 +09:00
Dean Herbert	e2389ad7a4	Allow using back button on PlayerLoader and Replay	2018-05-18 13:32:05 +09:00
Roman Kapustin	81d7e8a393	Resolve merge conflict	2018-05-18 00:25:47 +03:00
Roman Kapustin	f2f2fb8c73	Use both OnKeyDown and GlobalAction.Back	2018-05-14 22:09:09 +03:00
Roman Kapustin	e802b722f0	Revert "Handle mouse back button using OnMouseDown override instead of using GlobalAction" ... This reverts commit 44bbb8700e.	2018-05-14 20:27:05 +03:00
Dean Herbert	28edf3bce7	Merge branch 'master' into hud-above-letterbox	2018-05-14 19:31:39 +09:00
Dean Herbert	0234bbc37f	Move definition inline	2018-05-14 19:14:17 +09:00
Dean Herbert	f14948c022	Merge branch 'master' into exit-hold-confirmation	2018-05-14 18:13:40 +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
Dean Herbert	cfa18bdf1f	Fix song progress time counters wrapping after an hour ... Resolves #2466. Supersedes and closes #2487.	2018-05-11 22:10:26 +09:00
Roman Kapustin	86430da6d6	Update CircularProgress.FillTo calls	2018-05-10 21:08:02 +03:00
Roman Kapustin	93029fd548	Remove mouseWheelCheckbox from InputSettings player overlay	2018-05-10 20:38:55 +03:00
Dean Herbert	5df9f126d1	Implement a hold-to-confirm screen when exiting game using escape key	2018-05-10 17:07:19 +09:00
Roman Kapustin	ccf82cacb0	Show InputSettings on the PlayerLoader screen	2018-05-09 17:31:52 +03:00
Roman Kapustin	6676c55fe0	Introduce InputSettings	2018-05-09 17:22:37 +03:00
Roman Kapustin	44bbb8700e	Handle mouse back button using OnMouseDown override instead of using GlobalAction	2018-05-08 00:22:11 +03: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	b08b24b6da	Introduce OsuScreen.AllowBackButton property	2018-05-04 21:18:48 +03:00
Roman Kapustin	39db1e8cbb	Rename HoldToQuit to QuitButton	2018-05-03 23:50:30 +03: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	c78c5195f3	HoldToQuitButton cleanup	2018-04-28 20:43:41 +03:00
Dean Herbert	4f53185d43	Invert logic to match existing toggles	2018-04-25 16:18:55 +09:00
Dean Herbert	45810e6220	Merge branch 'master' into ignore_beatmap_skin	2018-04-24 17:15:39 +09:00
TocoToucan	630980255e	Convert HoldToQuit.text to local variable	2018-04-21 20:35:24 +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	3b621db460	Implement CircularProgress filling	2018-04-21 19:25:21 +03:00
TocoToucan	633c775306	Initial HoldToQuit commit	2018-04-21 18:24:31 +03:00
TocoToucan	1ce38c7fc6	Visual settings: Ignore beatmap hitsounds	2018-04-20 18:30:41 +03:00
TocoToucan	606e088713	Visual settings: Ignore beatmap skin	2018-04-20 18:17:57 +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
Dean Herbert	de85436534	Merge remote-tracking branch 'upstream/master' into peppy-async-screens	2018-04-20 16:52:58 +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
smoogipoo	7a550e3f07	Revert unnecessary change for now	2018-04-19 20:20:56 +09:00
smoogipoo	b5a55a0dce	Make an interface for beatmaps	2018-04-19 18:58:40 +09:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Joehu	128446e51d	Remove composer from player loader	2018-04-12 16:46:46 -07:00
Dan Balasescu	32832304a7	Merge branch 'master' into fix-songselect-exit-notimplemented	2018-04-02 13:53:41 +09:00
Dean Herbert	31ade986a7	Scren async changes in line with framework changes ... Makes editor not stutter on load, amongst other screens.	2018-03-30 14:58:11 +09:00
FreezyLemon	46d859a660	exit player earlier if a dummy map is loaded	2018-03-25 13:25:48 +02:00
Dean Herbert	e47aa0edc0	Merge branch 'master' into fix-background-fade	2018-03-24 03:40:13 +09:00
smoogipoo	afdab7895a	Fix beatmap background fade not being updated on retry ... Fixes #2287	2018-03-23 20:41:38 +09:00
Dean Herbert	b56eee1927	Fix background loaded player never being disposed if early exit occurs	2018-03-23 15:04:40 +09:00
FreezyLemon	a3d8048aca	abort loading and exit player for dummy maps	2018-03-22 21:46:35 +01:00
smoogipoo	090c78bf10	Merge remote-tracking branch 'origin/master' into fix-player-loader	2018-03-22 20:00:21 +09:00
Dean Herbert	917334a39a	Move cancel code to exit paths for screen	2018-03-22 13:01:40 +09:00
Dean Herbert	8f71d53c17	Fix retry not allowing continuing beyond PlayerLoader ... Resolves #2265.	2018-03-22 02:10:31 +09:00
Dean Herbert	9ad4e9284a	Add skin source fallback chain	2018-03-20 16:40:11 +09:00
smoogipoo	b27b6c7eb7	Merge branch 'master' into cursor-trail	2018-03-16 14:43:27 +09:00
Dean Herbert	ea649f9650	Avoid scheduling during non-current screen	2018-03-14 12:09:19 +09:00
Dean Herbert	ef8d595914	Apply formatting changes	2018-03-14 11:44:19 +09:00
Dean Herbert	c3a3d76b88	Merge remote-tracking branch 'upstream/master' into DoNotMoveToPlayerWhileDragging	2018-03-14 11:43:33 +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
Dean Herbert	94ed4ab01b	Add debouncing to player loading ... Allows the mouse to temporarily exit and re-enter overlay elements without triggering a load	2018-03-08 20:28:55 +09:00
Dean Herbert	d3e91024a7	Block player enter when a drag initiates from an overlaying container	2018-03-08 18:16:23 +09:00
TocoToucan	2cb197d0c4	Replace ConfigureBackgroundUpdate with OnEntering	2018-03-08 11:35:00 +03:00
Dean Herbert	8f3f886805	Merge branch 'master' into PlayerBase	2018-03-08 16:12:12 +09:00
Dean Herbert	91c984ed97	Merge branch 'master' into rewrite-break-overlay	2018-03-08 09:31:59 +09:00
Dean Herbert	81b778fdcf	Merge branch 'master' into cursor-trail	2018-03-08 09:31:42 +09:00
pdrapoport	3731cbe5eb	Removing "mouse wheel disabled" checkbox from visual settings gameplay menu	2018-03-07 14:20:59 +01: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	4aafc2228e	Improve skip button behaviour when mouse buttons are down	2018-03-06 00:53:40 +09:00
Dean Herbert	d115c56742	Avoid using input blocking	2018-03-06 00:27:55 +09:00
Dean Herbert	792a3ac469	SkipButton -> SkipOverlay	2018-03-06 00:10:53 +09:00
Dean Herbert	53edfedfc8	Remove unneeded HighFrequencyMousePosition from GameplayMenuOverlay	2018-03-05 19:43:57 +09:00
Dean Herbert	7d11e55d06	Only block mouse input when the shaded portion of the SkipButton is hovered	2018-03-05 19:43:33 +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
Dan Balasescu	25c748ed45	Merge branch 'master' into fix-player-exit	2018-02-28 22:05:44 +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	0cd049c6b0	Rely less on zero-duration transform helpers ... They have huge overheads. See ppy/osu-framework#1411.	2018-02-28 11:00:54 +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	c0d983bbdf	Merge branch 'master' into PlayerBase	2018-02-23 13:51:11 +09:00
Dean Herbert	7c43a3b4c0	Merge branch 'master' into storyboard-improvements	2018-02-19 14:54:12 +09:00
Dean Herbert	e0faf14a3e	Actually consume ReplacesBackground	2018-02-19 12:33:07 +09:00
Dean Herbert	29adedfa96	Collapse visual settings by default in player	2018-02-16 12:47:32 +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	4535e09607	Add missing license header	2018-02-09 00:36:31 +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
TocoToucan	77a8b36529	Schedule Resume method call without delay	2018-02-08 22:30:15 +03:00
Dean Herbert	a70989cb70	Rely on bindable's formatting rather than setting a default	2018-02-08 11:12:05 +09:00
smoogipoo	8e280b6b0c	Use 0.1 precision for playback speed	2018-02-07 13:28:10 +09:00
smoogipoo	bd5db6fc8d	Make playback speed sliderbar use the tooltip text as its display	2018-02-07 13:26:41 +09:00
Dean Herbert	9bfec9b233	Tidy up state change logic	2018-02-06 14:30:01 +09:00
Dean Herbert	dd8955cd90	Fix skip button not receiving screen-wide input	2018-02-06 14:29:03 +09:00
tgi74000	b0fbae9dfc	Fix PlayerSettingsOverlay not reappearing when Hidden	2018-02-01 16:07:49 +01:00
Dan Balasescu	c1d5a68e4d	Merge branch 'master' into VisualSettingsOverlay	2018-02-01 16:37:04 +09:00
Dean Herbert	df65443f07	Merge branch 'master' ... Conflicts: osu-framework osu.Game/Screens/Play/Player.cs	2018-01-30 18:31:03 +09:00
TocoToucan	ce4122b3c4	Display visual settings overlay on PlayerLoader screen	2018-01-26 23:29:54 +03:00
TocoToucan	d82835107c	Remove autohide and clock related logic from Visual settings overlay	2018-01-26 22:20:24 +03:00
TocoToucan	615c831069	Merge from ppy/master	2018-01-26 21:56:17 +03:00
smoogipoo	8d11596b2f	Minor cleanups	2018-01-24 17:48:42 +09:00
smoogipoo	7f299b2533	Merge remote-tracking branch 'origin/master' into RefactorPlayerOverlaysInitialization	2018-01-24 17:44:28 +09:00
Dean Herbert	fa1f4304f6	Remove usings	2018-01-23 13:24:04 +09:00
Dean Herbert	f823650b10	Allow user choice of the quick retry hotkey	2018-01-23 13:05:07 +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	e88f514cf4	Resolve merge conflicts	2018-01-21 18:32:21 +03:00
TocoToucan	4875443e12	Resolve merge conflicts	2018-01-21 18:11:43 +03:00
smoogipoo	a05032779f	Remove unneeded event binding	2018-01-18 00:04:33 +09:00
smoogipoo	c79603290d	Move TriggerChange to LoadComplete()	2018-01-17 21:52:57 +09:00
Dan Balasescu	be225eff90	Merge branch 'master' into fix-replays	2018-01-17 18:01:41 +09: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	5e1cd8ddc4	Apply conditionals directly rather than using an in-between property	2018-01-16 20:34:40 +09:00
Dean Herbert	39af9321cf	Remove unnecessary overrides	2018-01-16 20:34:40 +09:00
Dean Herbert	9b33499fe7	Merge remote-tracking branch 'upstream/master' into RefactorInputQueues	2018-01-16 20:04:34 +09:00
TocoToucan	a81f32a388	PlayerGroup -> PlayerSettingsGroup	2018-01-15 20:52:52 +03: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	d3afbdaac6	Resolve merge conflict	2018-01-13 22:32:56 +03:00
TocoToucan	43d2ae348a	Rename ReplaySomething -> PlayerSomething	2018-01-13 22:25:09 +03: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
Dean Herbert	188b26472c	Merge remote-tracking branch 'upstream/master' into sliderbar-tooltip-precision	2018-01-12 18:54:36 +09:00
smoogipoo	a6c6523a86	Make SkipButton an OverlayContainer to use the menu cursor	2018-01-12 18:21:17 +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
TocoToucan	affbb7a847	Fix license header	2018-01-12 00:37:28 +03:00
TocoToucan	c1f756b16e	Support background blur in visual settings	2018-01-12 00:03:55 +03:00
TocoToucan	3ec93966a0	Implement VisualSettings autohiding	2018-01-11 23:39:23 +03:00
TocoToucan	98851e4a78	Stop time whenever visual settings are expanded	2018-01-11 01:24:34 +03:00
smoogipoo	d147683361	Cleanup	2018-01-10 17:39:15 +09:00
smoogipoo	c010b48b29	Remove number format specified from OsuSliderBar, override ToolTipText ... Better/cleaner solution.	2018-01-10 17:29:16 +09:00
smoogipoo	17e7f75aca	More osu!-side bindable fixes	2018-01-10 15:41:13 +09:00
Dean Herbert	9ec8f130a6	Ensure changes are only applied when we are the current screen	2018-01-10 13:24:26 +09:00
TocoToucan	c48c7b085c	Visual settings initial commit	2018-01-10 02:24:51 +03: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
Aergwyn	f6c168be27	add skip cutscene as "in game" keybinding	2018-01-08 18:22:43 +01:00
TocoToucan	ae032cbf23	Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties	2018-01-07 23:40:00 +03:00
Dean Herbert	a1d94d7adf	Merge branch 'master' into sliderbar-tooltip-precision	2018-01-05 20:48:30 +09:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
smoogipoo	1571c10c42	Fix up replay settings sliderbar formatting	2018-01-05 14:37:32 +09:00
Dean Herbert	c0dd812a4c	Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods	2018-01-02 15:33:08 +09:00
Aergwyn	ccb69d16d9	move HitResult in Scoring namespace to replace HitCount	2017-12-30 21:23:18 +01: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
FreezyLemon	998f9c090d	select pause buttons after mouse move only	2017-12-28 01:56:10 +01: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
Dan Balasescu	1af7f71c97	Merge branch 'master' into notification-verbosity	2017-12-27 15:01:28 +09:00
Dean Herbert	d17f6cb564	Fix crash when starting play mode with no beatmap ... Closes #1767	2017-12-27 11:46:44 +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
Dean Herbert	abe465358c	Fix formatting	2017-12-21 21:46:57 +09:00
Dean Herbert	5b596765c8	Merge branch 'master' into dev-overlay-counter	2017-12-21 21:09:40 +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
Dean Herbert	b6fd5b0f17	Fix keyboard and mouse input not properly getting blocked by GameplayMenuOverlay	2017-12-21 19:19:08 +09:00
smoogipoo	5e111e14db	Make it possible to change the overlay actions beyond instantiation	2017-12-18 19:13:25 +09:00
smoogipoo	a17b2e4c18	Expose buttons for test cases	2017-12-18 19:13:08 +09:00
smoogipoo	918e7c9a4b	MenuOverlay -> GameplayMenuOverlay	2017-12-18 16:40:50 +09:00
smoogipoo	5f538f03ea	Comments	2017-12-18 16:34:25 +09:00
smoogipoo	59365bbdce	Make MenuOverlay support key selections	2017-12-18 16:34:17 +09:00
smoogipoo	f3a5258c5b	Reorder file (ctor + bdl)	2017-12-18 14:05:12 +09:00
smoogipoo	ed81ed7c54	Add back HandleInput disable overrides	2017-12-11 15:19:00 +09:00
TocoToucan	219bdbc4e1	Populate HandleInput automatically	2017-12-09 22:21:17 +03: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	62358c0b53	Merge branch 'master' into beatmap_scores	2017-11-16 00:45:17 +09:00
Dean Herbert	f912744acc	Fix sizing of ModIcon	2017-11-16 00:15:27 +09: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	49a5af60e2	Fix multiple order-of-execution issues with osu! logo ... Also sets better defaults.	2017-11-13 18:43:16 +09:00
EVAST9919	51adea2a60	Convert text to a local variable	2017-11-13 05:58:19 +03:00
EVAST9919	89e9f84753	Add padding to the text container	2017-11-13 05:52:05 +03:00
EVAST9919	ec75837965	Replay speed setting visual improvements	2017-11-13 05:04:21 +03:00
Dean Herbert	7d4e1b6f22	Don't require a local storage variable for restoring playback speed	2017-11-11 13:03:46 +09:00
Dean Herbert	3142832693	Add precision to playback speed	2017-11-11 13:00:29 +09:00
Dean Herbert	3d1d66d886	Merge branch 'master' into replay_speed	2017-11-11 10:41:38 +09:00
EVAST9919	4b21c83f35	Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed	2017-11-10 17:24:26 +03:00
smoogipoo	5816d25358	Merge remote-tracking branch 'origin/master' into replay-rewinding	2017-11-10 22:19:17 +09:00
Dean Herbert	49731f4c05	Remove unused parmeter	2017-11-10 19:32:09 +09:00
Dean Herbert	bd2de89918	Why weren't these fixed previously	2017-11-10 19:26:25 +09:00
Dean Herbert	4a5a293376	Merge branch 'master' into replay-rewinding	2017-11-10 19:08:13 +09: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	4874371dbf	Rename methods back	2017-11-09 17:38:20 +09:00
Dean Herbert	c2d4a213b1	Rename logo-related methods	2017-11-08 16:34:03 +09:00
smoogipoo	2fbd490626	Make RemainingTimeCounter into a Counter	2017-11-06 14:58:05 +09:00
smoogipoo	3b189c1ffe	Fix BreakOverlay not properly working with rewinding ... In various ways: * It wouldn't show up if rewound after the break was complete. * The time would increase backwards if rewind happened during a break. * Etc. * Basically the fix is to use transformations everywhere. BreakOverlay could be refactored further, but this is enough to make it work for now.	2017-11-03 21:20:36 +09:00
Dean Herbert	9b2d41f4eb	Fix quick retry looking bad	2017-11-02 21:52:01 +09:00
Dean Herbert	b8b05fe8d2	Make the osu! logo shared game-wide ... There should only ever be one osu! logo. It is now passed around between screens in a superfluous manner.	2017-11-02 20:38:02 +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	a7bcae4869	Add startup value for the slider	2017-10-26 15:18:06 +03:00
EVAST9919	08637253df	Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed	2017-10-26 15:04:44 +03:00
Shane Woolcock	ea2934d92c	Add KeyboardStep values for configuration options	2017-10-23 16:06:08 +10:30
EVAST9919	bae91d7de7	Simplify gradient usage in Letterbox Overlay	2017-10-18 05:06:17 +03:00
EVAST9919	f4428980a6	Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed	2017-10-15 00:10:15 +03:00
Dean Herbert	cd722e4abb	Fix beatmap author being stored in two different places	2017-10-14 11:39:55 +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	95ac4e9265	Remove useless using	2017-10-06 04:57:46 +03:00
EVAST9919	96fcc095eb	Apply suggested shrinking bar changes	2017-10-06 04:49:16 +03:00
EVAST9919	5caca1d328	Don't use '#' in RankDisplay for now	2017-10-05 05:27:52 +03:00
EVAST9919	cb0dbc6d9e	Fix shrinking bar lingering on the screen for too long	2017-10-05 05:23:18 +03:00
EVAST9919	cc99678a96	Remove useless usings	2017-10-05 05:09:23 +03:00
Dean Herbert	20bf0502ab	Use scheduling rather than raw transform delays	2017-10-05 10:03:48 +08:00
EVAST9919	22a59d753b	Make all the overlays IStateful	2017-10-05 04:38:13 +03:00
EVAST9919	1c132938df	Allow visibility can be toggled only if replay is loaded	2017-10-03 20:26:53 +03:00
EVAST9919	feb0b1852f	Remove the dangerous function	2017-10-03 20:05:50 +03:00
EVAST9919	b94c78e993	Hide/Show Replay settings on pressing Ctrl+H	2017-10-02 19:33:58 +03:00
EVAST9919	4a298098c5	CI fixes	2017-10-02 18:19:55 +03:00
EVAST9919	c34cc07fda	Remove default bindable from the config manager	2017-10-02 18:09:00 +03:00
EVAST9919	b6ed977e1e	Fix hard crash and fix breaks have been initialized twice	2017-10-02 09:04:03 +03:00
EVAST9919	7052462863	Update inline with framework	2017-10-02 08:51:00 +03:00
EVAST9919	c2f487aa3e	Add Rank as a property to the Score Processor	2017-10-02 05:56:38 +03:00
EVAST9919	5ce2723719	Don't use linq query	2017-10-02 05:12:56 +03:00
EVAST9919	6d97da8b19	Add replay speed adjustment	2017-10-02 04:42:38 +03:00
EVAST9919	ac6c323f93	Clear all tasks and transforms when resetting Breaks	2017-10-02 00:44:57 +03:00
EVAST9919	b62f2437ac	Don't allow counter became 0	2017-10-01 23:38:11 +03:00
EVAST9919	c696f74578	Fix broken testcase and apply suggested changes	2017-09-27 01:10:48 +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	94269e119e	Reset text only if it has been changed	2017-09-23 19:59:34 +03:00
EVAST9919	0615f375e1	Show current grade	2017-09-23 19:52:44 +03:00
EVAST9919	a69bef8ec0	Use existing enum instead of my own	2017-09-23 16:51:31 +03:00
EVAST9919	2da3ea00b6	Bind break overlay to accuracy	2017-09-23 16:42:18 +03:00
EVAST9919	ced6204219	oops	2017-09-22 22:10:05 +03:00
EVAST9919	d73b40768e	More arrow adjustments to match the design	2017-09-22 21:12:58 +03:00
EVAST9919	92eb8e4fa9	Move blurred icons to a parallax container	2017-09-22 21:00:45 +03:00
EVAST9919	6fe2b64abd	Start breakOut animation a bit earlier	2017-09-22 20:50:00 +03:00
EVAST9919	d58e5a6130	Arrows improvements	2017-09-22 20:43:51 +03:00
EVAST9919	56bde64839	Add arrows overlay	2017-09-22 01:16:05 +03:00
EVAST9919	5383e33f3d	Remove useless clock assignment	2017-09-21 22:58:49 +03:00
EVAST9919	22ab2c5e5d	Apply suggested changes	2017-09-21 22:54:46 +03:00
EVAST9919	9667270336	Remove using	2017-09-21 01:56:50 +03:00
EVAST9919	e051bcc6df	Fix wrong arrows position on startup	2017-09-21 01:51:40 +03:00
EVAST9919	c79568135a	Add arrows	2017-09-21 01:44:30 +03:00
EVAST9919	18a714df74	Move every class to it's own file	2017-09-20 22:33:07 +03:00
EVAST9919	581689a84d	CI fixes	2017-09-20 20:58:20 +03:00
EVAST9919	4699a44608	Add info container	2017-09-20 20:50:14 +03:00
EVAST9919	8d7db52200	Add remaining time counter	2017-09-20 19:45:38 +03:00
EVAST9919	0f04d8c6a7	Add remaining time container	2017-09-20 15:58:28 +03:00
EVAST9919	429e7723b3	Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three	2017-09-15 19:40:30 +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
Damnae	010a6ec252	Fix player loading.	2017-09-15 09:06:27 +02:00
Dean Herbert	6ea22cc6c7	Add missing return to PlayerLoader ... was being a bit too eager previously	2017-09-15 08:15:23 +09:00
Dean Herbert	d330b39db4	Remove max	2017-09-14 13:47:25 +09:00
Dean Herbert	4f09f30b7a	Fix incorrect exception	2017-09-14 13:13:54 +09:00
Dean Herbert	b1145272d1	Update code to support new inspectcode analysis rules	2017-09-14 12:58:32 +09: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	eedfbdc0e8	Add nullref check in KeyCounterCollection's Add method	2017-09-11 11:41:09 +09:00
smoogipooo	57678a13d9	Update in-line with framework changes.	2017-09-04 09:32:35 +09:00
Dean Herbert	189988236b	Move PlayerInputManager logic inside RulesetInputManager	2017-08-24 15:23:17 +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	7e21ddb5eb	Remove usage of HideOnEscape	2017-08-16 22:56:32 +09:00
Dean Herbert	2c7f0629ef	Merge remote-tracking branch 'upstream/master' into is-alive	2017-08-16 12:11:32 +09:00
Dean Herbert	97ac8e1a64	Update usages of IsAlive/IsLoaded in line with framework changes	2017-08-15 13:57:48 +09:00
Dean Herbert	70f148f0b4	Fix icons on skip button	2017-08-15 09:30:46 +09:00
Dean Herbert	723e27353c	HitRenderer -> RulesetContainer	2017-08-09 13:28:29 +09:00
Dean Herbert	b88f37de45	Add custom actions for Catch ... Reworks input management for rulesets	2017-08-09 11:50:34 +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	62b3540fd6	Merge branch 'master' into fixes	2017-08-04 13:49:03 +08:00
Dean Herbert	0d9ea97828	Allow Rulesets to create a non-FontAwesome icon ... This also - Renames TextAwesome to SpriteIcon. - Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).	2017-08-03 14:36:21 +09:00
Huo Yaoyuan	df3f75b842	Merge branch 'master' into fixes	2017-07-31 17:51:34 +08:00
Dean Herbert	f705589bf2	Rename NotificationManager to NotificationOverlay	2017-07-28 15:03:42 +09: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	598b3f051e	Address CI concerns and update framework	2017-07-22 11:15:45 +02:00
Thomas Müller	a7dc8a892b	Update framework	2017-07-21 17:24:09 +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
Dean Herbert	f7b64a458a	Fix incorrect end time calculation in SongProgressGraph	2017-07-21 10:10:25 +09: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
Thomas Müller	4d8261fe0b	Merge branch 'master' of https://github.com/ppy/osu into better-transforms ... # Conflicts: # osu-framework # osu.Game/Graphics/Cursor/OsuTooltipContainer.cs # osu.Game/Overlays/DragBar.cs	2017-07-18 15:16:02 +03:00
Dean Herbert	c5d23daa6b	Merge remote-tracking branch 'upstream/master' into remove-dragbar ... # Conflicts: # osu.Game/Overlays/DragBar.cs	2017-07-18 13:44:23 +09:00
Huo Yaoyuan	cd7c04c54d	Simplify misc null-coalescing expression.	2017-07-18 12:30:10 +08:00
Thomas Müller	87bcd526f3	Get rid of raw AddDelay calls within osu.Game	2017-07-17 16:51:21 +03:00
Thomas Müller	19fb03e737	Try different formatting style	2017-07-16 18:28:20 +03:00
Thomas Müller	032e9df67b	ApplyDelay -> AddDelay	2017-07-16 17:47:29 +03:00
Thomas Müller	99221260c4	Replace several usages of BeginDelayedSequence with LINQ-style	2017-07-16 17:42:01 +03:00
Thomas Müller	71105bb9ee	Delay -> ApplyDelay; DelayReset -> ResetDelay	2017-07-16 14:06:46 +03:00
Thomas Müller	6063219b72	Update framework	2017-07-16 13:59:26 +03:00
Thomas Müller	a5e610a7ba	Update framework and fix compilation ... Most issues were related to BeginLoopedSequence usage and lack of "this." in front of transform helpers.	2017-07-14 19:18:12 +03:00
Thomas Müller	fd58c6e835	Nicer generic rolling counters	2017-07-14 19:14:07 +03:00
Thomas Müller	b5fbb26f8f	Merge branch 'master' of https://github.com/ppy/osu into better-transforms	2017-07-14 16:46:18 +03:00
Thomas Müller	c73a1ae058	Use TransformTo in rolling counters	2017-07-14 16:46:00 +03:00
Dan Balasescu	c13dc943f8	Merge branch 'master' into fix-track-rotation	2017-07-14 19:25:54 +10:00
Dean Herbert	95a40e39ec	Merge branch 'master' into mods_overlay_fix	2017-07-14 17:31:52 +09:00
Dean Herbert	6c9219856d	Add comment	2017-07-14 09:39:40 +09:00
Nabile Rahmani	840cc918ea	Use Enabled instead of a private field.	2017-07-13 23:35:19 +02:00
Nabile Rahmani	8014cd55a2	Make the skip button clickable only once.	2017-07-13 21:59:17 +02:00
Dean Herbert	de46f3ab07	Remove all unnecessary parenthesis where object initialisers are used ... Enforces at CI.	2017-07-13 15:11:33 +09:00
EVAST9919	0b1db1502d	removed useless bool	2017-07-12 09:42:38 +03:00
EVAST9919	ab8fb2edab	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_overlay_fix	2017-07-12 09:31:56 +03:00
Dean Herbert	54f6befd67	Merge branch 'master' into fix-track-rotation	2017-07-12 13:18:16 +09:00
Dean Herbert	0322e66c25	Merge remote-tracking branch 'upstream/master' into container-collection-readonlylist	2017-07-12 13:07:23 +09:00
Thomas Müller	9d523ea012	Update framework	2017-07-12 11:06:13 +09:00
Thomas Müller	4045083dcd	Update sorting comparers in line with framework changes	2017-07-11 21:21:58 +03:00
Dean Herbert	9bbcc0526d	Disable beatmap changes in specified screens	2017-07-11 18:39:10 +09:00
Thomas Müller	c4e378571b	Update framework	2017-07-10 11:54:23 +03:00
Dean Herbert	0e0c32008b	More changes	2017-07-10 15:40:40 +09:00
Dean Herbert	0e2dc9388a	More changes in-line with framework changes.	2017-07-10 12:55:47 +09:00
EVAST9919	33206fcf0e	Use Hide instead of FadeTo(0)	2017-07-08 12:34:24 +03:00
EVAST9919	adb88a8d49	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_overlay_fix	2017-07-08 12:28:41 +03:00
Thomas Müller	178685292a	Merge branch 'master' of https://github.com/ppy/osu into better-fill-mode	2017-07-08 12:25:08 +03:00
Dean Herbert	3c425dd07f	Fix CI issue	2017-07-08 18:06:59 +09:00
Thomas Müller	22a987f6cc	Update test cases to new framework and fix old crashes	2017-07-07 15:05:55 +03:00
Thomas Müller	6de9776e05	Update framework with tooltip changes	2017-07-07 08:59:17 +03:00
Jai Sharma	6eaeba5a92	Merge branch 'master' into remove-dragbar	2017-07-06 20:14:08 +01:00
Dean Herbert	724e5aa99e	Merge master into better-input	2017-07-05 13:59:40 -07:00
Thomas Müller	2d7eefa6fe	Update Cached usage according to framework	2017-07-02 13:00:02 +03:00
Thomas Müller	bb15bc0467	Use ReceiveMouseInputAt whenever possible	2017-06-30 09:54:03 +03:00
Dean Herbert	f3f3952ba5	More unused usings	2017-06-29 12:20:05 -07:00
Dean Herbert	6865f9b231	Remove unused parameters	2017-06-29 12:05:37 -07:00
Dean Herbert	1e50840a8e	Fix unused usings	2017-06-29 12:04:04 -07:00
Dean Herbert	ee96d39b93	Shuffle sound samples around and make more conformant	2017-06-28 10:19:04 -07:00
Thomas Müller	40225238d9	Set RelativeSizeAxes for updated FillMode behavior	2017-06-28 12:24:23 +03:00
Dean Herbert	480cdba023	Add OsuClickableContainer with generic sounds	2017-06-27 21:05:49 +09:00
EVAST9919	2ad6d3fa77	Simplify property	2017-06-27 05:41:24 +03:00
EVAST9919	714d53f329	Hide "Unranked" text in ModDisplay if play is ranked	2017-06-27 05:17:21 +03:00
Jai Sharma	a0262e32b1	CI Fixes	2017-06-24 09:15:53 +01:00
Jai Sharma	e073100498	Merge branch 'master' into remove-dragbar	2017-06-24 08:55:02 +01:00
Thomas Müller	e3489928b7	Remove now obsolete InternalContains	2017-06-24 09:21:08 +02:00
Jai Sharma	a327f49d68	Updating progressBar.EndTime is more thread safe	2017-06-23 18:24:46 +01:00
Thomas Müller	f5829860a2	Get rid of AlwaysReceiveInput	2017-06-23 18:02:24 +02:00
Jai Sharma	73c004fb71	Removed DragBar from song progress	2017-06-22 17:42:29 +01:00
smoogipooo	fc0e44b214	Update framework.	2017-06-21 11:28:27 +09:00
paparony03	c8720bc5d5	Oops	2017-06-20 16:00:09 +10:00
paparony03	62dee59672	Shapes namespace ... Depends on https://github.com/ppy/osu-framework/pull/837	2017-06-20 15:54:23 +10:00
smoogipooo	ffbb46f668	Update in line with framework.	2017-06-12 12:48:47 +09:00
Dean Herbert	a454ca606f	Merge remote-tracking branch 'upstream/master' into johnneijzen-master	2017-06-08 20:33:39 +09:00
Tom94	5f7270ee4b	Use new invalidation rules	2017-06-08 09:53:45 +02:00
John Neijzen	2f7d9655fd	More Clean up	2017-06-08 15:27:35 +08:00
John Neijzen	4abad17b92	Fix Black Space after } and Symbol Spacing	2017-06-08 14:48:42 +08:00
John Neijzen	431d225a60	Keyword Spacing and Brackets Fixing	2017-06-08 14:35:10 +08: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	2712f49545	Remove bad	2017-06-05 17:06:47 +09:00
Dean Herbert	958cd9f8d8	Don't display in-game ... Nothing does anything yet, so we can't display this. Make it functional before adding to game project.	2017-06-05 16:52:09 +09:00
Dean Herbert	af6f8bbd89	Fix namespaces and class names	2017-06-05 16:47:42 +09:00
Dean Herbert	c3c56820fa	Fix lots of small issues	2017-06-05 16:43:23 +09:00
EVAST9919	4b624ced36	CI fixes	2017-05-30 12:31:56 +03:00
EVAST9919	e737ded382	Applied suggested changes	2017-05-30 12:23:53 +03:00
smoogipooo	7416952eb3	Fix usings.	2017-05-30 17:36:42 +09:00
smoogipooo	72fa50f944	Make replay settings match design colours.	2017-05-30 17:02:04 +09:00
EVAST9919	08219ccb42	Applied suggested changes	2017-05-29 19:00:29 +03:00
Dan Balasescu	6918368afc	Merge branch 'master' into ingame_options	2017-05-29 18:12:02 +09:00
Thomas Müller	a4903e62ba	Merge branch 'master' into fix-nullrefs	2017-05-28 16:07:10 +02:00
Dean Herbert	bdeaf2dbb4	Update method names in line with framework changes	2017-05-28 18:34:12 +09:00
EVAST9919	743dfcc130	More xmldoc and few Title text fixes	2017-05-28 00:56:11 +03:00
EVAST9919	b5a6d73104	Toogle visibility without ctrl pressed	2017-05-27 02:38:29 +03:00
EVAST9919	bedcf04043	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-27 02:25:03 +03:00
Dean Herbert	5eab611255	Fix some possible nullrefs on beatmap load failure	2017-05-26 17:36:38 +09:00
Dean Herbert	4ee11764b8	Merge branch 'master' into osu-direct	2017-05-24 12:16:34 +09:00
Dean Herbert	0842e00f13	Merge branch 'master' into controlpoint-rework	2017-05-24 00:20:15 +09:00
EVAST9919	178f8127b8	overall fixes	2017-05-23 16:01:00 +03:00
EVAST9919	2e28b10c36	CI fixes and removed useless property	2017-05-23 12:24:16 +03:00
EVAST9919	4b23cc47ea	Moved KeyCounter visibility logic to it's own class	2017-05-23 11:53:42 +03:00
EVAST9919	eafe215169	Simplify Hud visibility change	2017-05-23 11:53:12 +03:00
Dean Herbert	0634a3a5c5	Merge branch 'master' into osu-direct	2017-05-23 17:33:20 +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
EVAST9919	50e3feb761	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-22 09:12:40 +03:00
EVAST9919	d717ccf85e	Settings -> ReplaySettings	2017-05-22 09:07:08 +03:00
EVAST9919	0615f104f0	SettingsContainer -> SettingsDropdownContainer	2017-05-21 18:22:27 +03: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	0b987be600	Merge branch 'master' into osu-direct	2017-05-20 16:17:59 +09:00
DrabWeb	1eb96e07bd	Remove unused using directive	2017-05-20 03:01:09 -03:00
DrabWeb	0c5fec975d	Change ModDisplay to use ReverseDepthFillFlowContainer	2017-05-20 02:56:00 -03:00
EVAST9919	9f803de9d5	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-19 19:49:48 +03:00
Dean Herbert	561b517dec	Merge branch 'master' into skip-redesign	2017-05-20 00:42:04 +09:00
Dean Herbert	674731f9bb	Add sound back to skip action	2017-05-19 22:23:48 +09:00
Dean Herbert	60f960aafd	Fix audio clock breakage.	2017-05-19 22:19:20 +09:00
Dean Herbert	20156d26f9	Don't rely on parent's clock	2017-05-19 22:12:09 +09:00
EVAST9919	6f0e1fccdb	moved autosize to ctor and whitespace fix	2017-05-19 16:08:33 +03:00
EVAST9919	b2b299a8c3	Fixed the ability to change visibility even not in replay	2017-05-19 15:54:21 +03:00
Dean Herbert	aef82acb0d	Update skip button design	2017-05-19 21:54:14 +09:00
EVAST9919	4d0d27aa88	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-19 15:25:48 +03: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
EVAST9919	91b081f0b2	Change visibility on ctrl+h	2017-05-19 06:41:33 +03:00
EVAST9919	f2af31aceb	Naming fixes	2017-05-18 20:21:58 +03:00
EVAST9919	83a89ce22d	options -> settings	2017-05-18 11:39:22 +03:00
EVAST9919	d07d94d606	better resizing	2017-05-18 07:09:36 +03:00
EVAST9919	35bc3a42aa	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-18 06:36:15 +03:00
EVAST9919	a9f37d3e78	now button can hide content	2017-05-17 17:24:52 +03:00
EVAST9919	a21343da23	CI fixes	2017-05-17 17:14:09 +03:00
EVAST9919	60ed7a2372	fixed license header	2017-05-17 16:54:49 +03:00
EVAST9919	1e029d05a8	Added bindable to adjust playback speed	2017-05-17 16:10:49 +03:00
Dean Herbert	41c252760d	Move all pause logic into PauseContainer	2017-05-17 21:57:01 +09:00
EVAST9919	0867ef814c	Visible only in replay	2017-05-17 15:54:12 +03:00
EVAST9919	e0625a9b30	More overlays and overall fixes	2017-05-17 15:39:26 +03:00
Dean Herbert	88a70e407c	Fix and simplifty pause logic ... Resolves #770	2017-05-17 20:11:41 +09:00
EVAST9919	1a4025ab3c	ingame options basic logic	2017-05-17 10:36:57 +03: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	efab186384	Update namespaces in line with framework	2017-05-16 12:50:30 +09:00
Dean Herbert	622b155fda	OsuConfig -> OsuSetting	2017-05-15 10:56:27 +09:00
EVAST9919	9a04069123	removed useless booleans, using nullables instead	2017-05-12 10:16:31 +03:00
EVAST9919	34b4efc4e9	Applied suggested changes	2017-05-12 08:12:34 +03:00
EVAST9919	79ed92a0d7	Simplified logic	2017-05-12 01:48:28 +03:00
EVAST9919	ea0add2354	Fixed update condition	2017-05-11 02:34:57 +03:00
EVAST9919	d55c97a08a	Stop progress as soon as we at 100%	2017-05-11 01:48:46 +03:00
EVAST9919	5b469eff69	Fixes	2017-05-10 10:33:02 +03:00
EVAST9919	d8f9e71b84	Applied suggested changes	2017-05-10 10:14:44 +03:00
EVAST9919	7b17e331c4	cleanups	2017-05-10 03:45:31 +03:00
EVAST9919	315f1f1256	CI fixes	2017-05-09 06:23:03 +03:00
EVAST9919	2c92ee432b	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-09 06:05:46 +03:00
EVAST9919	2826c663fd	Apply suggested changes	2017-05-09 06:05:37 +03:00
Dean Herbert	ab1768ef80	Merge branch 'master' into tidy-up	2017-05-09 10:27:29 +09:00
EVAST9919	de2486b8e6	Moved timeLeft recalculation to property	2017-05-08 20:36:02 +03:00
EVAST9919	17d1ecb8f5	Use float type for progress value	2017-05-08 19:42:36 +03:00
EVAST9919	4b5e24cc36	Changed logic a bit	2017-05-08 19:14:19 +03:00
EVAST9919	ae2186970c	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-08 18:16:16 +03:00
Dean Herbert	48368779ab	Avoid polluting Player with HUD-specific code.	2017-05-08 11:48:40 +09:00
EVAST9919	f0145c7f4f	Trying to woke up AppVeyor	2017-05-08 02:16:56 +03:00
EVAST9919	926ed907c2	CI fixes	2017-05-08 02:00:21 +03:00
EVAST9919	dda25219bc	code fixes	2017-05-08 01:54:31 +03:00
EVAST9919	c3a42ded36	Fixed Graph/seeking offset	2017-05-08 01:23:51 +03:00
EVAST9919	531f2c410a	removed useless variable	2017-05-08 00:26:34 +03:00
EVAST9919	ea28a9f7ce	Adjust values	2017-05-08 00:16:58 +03:00
Huo Yaoyuan	4f8549f220	Standardise usages of exceptions.	2017-05-07 00:38:17 +08:00
Dean Herbert	44f06e5423	Add hover expand support.	2017-05-05 13:17:36 +09: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	b547dd6893	CI Fixes.	2017-05-05 13:06:54 +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	95f6c999bd	Adjust scale and CI fixes	2017-05-04 17:59:01 +03:00
EVAST9919	475eb6fe5f	Cleanup	2017-05-04 17:29:52 +03:00
EVAST9919	57c4232416	Added testcase	2017-05-04 11:58:37 +03:00
EVAST9919	6063231e40	float value fix	2017-05-03 16:58:10 +03:00
EVAST9919	5f2f1d2763	CI fixes	2017-05-03 14:01:43 +03:00
EVAST9919	9e35eb8d97	Fixes	2017-05-03 13:53:45 +03:00
EVAST9919	e7a8619f01	ModIcon refactor	2017-05-03 09:48:10 +03:00
EVAST9919	6ea3629c9a	Adjust the size	2017-05-03 08:23:52 +03:00
EVAST9919	2e30a69b67	removed using	2017-05-02 23:04:36 +03:00
EVAST9919	a955f9cbfd	Simplify hiding logic	2017-05-02 22:59:36 +03:00
EVAST9919	37c3133981	Fixes	2017-05-02 22:46:18 +03:00
EVAST9919	7e1efcc20b	Added ModsContainer	2017-05-02 22:34:07 +03:00
EVAST9919	698ae0832f	Move string formatting inside the class	2017-05-01 07:00:44 +03:00
EVAST9919	ba0fbacda0	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-01 06:33:04 +03:00
EVAST9919	0386e96573	applied requested changes	2017-05-01 05:38:51 +03:00
EVAST9919	668262ed06	Applied requested changes	2017-05-01 04:53:46 +03:00
EVAST9919	e9094bac51	Added suggested changes	2017-04-30 17:05:00 +03:00
EVAST9919	a8c918f7bf	Removed empty line	2017-04-28 21:12:48 +03:00
EVAST9919	d5c56aab7a	Initial commit	2017-04-28 21:05:00 +03:00
EVAST9919	f8faea8da2	Removed unnecessary nested class	2017-04-28 16:02:00 +03:00
EVAST9919	c4bd21914d	warning fixes	2017-04-28 15:37:22 +03:00
EVAST9919	b409a22309	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-04-28 15:29:24 +03:00
EVAST9919	c27909d53c	CI fixes	2017-04-28 05:02:25 +03:00
EVAST9919	eacf2045f0	Initial commit	2017-04-28 04:56:34 +03:00
Dean Herbert	59a3e23879	Ensure PlayerInputManager's initial time is transferred at load.	2017-04-27 17:38:00 +09:00
Dan Balasescu	a243729a54	Merge branch 'master' into fix-mouse-button-disable	2017-04-26 20:43:56 +09:00
Dan Balasescu	f261a077d2	General fixes/cleanup in Player.	2017-04-26 20:37:47 +09:00
Dan Balasescu	08b1d5beb9	Use const where it was inteded.	2017-04-26 20:15:34 +09:00
Dean Herbert	e826f17eb0	Fix get-set mismatch.	2017-04-26 19:25:41 +09:00
Dean Herbert	f48d497737	Fix disabling mouse buttons causing auto to stop working.	2017-04-26 18:56:20 +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	e003d9fc3c	Add basic replay frame accurate "seeking". ... Previously we were looping over Update, when we should instead have been looping over UpdateSubTree.	2017-04-25 22:59:58 +09:00
Dean Herbert	d476482493	Add basic seeking support when a replay is loaded.	2017-04-25 22:59:51 +09:00
Dean Herbert	eb5d334838	Add non-toggle support for showing seek bar in SongProgress.	2017-04-25 22:59:46 +09:00
Dean Herbert	30e2e7bfe4	Merge branch 'master' into slider-stuff	2017-04-25 19:42:46 +09:00
Dean Herbert	2d6fa711d1	Remove unnecessary base.Update() in PlayerInputManager.	2017-04-24 20:22:21 +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	3e48a57e9a	Merge branch 'master' into score-statistics	2017-04-19 20:36:14 +09:00
Dean Herbert	3b95fbab7d	Add score statistic tracking (osu!).	2017-04-19 16:29:27 +09:00
Dean Herbert	2783f49267	Fix incorrect EndTimes when processing has not been run on HitObjects before the SongProgressGraph is displayed.	2017-04-19 16:05:14 +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	b0f1851e88	Adjust visuals slightly.	2017-04-18 20:52:57 +09:00
Dean Herbert	1071645dca	Flexible cube count (and thus graph height). ... This also scaled the graph to the height of the maximum value. And much tidying.	2017-04-18 19:25:52 +09:00
Dean Herbert	3b21340e1b	Split SquareGraph out and make SongProgressGraph also able to take a list of Objects.	2017-04-18 18:40:02 +09:00
Dean Herbert	417a5ca713	A bit of renaming.	2017-04-18 18:29:24 +09:00
Dean Herbert	66865c50ad	Remove explicit RelativeSize setting.	2017-04-18 18:10:13 +09:00
Dean Herbert	784ca2300b	Add safety check for when no objects have been assigned.	2017-04-18 18:09:37 +09:00
Dean Herbert	5ba85818db	Combine push logic and adjust transitions a bit more.	2017-04-18 17:07:02 +09:00
Dean Herbert	ddff26d167	Show metadata when loading between retries. ... Also speeds up the display a bit.	2017-04-18 17:00:58 +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	64a8992153	Merge branch 'master' into general-fixes	2017-04-18 16:19:52 +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	2bd89e922f	Removed unneeded newPlayer	2017-04-17 23:48:21 -07:00
ocboogie	c0f4cbcba6	Added back PlayerLoader overlays	2017-04-17 23:36:11 -07:00
Dean Herbert	727086c0b2	Updates in-line with framework.	2017-04-18 15:34:53 +09: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
ocboogie	78273d76e3	Added basic loading screen and test case	2017-04-16 20:18:41 -07: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	6421f040dd	Fix SongProgress handling escape.	2017-04-14 15:27:24 +09:00
Dean Herbert	8c41707ac7	Fix incorrect default state. Handle input better.	2017-04-14 14:40:52 +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	9bf861d0a4	Merge remote-tracking branch 'upstream/master' into peppy/pause-clean-up ... # Conflicts: # osu.Game/Screens/Play/FailOverlay.cs # osu.Game/Screens/Play/PauseOverlay.cs	2017-04-14 01:07:34 +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	1f4e0b0251	Fix MosueUp and HighResolution events not being handled by MenuOverlays.	2017-04-13 13:03:07 +09:00
Dean Herbert	359fea7e25	Improve "escape" pressing logic in pause/fail menus.	2017-04-13 12:40:00 +09:00
Dean Herbert	94bf1d65b6	Fix thread race conditions on pausing close to a fail.	2017-04-13 11:41:08 +09:00
ocboogie	32b87d12b5	Removed unneeded using	2017-04-12 04:54:24 -07:00
ocboogie	6c6ef946bd	Some more clean up	2017-04-12 04:01:52 -07:00
ocboogie	d250dde537	Fixed repeat keys working for retrying	2017-04-12 02:50:03 -07:00
ocboogie	348dd71406	Fixed repeat keys working for resuming	2017-04-12 02:43:42 -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
Dean Herbert	43a4657540	Remove unnecessary AlwaysPresent.	2017-04-10 17:26:05 +09:00
Dean Herbert	3a01cfccee	Adjust fade length and easing.	2017-04-10 17:25:56 +09:00
Dean Herbert	15c1013f5b	Don't schedule event, it's unreliable and doesn't match the fade.	2017-04-10 17:25:46 +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	1842d80e28	Update test case.	2017-04-07 09:43:08 +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	856696b17e	Fix incorrect verbatim strings.	2017-04-06 15:31:21 +09:00
Dean Herbert	6285f3eea8	Merge branch 'master' into pause_buttons_refactor	2017-04-06 15:00:48 +09:00
Andrey Zavadskiy	0946e42363	removed useless stuff	2017-04-05 22:51:43 +03:00
Andrey Zavadskiy	6a510097df	InGameOverlay fixes	2017-04-05 22:36:03 +03: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	f2a9ec0f24	Converted constructor to protected	2017-04-04 19:02:36 +03:00
Andrey Zavadskiy	7b95f2d46a	InGameOverlay now is abstract	2017-04-04 18:53:13 +03: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	1ecff1b32c	Fix naming and testcase	2017-04-01 21:50:25 +03:00
Andrey Zavadskiy	f70de7439b	Moved title and description to each class	2017-04-01 21:42:12 +03:00
Andrey Zavadskiy	bd123fa906	Better inheritance	2017-04-01 21:29:17 +03:00
Andrey Zavadskiy	e3a8a14281	Removed unnecessary using	2017-04-01 21:19:49 +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	91e18cc63e	Fix usings	2017-03-28 12:12:35 +03:00
Andrey Zavadskiy	cf3db49631	Inherit Pause/Fail overlay from InGameOverlay	2017-03-28 12:09:26 +03: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	85c2184170	Fixes	2017-03-28 11:33:56 +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	c4500fa270	fixes	2017-03-28 05:19:32 +03:00
Andrey Zavadskiy	110d43bc25	fixes	2017-03-28 05:12:04 +03:00
Andrey Zavadskiy	457f5c6a89	Removed unised using statement	2017-03-28 04:58:30 +03:00
Andrey Zavadskiy	5461c6516a	Refactor PauseOverlay, FailDialog -> FailOverlay	2017-03-28 04:53:57 +03:00
Andrey Zavadskiy	2f9a15092b	Refactor pause buttons	2017-03-28 04:52:11 +03:00
DrabWeb	f0035659db	Unused using	2017-03-24 00:45:19 -03:00
DrabWeb	a6dfed9668	Formatting	2017-03-24 00:41:56 -03:00
DrabWeb	0edee04200	Use OsuColour instead of static colours	2017-03-24 00:41:14 -03:00
DrabWeb	f1f6f2041f	Null track handling in player	2017-03-23 23:57:33 -03:00
DrabWeb	b56fb310bf	More cleanup	2017-03-23 23:38:23 -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	b429d8f1b3	More proper fix	2017-03-23 09:05:53 -03:00
DrabWeb	3364801221	Fix for the fix	2017-03-23 08:32:24 -03:00
DrabWeb	bbca6cf602	Fix bottom square being clipped	2017-03-23 08:13:03 -03:00
DrabWeb	938f5eaf58	Dragging	2017-03-23 07:38:08 -03:00
DrabWeb	ca2816f9c8	Formatting	2017-03-23 07:24:43 -03:00
DrabWeb	3923892863	Delete SongProgressGraphColumn.cs	2017-03-23 07:20:16 -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
DrabWeb	0337f18fb9	Cleaning	2017-03-23 06:37:12 -03:00
Dean Herbert	b5d661b53a	some fixing and restyling.	2017-03-23 18:20:00 +09: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	5ebbc2c0ba	Formatting	2017-03-22 09:33:01 -03:00
DrabWeb	818bdd8e88	SongProgress in HudOverlay	2017-03-22 09:27:04 -03:00
DrabWeb	333008e26d	Formatting	2017-03-22 08:59:44 -03:00
DrabWeb	340ddb59cd	License headers	2017-03-22 08:54:21 -03:00
DrabWeb	29c54d4d8b	Merge https://github.com/ppy/osu into song-progress-graph	2017-03-22 08:50:17 -03:00
Dean Herbert	f9f31ca092	Add statefulness to MenuCursor.	2017-03-17 20:45:27 +09:00
Dean Herbert	7110ab8e17	Stop cursor moving when paused.	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
Dean Herbert	ea642e5ef4	Merge branch 'master' into scoreprocessor_failing_improvements	2017-03-17 00:52:30 +09:00
smoogipooo	b13340c3c8	Move CheckFailed outside of Schedule().	2017-03-17 00:30:23 +09:00
Dean Herbert	271dddc9a7	Merge branch 'master' into generic_scoreprocessor	2017-03-16 23:04:19 +09:00
Dean Herbert	110bdbd0c1	Make everything share DropDown implementations again. Remove unnecessary files.	2017-03-16 21:17:14 +09:00
Dean Herbert	ab8a5afdb9	AlwaysReceiveInput and InternalContains.	2017-03-16 17:38:36 +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
Dean Herbert	14b22445fa	Merge remote-tracking branch 'upstream/master' into general-fixes ... # Conflicts: # osu.Game/Modes/UI/HitRenderer.cs	2017-03-14 16:15:26 +09:00
Dean Herbert	1f68731a09	Split PlayerInputManager into two classes, allowing more precise handling of input (for KeyCounter).	2017-03-14 16:00:35 +09:00
Dan Balasescu	879a78156d	Merge branch 'master' into mod_application	2017-03-14 12:38:55 +09:00
Dean Herbert	0da950beac	Fix KeyCounter M1 M2 display.	2017-03-14 12:31:09 +09:00
Dean Herbert	4fa037c0b2	Update framework.	2017-03-14 12:01:58 +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	5cbcf7a20a	Fix error-level inspections.	2017-03-07 14:31:54 +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	4e4408cd20	Merge branch 'master' into replay ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs	2017-03-05 17:45:03 +09:00
Thomas Müller	a14bdf8624	Use Color4Extensions from Framework and remove redundant Name	2017-03-04 19:42:37 +01:00
Dean Herbert	00fdffe9c8	Update framework (and fix non-conforming anchors in FillFlowContainers).	2017-03-04 23:24:13 +09:00
Dean Herbert	7a6a614358	Don't show pause menu when watching replays.	2017-03-04 21:35:26 +09:00
Thomas Müller	a2317e5a1e	Update usage of FillDirection	2017-03-04 11:00:17 +01: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
Seth	1891bdf51e	Merge branch 'master' into mod-overlay	2017-03-03 01:11:15 -04:00
Dean Herbert	3a8246f56d	Move PauseOverlay to correct namespace.	2017-03-03 10:17:39 +09:00
DrabWeb	223962121e	Refactor not just rename	2017-03-02 09:26:29 -04:00
DrabWeb	1eeb4aa875	Missed some	2017-03-02 09:21:16 -04:00
DrabWeb	536925c77a	Comply to naming conventions	2017-03-02 09:15:53 -04:00
Dean Herbert	471b9daa93	Merge branch 'master' into mod-overlay ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/osu.Game.csproj	2017-03-02 20:27:04 +09:00
Dean Herbert	435e845067	Merge branch 'master' into DrabWeb/song-progress-graph ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Overlays/Pause/PauseProgressBar.cs # osu.Game/Overlays/Pause/PauseProgressGraph.cs # osu.Game/osu.Game.csproj	2017-03-02 20:20:27 +09:00
Dean Herbert	c4ca18eeba	Remove references to PassThrough.	2017-03-02 16:28:51 +09:00
DrabWeb	367d6d694c	Merge https://github.com/ppy/osu into mod-overlay	2017-03-02 01:44:18 -04:00
Thomas Müller	4d28696479	FlowDirection -> FillDirection	2017-03-01 20:15:38 +01:00
Thomas Müller	9c853b0465	Update framewörk	2017-03-01 19:33:01 +01:00
Thomas Müller	d46e68b36b	Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor ... # Conflicts: # osu-framework # osu.Game/Beatmaps/Drawables/BeatmapGroup.cs	2017-03-01 18:05:58 +01: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
DrabWeb	570c95cb98	Merge https://github.com/ppy/osu into mod-overlay	2017-02-28 02:22:59 -04:00
Jorolf	8b3477820f	Disable mousewheel while playing	2017-02-28 00:08:34 +01:00
default0	03889e6ca6	Update References to FlowStrategies ... References now use the Create*-names instead of the outdated Get*-names to create instances of FlowStrategies.	2017-02-27 16:55:55 +01:00
Dean Herbert	68dd3c02aa	Fix failing testcase (nullref).	2017-02-27 17:05:12 +09:00
Dean Herbert	47997c20ad	Weld -> BindWith.	2017-02-27 12:24:53 +09:00
default0	8d91519d59	Update usage of FlowContainer and its subclasses	2017-02-26 21:32:43 +01:00
Dean Herbert	bc231c6bd4	Remove dispose which is no longer necessary.	2017-02-26 22:08:29 +09:00
Dean Herbert	c227eb1be5	Welded bindables.	2017-02-26 22:08:21 +09:00
Thomas Müller	1585ae842a	Update framework	2017-02-26 11:22:58 +09:00
Dean Herbert	17a28cd3b6	Don't push Player if we aren't still current.	2017-02-25 11:46:19 +09:00
Dean Herbert	7483b69477	Remove unnecessary Dispose logic.	2017-02-25 10:44:19 +09:00
Dean Herbert	c4fbfb5a8f	Update comment with new knowledge.	2017-02-24 21:46:34 +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	0264c44a20	Do not shadow Colour in TwoLayerButton ... Renames Colour to BackgroundColour instead.	2017-02-23 22:33:37 +01:00
Thomas Müller	37bc75a7b6	Remove unused variables	2017-02-23 22:32:49 +01: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
Seth	b4b88712ad	Merge branch 'master' into mod-overlay	2017-02-23 08:00:24 -04:00
Dean Herbert	6701cd9016	Merge branch 'master' into general-fixes	2017-02-23 17:04:53 +09:00
Dean Herbert	f812641696	Merge pull request #383 from peppy/player-loading-screen ... Add loading screen.	2017-02-23 17:04:44 +09:00
Dean Herbert	da2bfe6d3c	Framework updates.	2017-02-23 16:42:12 +09:00
Dean Herbert	9746877903	Merge remote-tracking branch 'upstream/master' into mod-overlay	2017-02-23 11:11:52 +09:00
Dean Herbert	7e7bf07d03	Remove unused whitebox.	2017-02-23 11:11:46 +09:00
Dean Herbert	aef0eb49a1	Add loading screen.	2017-02-22 21:53:59 +09:00
Dean Herbert	7cda82d016	Space to skip.	2017-02-22 21:28:40 +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	9a2beb5979	Update Key Counter font.	2017-02-16 22:43:49 +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
Dean Herbert	1aeb48b920	Merge remote-tracking branch 'upstream/master' into osb_loading	2017-02-13 18:22:29 +09:00
Thomas Müller	aaaf7163e0	Update framework.	2017-02-13 17:46:50 +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
DrabWeb	c61052d62e	Added toggling the progress bar, added buttons to the visual test	2017-02-09 20:12:15 -04:00
DrabWeb	0327c46d36	Fixed columns not being able to have zero fill	2017-02-09 19:29:12 -04:00
DrabWeb	843b58c8f4	Moved random graph values to test case, added null handling for graph values	2017-02-09 19:08:23 -04:00
DrabWeb	ac6726ee2e	Fixed setting column filled values not updating visually, added gray background to visual test	2017-02-09 18:56:50 -04:00
DrabWeb	4d7766b92b	Added displaying given values to the graph	2017-02-09 18:51:05 -04:00
DrabWeb	7fea233181	Removed gradient from test case, modified DragBar to allow access to what's needed in the progress bar, styled the progress bar	2017-02-09 16:28:40 -04:00
Damnae	a504c73f33	Load beatmap data from an optional osb file.	2017-02-09 15:19:09 +01:00
Andrey Zavadskiy	e06aa44c4c	Warning Fixes	2017-02-09 16:18:08 +03:00
Damnae	38b25a7df3	Add hit object stacking.	2017-02-09 07:28:40 +01:00
DrabWeb	50f93bc215	Refactoring to SongProgress in osu.Game.Screens.Play, moving out progress bar into it's own class	2017-02-08 16:22:31 -04:00
Dean Herbert	6b011a50d2	Naming standardisation and enforcing.	2017-02-07 16:20:36 +09:00
Dean Herbert	50bd80cb0c	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Dean Herbert	16a01abc4d	Merge remote-tracking branch 'upstream/master' into options-refactor ... # Conflicts: # osu.Game/Beatmaps/Drawables/BeatmapPanel.cs # osu.Game/Graphics/UserInterface/BackButton.cs # osu.Game/Screens/Play/KeyCounter.cs	2017-02-03 13:16:07 +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	90fd9d9132	Merge branch 'master' into options-refactor	2017-02-01 14:07:49 +09: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
Dean Herbert	6b66ecc131	Global shadows and more sane font size setting.	2017-01-31 18:53:52 +09: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	c6d688898f	Initial implementation of a beatmap carousell and various minor improvements to song select. ... No big optimizations yet, but groundwork is laid out.	2016-11-20 20:34:16 +01:00
Thomas Müller	40805ad32c	Adjust size of wedged background overlay.	2016-11-20 12:29:38 +01: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	0fdd505807	Add wedged background overlay to song select.	2016-11-20 10:02:20 +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
Dean Herbert	d846246ef2	ShowToolbar -> ShowOverlays; include MusicController.	2016-11-15 20:55:57 +09:00
Dean Herbert	5dd4e31011	Move DrawableHitObject.	2016-11-14 19:49:29 +09:00
Dean Herbert	4590be552f	Move play modes to their own projects.	2016-11-14 18:54:24 +09:00
Dean Herbert	06f4f93918	Move play modes to Modes namespace.	2016-11-14 18:03:20 +09:00
Dean Herbert	0f4538f69f	Rename GameModes namespace to Screens.	2016-11-14 17:23:33 +09:00