590 Commits

Author	SHA1	Message	Date
Dean Herbert	ccc0853f75	Change login overlay's depth and load order	2019-03-29 14:53:40 +09:00
Dean Herbert	90a4cb8e04	Fix unnecessary positioning	2019-03-29 14:49:15 +09:00
Joseph Madamba	9a32e12435	Merge branch 'master' into fix-login-overlay-behavior	2019-03-28 22:28:56 -07:00
Dean Herbert	95bf0b9ed6	Merge remote-tracking branch 'upstream/master' into fix-music-controller-offset	2019-03-29 13:57:02 +09:00
Dean Herbert	c4096fb628	Remove unused using	2019-03-29 13:56:56 +09:00
Dean Herbert	176b4ecc38	Merge branch 'master' into sprite-icon-compatibility	2019-03-28 23:47:44 +09:00
Joehu	9a3528ea9d	Fix field modifier	2019-03-27 22:31:40 -07:00
Joehu	53f3dacdfb	Fix login overlay behavior	2019-03-27 22:01:06 -07:00
Joehu	bdb39a79a9	Fix offset of music controller when toolbar is hidden	2019-03-27 20:27:26 -07:00
Joseph Madamba	cdf79ffe39	Merge branch 'master' into clean-overlays-code-1	2019-03-27 10:32:13 -07:00
Dean Herbert	de80fc0eac	Update icon usage to match framework changes	2019-03-27 19:29:27 +09:00
David Zhao	5169f7a43c	Change default for null screen parallax, apply reviews	2019-03-24 16:21:43 +09:00
David Zhao	dcae86e39a	Add a new test for OsuScreenStack, fix parallax	2019-03-22 14:10:38 +09:00
Joseph Madamba	d5272a83cf	Rename "urgent" to "topMost"	2019-03-21 11:16:10 -07:00
Joehu	1f95abf7c7	Fix regressions caused by removing specified depths ... - urgentOverlayContent is added so toolbar can be loaded first	2019-03-19 21:30:24 -07:00
Joehu	a39648edbc	Normalize format of single line curly brackets	2019-03-19 20:51:43 -07:00
Joehu	44e0291737	Remove specified depths of overlays	2019-03-19 20:47:12 -07:00
David Zhao	9368081b99	Fix TestCasePlayer	2019-03-12 17:33:16 +09:00
David Zhao	e3567a5507	Make OsuGame use OsuScreenStack too	2019-03-12 16:03:25 +09:00
Dan Balasescu	fd147dae21	Merge branch 'master' into fix-disabled-set-crash	2019-03-05 17:25:13 +09:00
smoogipoo	7583279e08	Remove unnecessary precondition	2019-03-01 13:29:02 +09:00
Shane Woolcock	5d1eacf1c1	Ensure all OsuFocusedOverlayContainers contribute to screen fading	2019-03-01 12:20:31 +09:00
smoogipoo	951b95ff78	Fix potential race condition	2019-02-28 17:17:57 +09:00
Dean Herbert	2dbf7d122c	Merge branch 'master' into use-pattern-matching	2019-02-28 14:53:07 +09:00
Dean Herbert	e2c6a8bc07	Use pattern matching wherever possible	2019-02-28 14:35:00 +09:00
Dean Herbert	26d53d06a9	Fix remaining issues	2019-02-28 13:31:40 +09:00
Dean Herbert	43b02212ce	Add disposal check in single file load path	2019-02-28 12:24:56 +09:00
Dan Balasescu	32b8bb2ccc	Fix broken grammar ... Co-Authored-By: peppy <pe@ppy.sh>	2019-02-26 12:28:49 +09:00
Dean Herbert	314f35b0c5	Further simplify import messaging	2019-02-25 18:42:08 +09:00
Dean Herbert	80737b9ef8	Remove "silent" parameter; consolidate import logic	2019-02-25 18:24:06 +09:00
Dean Herbert	706da017d7	Add target screen support and user bypass	2019-02-25 14:01:51 +09:00
Dean Herbert	caef58675d	Tidy up and standardise present logic	2019-02-25 12:58:58 +09:00
Dean Herbert	56397dbea6	Ensure beatmap is not disabled before continuing with present	2019-02-24 12:08:27 +09:00
Dean Herbert	367bc53a06	Revert some more instances of 'e' variable names	2019-02-22 20:15:25 +09:00
Dean Herbert	3fe4b8fd1c	Update variable names ... Also cleans up some weird code	2019-02-22 17:51:39 +09:00
smoogipoo	d8c55bc729	Adjust namespaces	2019-02-21 19:05:52 +09:00
smoogipoo	bca347427f	Update with framework bindable changes	2019-02-21 18:56:34 +09:00
smoogipoo	49eadcb575	Update active state immediately + fix potential nullref	2019-02-19 19:44:09 +09:00
smoogipoo	703df77000	Update in-line with framework IsActive changes	2019-02-19 19:16:03 +09:00
Jamie Taylor	3ea13b1ade	Fix mouse cursor appearing prematurely during startup	2019-02-15 16:55:39 +09:00
Dean Herbert	5318de29b4	Fix import logic again	2019-02-13 19:57:54 +09:00
Dean Herbert	e604806398	Fix regression in screen change allowance logic	2019-02-13 19:43:01 +09:00
Dean Herbert	ca5c8d37d1	Use leased bindables	2019-02-01 16:44:06 +09:00
Dean Herbert	d1c8ee65a5	Fix osu! logo potentially appearing during game load in a weird place	2019-01-31 19:22:29 +09:00
Dean Herbert	ba6176fd03	Fix major regression in scaling behaviour	2019-01-31 18:28:46 +09:00
Dean Herbert	b48bb5b792	Move parallax logic out of BackgroundScreenStack	2019-01-31 18:10:33 +09:00
smoogipoo	91302ea0bc	Merge remote-tracking branch 'origin/master' into iscreen ... # Conflicts: # osu.Game/Screens/Multi/Match/MatchSubScreen.cs # osu.Game/Screens/Multi/Multiplayer.cs # osu.Game/Screens/Multi/MultiplayerSubScreen.cs # osu.Game/Screens/OsuScreen.cs # osu.Game/osu.Game.csproj # osu.sln	2019-01-29 21:21:36 +09:00
smoogipoo	7b1c1f3728	Move toolbar showing and overlay activation to OsuGame ... Now exposed through IOsuScreen.	2019-01-28 15:42:06 +09:00
Dean Herbert	4a59ccb81d	Merge branch 'master' into fix-idle-weirdness	2019-01-25 17:52:59 +09:00
smoogipoo	f0e0088f43	Create a custom background stack to fix various background issues	2019-01-25 15:36:22 +09:00
smoogipoo	a7e281469b	Fix game exiting instantly on pressing close button	2019-01-24 20:13:29 +09:00
smoogipoo	8ea7ec6445	Convert everything to use IScreen	2019-01-24 19:47:44 +09:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Dean Herbert	7415a6e764	Cache input manager	2019-01-23 20:37:56 +09:00
Dean Herbert	4c8e7a26dc	Merge branch 'master' into fix-idle-weirdness	2019-01-23 18:53:52 +09:00
Dan Balasescu	e35b0093f3	Merge branch 'master' into fix-toolbar-padding-regression	2019-01-22 19:18:02 +09:00
ekrctb	fe2b83279e	Correct wrong logic ... `OnlineBeatmapSetID == null` was the problem	2019-01-22 16:40:32 +09:00
ekrctb	0095521fc2	Use both OnlineBeatmapSetID and Hash	2019-01-22 16:10:04 +09:00
ekrctb	1d5f5865aa	Fix PresentBeatmap not working for unsubmitted beatmap set	2019-01-22 15:19:42 +09:00
Dean Herbert	4eb5e67075	Fix overlays not being correctly offset by toolbar padding	2019-01-21 19:34:35 +09:00
Dean Herbert	1ff9203f9e	Merge branch 'master' into fix-idle-weirdness	2019-01-10 18:38:48 +09:00
Dean Herbert	4f5c208672	Add UI scale ... Limited to (relatively) sane values until we eventually get around to adjusting UI to allow higher extermities.	2019-01-09 19:01:33 +09:00
Dean Herbert	440f4703cb	Fix toolbar offset not being applied	2019-01-08 12:57:31 +09:00
Dean Herbert	74539b5e5c	Merge remote-tracking branch 'upstream/master' into letterboxing	2019-01-07 18:52:48 +09:00
Roman Kapustin	4b5fc85875	Use Find instead of FirstOrDefault	2019-01-05 19:35:33 +03:00
Dean Herbert	4c2c7bd937	Fix global idle state being entered when overlays are visible	2019-01-04 16:26:10 +09:00
Dean Herbert	3953f829c8	Add letterbox/screen scaling support	2019-01-04 13:36:02 +09:00
Dean Herbert	ab5f6e149c	Remvoe extra newline	2018-12-27 19:25:56 +09:00
Dean Herbert	31db768bdc	Hide version overlay when not in main menu	2018-12-27 19:21:07 +09:00
Dean Herbert	8cf30bdb6a	Play with delegate	2018-12-26 22:16:35 +09:00
smoogipoo	02365ee5ba	Merge remote-tracking branch 'origin/master' into timeshift-wip	2018-12-22 23:23:21 +09:00
smoogipoo	3cdeeb7ac5	Add forceful set helper methods in OsuGame	2018-12-18 18:09:46 +09:00
Dean Herbert	fc5d5a7752	Merge branch 'master' into user-registration	2018-12-14 19:45:27 +09:00
Dean Herbert	ea4dce8454	Add a polling component model	2018-12-10 21:08:14 +09:00
Dean Herbert	2a2561e5c8	Update framework and otehr nuget packages	2018-12-07 19:39:54 +09:00
Dean Herbert	d3f5111fa1	Use relative URL	2018-12-06 12:18:21 +09:00
Dean Herbert	669a17529a	Move external link opened to top most level	2018-12-06 11:55:58 +09:00
Dean Herbert	1a974f64de	Initial design for user registration dialog	2018-12-05 12:57:26 +09:00
smoogipoo	a6b0e35b2d	Fix post-rebase issues	2018-11-30 18:31:54 +09:00
smoogipoo	a8ad7d4670	Add silent import parameter	2018-11-30 18:27:13 +09:00
smoogipoo	d07a724970	Only allow replay screen changes in menu + songselect	2018-11-30 18:25:54 +09:00
smoogipoo	8eff49bccd	Remove User from Replay	2018-11-30 18:25:14 +09:00
smoogipoo	ed67984638	Don't load player if score has no replay data	2018-11-30 18:24:35 +09:00
Dean Herbert	3727955911	Refactors/renames	2018-11-30 16:35:45 +09:00
Dean Herbert	831cd3ed59	ScoreInfo scoreInfo -> ScoreInfo score	2018-11-30 15:18:52 +09:00
smoogipoo	d2f0a921ca	Fix lookups by beatmapinfo failing for imports of existing sores	2018-11-28 20:41:48 +09:00
smoogipoo	a88b69ec43	Notify of existing imports	2018-11-28 20:19:35 +09:00
smoogipoo	b8e60afa69	Move replays to an wrapping Score class	2018-11-28 18:45:17 +09:00
smoogipoo	219929eb47	Score -> ScoreInfo	2018-11-28 18:33:01 +09:00
smoogipoo	5b409a5ae5	Fix missed renames	2018-11-28 17:27:22 +09:00
smoogipoo	4ba7690e04	Initial scoremanager/scorestore structure	2018-11-28 16:50:16 +09:00
smoogipoo	09b79d736b	Remove unused usings	2018-11-28 16:33:42 +09:00
smoogipoo	5fd6e6ca77	Re-namespacing	2018-11-28 16:12:57 +09:00
Dean Herbert	87da7b05a6	Remove unnecessarily specified RelativeSizeAxes	2018-11-26 16:39:11 +09:00
Dean Herbert	8d65d49126	Use bindable flow for checking idle time	2018-11-26 16:32:59 +09:00
Dean Herbert	fe5b043a59	Merge branch 'master' into fix_idle_tracker	2018-11-26 15:24:44 +09:00
smoogipoo	cadfe41f83	Merge remote-tracking branch 'origin/master' into external_link_warning	2018-11-23 15:19:52 +09:00
Dean Herbert	afa547af84	Fix order of ChannelManager dependency caching	2018-11-23 11:00:17 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
Roman Kapustin	3c0ce2b615	Revert "Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle"" ... This reverts commit bcdaee7d39.	2018-11-19 20:48:59 +03:00
smoogipoo	bcdaee7d39	Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle" ... This reverts commit 3e2e2a7000, reversing changes made to d94801b6c6.	2018-11-19 17:52:31 +09:00
Roman Kapustin	376e76e00d	Resolve merge conflicts	2018-11-18 16:10:36 +03:00
Dan Balasescu	e8f34ddff0	Merge branch 'master' into return_to_large_logo_after_idle	2018-11-15 15:16:10 +09:00
Dean Herbert	4b1282235a	Merge remote-tracking branch 'upstream/master' into Private_Messages	2018-11-12 20:41:10 +09:00
Roman Kapustin	b4809f4417	External link warning code cleanup	2018-11-01 23:52:07 +03:00
Roman Kapustin	7401fabb5d	Extract external link opening to the ExternalLinkOpener class	2018-10-23 23:03:00 +03:00
Dean Herbert	3be50c2941	Merge branch 'master' into return_to_large_logo_after_idle	2018-10-09 18:02:36 +09:00
smoogipoo	97c585c54c	Fix cursor not hiding in screenshots	2018-10-02 10:12:07 +09:00
Roman Kapustin	baf9e028c3	Fix possible idleTracker nullref	2018-09-26 19:44:01 +03:00
Roman Kapustin	c7b3fa51d5	Inject IdleTracker into ButtonSystem	2018-09-25 19:58:50 +03:00
UselessToucan	3c0b77658c	Merge branch 'master' into return_to_large_logo_after_idle	2018-09-25 19:48:38 +03:00
Dean Herbert	3c8c7a0459	Move ChannelManager to OsuGame ... There's no reason for it to exist at OsuGameBase	2018-09-14 13:31:25 +09:00
Roman Kapustin	60c0428979	Remove redundant empty argument list	2018-09-12 20:54:40 +03:00
Roman Kapustin	749e89bd25	Introduce IdleTracker	2018-09-12 20:34:52 +03:00
Roman Kapustin	761d7629cd	Return to large logo after idle period	2018-09-12 18:09:19 +03:00
Dean Herbert	5d264fdbdd	Merge remote-tracking branch 'upstream/master' into Private_Messages	2018-09-11 13:56:57 +09:00
Dean Herbert	27ac7685e1	Bring music controller in front of notification overlay	2018-09-09 22:12:37 +09:00
Dean Herbert	ce92c8d2eb	Merge branch 'master' into Private_Messages	2018-09-05 02:40:02 +09:00
Dean Herbert	144e80dff6	Add "import all skins from stable" option (and mass delete)	2018-09-03 10:10:04 +09:00
Dean Herbert	e503878956	Merge branch 'master' into master	2018-09-01 17:31:04 +09:00
Dean Herbert	20817fdf1d	Avoid using symbol windows can't diplay	2018-08-30 14:34:45 +09:00
unknown	499c5d28ff	Refactored variable names in OsuGame.cs for improved code readability.	2018-08-29 18:04:51 -04:00
Dean Herbert	4b54c65d3f	Fix single file component loading not actually working correctly	2018-08-29 15:11:02 +09:00
Dean Herbert	4376ad107e	Merge branch 'master' into Private_Messages	2018-08-24 17:26:33 +09:00
Dean Herbert	295ccabf64	Expand out on to multiple lines	2018-08-20 16:06:12 +09:00
Dean Herbert	65dc9f44e5	Catch OperationCanceledException in single file load sequence	2018-08-20 14:42:37 +09:00
Dean Herbert	7a8aabc402	Fix notifications suggesting automatic reporting in non-deployed builds	2018-08-17 13:18:48 +09:00
Dean Herbert	12b81df2f3	Fix unhandled exception on startup when arguments are present	2018-08-16 22:01:04 +09:00
Dean Herbert	9f55afe569	Let user know automatic reporting happened	2018-08-16 16:44:12 +09:00
Dean Herbert	9fc0a75b71	Merge branch 'master' into sentry-logging	2018-08-16 13:33:24 +09:00
smoogipoo	bfbe00e6ec	Remove multiple caching	2018-08-08 15:38:09 +09:00
Dean Herbert	4453b5faca	Cache mods at PlaySongSelect	2018-08-08 12:43:08 +09:00
Dean Herbert	4cb7063801	Add automated testing of mod preservation/removal	2018-08-07 16:45:18 +09:00
Dean Herbert	7b8bd7f21c	Fix mod selection not restoring when re-entering song select	2018-08-07 14:49:44 +09:00
miterosan	cc640893c2	Merge branch 'master' into Private_Messages	2018-08-04 00:33:46 +02:00
Dean Herbert	2ea90ef98a	Add sentry logging	2018-08-03 19:25:55 +09:00
miterosan	b1e9a4fd24	Merge branch 'master' of https://github.com/ppy/osu into Private_Messages	2018-07-29 23:28:34 +02:00
Dean Herbert	b7de922896	Merge branch 'master' into open-downloaded-beatmas	2018-07-28 12:44:34 +09:00
smoogipoo	464333cf0b	Merge remote-tracking branch 'origin/master'	2018-07-26 21:28:31 +09:00
miterosan	9f43e0c900	Merge branch 'master' of https://github.com/ppy/osu into Private_Messages ... # Conflicts: # osu.Game/Overlays/Chat/ChatTabControl.cs # osu.Game/Overlays/ChatOverlay.cs	2018-07-23 15:45:54 +02:00
Dean Herbert	f1c3fbe644	Improve integrity of song select bind/change logic	2018-07-18 13:18:50 +09:00
Dean Herbert	ac35e8bd99	Remove redundant empty statement	2018-07-13 21:27:09 +09:00
Dean Herbert	6d8923a37c	Use better logic	2018-07-13 21:08:41 +09:00
Dean Herbert	a1a077398c	Merge remote-tracking branch 'upstream/master' into peppy-clickable-download-notifications	2018-07-13 21:04:17 +09:00
Dean Herbert	95f314d949	Fix crash when clicking notification from player	2018-07-13 21:04:10 +09:00
Dean Herbert	b33a0f772e	Don't close toolbar	2018-07-13 21:00:52 +09:00
Dean Herbert	96eb44425b	Fix informational overlays not hiding when user toggles other overlay views ... Closes #3014.	2018-07-13 20:34:41 +09:00
Dean Herbert	fbc5250bf1	Update framework	2018-07-11 17:12:01 +09:00
Dean Herbert	1418d1369f	Add the ability to click completed download notifications to select beatmap ... Closes #2731.	2018-07-11 01:32:10 +09:00
miterosan	c56a4ea893	Merge branch 'master' into Private_Messages	2018-07-08 19:29:33 +02:00