2483 Commits

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