737 Commits

Author	SHA1	Message	Date
Craftplacer	08ab4e508f	Use loadComponentSingleFile for caching	2019-09-15 17:15:52 +02:00
Craftplacer	72af640df7	Expose VolumeOverlay as available dependencies	2019-09-15 16:31:40 +02:00
Dean Herbert	53fe290ef3	Merge branch 'master' into back-button-part-2	2019-09-03 19:44:30 +09:00
Dean Herbert	40c1c6072e	Add "osu!classic" as a bundled skin choice	2019-08-29 16:39:42 +09:00
Dean Herbert	5886420a5d	Merge branch 'master' into back-button-part-2	2019-08-13 21:38:31 +09:00
Dean Herbert	9aac5efa4e	Move logic out of OsuGame	2019-08-13 14:42:59 +09:00
Dean Herbert	8d23cda51a	Merge branch 'split-out-music-controller' into music-controller-hotkeys	2019-08-13 14:33:35 +09:00
Dean Herbert	ad24265730	Split visual component out of MusicController	2019-08-13 14:30:18 +09:00
David Zhao	4a28bdd384	Merge remote-tracking branch 'upstream/master' into back-button-part-2	2019-08-13 12:26:12 +09:00
Dean Herbert	f3380c9372	Remove "jukebox" terminology	2019-08-13 12:06:57 +09:00
Lucas A	fdf76be967	Merge branch 'master' into music-controller-hotkeys	2019-08-10 16:29:02 +02:00
Lucas A	8c630b4f4c	Merge branch 'refactor-osd' into music-controller-hotkeys	2019-08-10 16:25:59 +02:00
iiSaLMaN	d772bbaf8c	Simplify disposing	2019-08-01 10:04:04 +03:00
David Zhao	d05b9b1734	Use dummyAPI and move load check into MusicController	2019-08-01 14:19:45 +09:00
iiSaLMaN	3af1aaeabe	Unsubscribe from Completed event on old beatmap	2019-07-31 15:19:02 +03:00
David Zhao	351b6e6259	Add new options test	2019-07-31 19:47:41 +09:00
David Zhao	980686f6bf	get tests running again	2019-07-31 19:30:35 +09:00
David Zhao	f81e691bf5	Merge remote-tracking branch 'upstream/master' into back-button-part-2	2019-07-31 16:03:14 +09:00
David Zhao	5aece2d5f2	fix tests	2019-07-31 16:03:05 +09:00
David Zhao	82fcb88f5c	update names	2019-07-30 12:11:08 +09:00
David Zhao	d70b99b4c0	Merge remote-tracking branch 'upstream/master' into back-button-part-2	2019-07-30 12:05:23 +09:00
David Zhao	6d1203a599	Move screen pushes into function, rename receptor	2019-07-30 12:00:04 +09:00
Dean Herbert	ece5a9622e	Fix scores without an online ID not always presenting correctly	2019-07-30 06:32:05 +09:00
Dean Herbert	2d03c849bf	Improve testability of intro sequence (#5275) ... Improve testability of intro sequence	2019-07-29 18:56:38 +09:00
David Zhao	e8c039bb8a	Use a receptor model instead	2019-07-29 18:45:16 +09:00
David Zhao	2e242075b4	Remove and re-add backbutton instead and add tests	2019-07-29 16:42:23 +09:00
Dean Herbert	088c04a20f	Revert "Fix BackButton handling escape before all other elements (#5440)" ... This reverts commit 17a6563f4c.	2019-07-28 23:38:55 +09:00
David Zhao	bd2fce4bb7	don't use extra container	2019-07-28 13:45:54 +09:00
Dean Herbert	872822035a	Merge branch 'master' into back-button-priority	2019-07-28 12:50:18 +09:00
Dean Herbert	53ecb2ae82	Reduce notification span during beatmap imports	2019-07-26 13:48:29 +09:00
David Zhao	bbcc8f0721	Add new container level and unblock footer	2019-07-25 11:11:20 +09:00
David Zhao	263ccfcbcb	Merge remote-tracking branch 'upstream/master' into back-button-priority	2019-07-24 12:50:16 +09:00
David Zhao	38559685a9	proxy backbutton instead	2019-07-24 12:47:41 +09:00
Dean Herbert	292bd22f92	Allow multiple instances of osu! when running under debug	2019-07-23 13:38:05 +09:00
Dean Herbert	ade661236a	Merge branch 'master' into intro-testing-improvements	2019-07-22 23:44:14 +09:00
Lucas A	2926932a1a	Add MusicControllerToast used to display current music playback status on OSD	2019-07-20 21:10:17 +02:00
Dean Herbert	d4c1005c7e	Fix incorrect comparison in line updating logic	2019-07-15 15:53:19 +09:00
Dean Herbert	0580c32263	Abstract intro screen logic to base class	2019-07-09 18:05:57 +09:00
David Zhao	fbd300e664	Move ruleset into ReplayPlayerLoader as well	2019-07-08 17:37:20 +09:00
David Zhao	6a86f62d17	Get mods from score info	2019-07-08 16:13:03 +09:00
David Zhao	5853a877c2	create base dependencies before caching, create player in playerloader	2019-07-08 15:40:10 +09:00
David Zhao	2747d7692b	Create ReplayPlayerLoader for local mod caching	2019-07-08 14:55:05 +09:00
Lucas A	5f8bd6eca7	Fix CI issues + minor issues	2019-07-05 16:51:15 +02:00
Lucas A	89acd9da3e	Add game-wide jukebox keybindings handling to OsuGame	2019-07-05 16:33:13 +02:00
Dean Herbert	7575047db8	Merge branch 'master' into import-stable-scores	2019-07-04 01:00:42 +09:00
Dean Herbert	466bc7f28a	Merge branch 'master' into watch-replays-4	2019-07-03 11:47:10 +09:00
Dean Herbert	f31d840c13	Dispose previous WorkingBeatmap on change	2019-07-02 22:26:08 +09:00
naoey	04c467fd81	Add comment	2019-06-29 16:10:16 +05:30
naoey	6c81d57178	Remove hacks for updating model info ... - Re-retrieve score from database when presenting scores	2019-06-29 16:08:48 +05:30
HoLLy	55216dffb7	Merge remote-tracking branch 'origin/master' into import-stable-scores	2019-06-27 14:07:17 +02:00
Dean Herbert	0bad86f6d9	Merge remote-tracking branch 'upstream/master' into async-beatmap-load	2019-06-27 13:58:59 +09:00
smoogipoo	aa81c95f30	Remove unnecessary extra property	2019-06-25 18:38:14 +09:00
smoogipoo	5b294ba419	Adjust backbutton animation	2019-06-25 18:33:35 +09:00
smoogipoo	d9927204f8	Relieve OsuScreen of back button input duties	2019-06-25 18:33:18 +09:00
smoogipoo	f53d2fbe76	Scale backbutton along with screens	2019-06-25 18:33:13 +09:00
smoogipoo	8c96e4c1fa	Move back button to OsuGame	2019-06-25 18:33:08 +09:00
Dean Herbert	1830362337	Move task out of ctor to avoid initialisation ordering issues	2019-06-24 17:10:50 +09:00
HoLLy	f072a53e93	Merge remote-tracking branch 'origin/master' into import-stable-scores	2019-06-21 17:42:59 +02:00
Dean Herbert	cff5ddb137	Merge branch 'master' into fix-inactive-audio-race	2019-06-21 21:09:12 +09:00
Dean Herbert	f2200594c9	Remove necessity for MusicController to be always visible	2019-06-20 23:40:25 +09:00
HoLLy	15c75b4442	Add basic score import from stable	2019-06-19 18:33:51 +02:00
Dean Herbert	c32d17d16a	Fix audio not dimming after race condition ... Also adjusts transition slightly for smoother effect.	2019-06-18 01:32:52 +09:00
Lucas A	04dc1c1744	Fix typo in comment ... Co-Authored-By: Joseph Madamba <madamba.joehu@outlook.com>	2019-06-17 16:44:53 +02:00
Dean Herbert	3a04684efb	Add region	2019-06-17 23:25:16 +09:00
Dean Herbert	ad4c9babe7	Adjust naming and transitions	2019-06-17 23:24:52 +09:00
Lucas A	d7d6feb001	Fade volume in / out when game window becomes active / inactive	2019-06-17 12:31:23 +02:00
Dean Herbert	609a82bc94	Update VisibilityContainer usage in line with framework	2019-06-11 15:13:58 +09:00
smoogipoo	4dc77d64a3	Fix overlay group + depth	2019-05-31 13:23:50 +09:00
Dean Herbert	40f7cbde3a	Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay	2019-05-21 14:00:50 +09:00
Dean Herbert	85a41cf6c3	Allow chaining of loadComponentSingleFile	2019-05-21 13:44:18 +09:00
Dean Herbert	d7098e2066	Hide other overlays when showing changelog	2019-05-15 17:38:19 +09:00
Dean Herbert	e46a61febf	Allow chaining of loadComponentSingleFile	2019-05-15 17:36:29 +09:00
Dean Herbert	88528e797f	Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay	2019-05-15 14:24:45 +09:00
Dean Herbert	1fd44d7945	Move OsuScreenDependencies to GameBase	2019-05-15 13:00:11 +09:00
Dean Herbert	ec5b024fa6	Define toolbarElements	2019-05-14 18:34:25 +09:00
Dan Balasescu	bffde7de08	Merge branch 'master' into exit-hide-music-controller	2019-05-14 17:36:38 +09:00
Dean Herbert	0fc43afd34	Merge branch 'master' into HoutarouOreki-changelog-overlay	2019-05-14 17:35:14 +09:00
Dean Herbert	7553e2da25	Fix incorrect DI reference and update naming of SettingsOverlay classes	2019-05-14 10:45:05 +09:00
Dean Herbert	4b508915f6	Centralise caching of components at OsuGame level	2019-05-13 17:10:25 +09:00
Dean Herbert	50c440de8d	Add toolbar button	2019-05-13 17:01:17 +09:00
Dean Herbert	65097fddc1	Hide music controller when exiting via Alt-F4 ... Closes #4764.	2019-05-12 22:34:58 +09:00
smoogipoo	d7c09e7dbd	Merge remote-tracking branch 'origin/master' into fix-new-inspections ... # Conflicts: # osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs # osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs # osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs # osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs # osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs # osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs # osu.Game/Graphics/OsuFont.cs # osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs # osu.Game/Overlays/Profile/Header/BadgeContainer.cs # osu.Game/Overlays/Profile/ProfileHeader.cs # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/Skinning/LegacySkinDecoder.cs	2019-05-07 13:20:17 +09:00
smoogipoo	0bd35ab7bb	Turn on warnings, resolve issues	2019-04-25 17:36:17 +09:00
smoogipoo	0222424aef	Make mods IReadOnlyList<Mod> gamewide ... Prevents potential multiple evaluations of enumerable.	2019-04-10 17:20:36 +09:00
smoogipoo	4310f07a5c	Rename SelectedMods -> Mods	2019-04-10 12:03:57 +09:00
smoogipoo	ad124bfeec	Reimplement select mod track adjustments	2019-04-09 12:59:32 +09:00
smoogipoo	c584967eb1	Remove mods from workingbeatmap	2019-04-09 12:59:32 +09:00
Lucas A	d5b7865ab8	Invert notification and loginOverlay depth order	2019-04-06 17:40:48 +02:00
Joehu	debda7ae7d	Fix volume overlay container reference	2019-04-05 00:05:42 -07:00
Joehu	53906e87ec	Split floatingOverlayContent	2019-04-05 00:00:21 -07:00
Dean Herbert	1709e22763	Merge branch 'master' into fix-blocked-volume-overlay	2019-04-04 17:28:46 +09:00
Samuel Van Allen	55a6e43778	Check against databasedSet instead of function param	2019-04-03 21:49:33 +08:00
Samuel Van Allen	e9269dc83b	Prevent unnecessary query in OsuGame::PresentBeatmap ... This resolves issue #4575	2019-04-02 23:57:31 +08:00
Dean Herbert	f1952c0816	Update font awesome usage	2019-04-02 19:55:24 +09:00
Dean Herbert	612db31c38	Apply newline additions	2019-04-01 12:16:32 +09:00
Joehu	1ba608f01f	Remove line spacing on similar code	2019-03-29 00:26:17 -07:00
Joehu	eefc55f89b	Fix volume overlay being blocked by other floating overlays ... - excluding settings	2019-03-29 00:20:16 -07:00
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