18091 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	4d982adf69	Merge branch 'master' into fix-idle-weirdness	2019-01-25 19:48:52 +09:00
Dan Balasescu	81e2e73589	Merge branch 'master' into fix-texture-loader-stores	2019-01-25 19:40:49 +09:00
Dan Balasescu	be812d189d	Merge branch 'master' into dont-always-focus-textboxes	2019-01-25 19:36:09 +09:00
Dan Balasescu	9ae9302391	Merge pull request #4152 from peppy/update-framework ... Update framework	2019-01-25 19:35:50 +09:00
Aergwyn	c8c375636f	Use lambda ... Co-Authored-By: peppy <pe@ppy.sh>	2019-01-25 19:34:25 +09:00
smoogipoo	e1e7759e0f	Re-implement MultiplayerSubScreen	2019-01-25 19:32:37 +09:00
smoogipoo	3fb17ead06	Fix breadcrumbs crash when last screen exits	2019-01-25 19:31:58 +09:00
Dean Herbert	49051a359f	Merge branch 'dont-always-focus-textboxes' into samah-ios	2019-01-25 19:22:26 +09:00
Unknown	77763fde8b	revert accidentally renamed variables	2019-01-25 11:22:05 +01:00
Dean Herbert	260034a80e	Don't auto-focus textboxes when on screen keyboard would cause inconvenience	2019-01-25 19:20:29 +09:00
Dean Herbert	82d944dc89	Fix textbox colours not always being set corrrectly	2019-01-25 19:20:29 +09:00
Unknown	4a916b2dee	replace license headers with new ones	2019-01-25 11:17:48 +01:00
Unknown	8ddff673b7	revert previous rename and rename ruleset specific classes instead	2019-01-25 11:14:37 +01:00
Dean Herbert	9e8347413b	Merge remote-tracking branch 'origin/fix-texture-loader-stores' into samah-ios ... # Conflicts: # osu.Game/Beatmaps/BeatmapManager.cs	2019-01-25 18:59:22 +09:00
Unknown	5446c99f22	Merge branch 'master' into move-osu-settings	2019-01-25 10:57:04 +01:00
Dean Herbert	33faa6cbcf	Update licence headers	2019-01-25 18:55:05 +09:00
Dean Herbert	241ce31cee	Update framework version	2019-01-25 18:53:36 +09:00
Dean Herbert	159ac7359e	Merge branch 'update-framework' into samah-ios	2019-01-25 18:52:17 +09:00
Dean Herbert	144533706e	Update framework	2019-01-25 18:51:29 +09:00
Dean Herbert	e3fde56780	Merge remote-tracking branch 'origin/fix-idle-weirdness' into samah-ios	2019-01-25 18:49:41 +09:00
Dean Herbert	f4729d41f3	Merge branch 'master' into samah-ios	2019-01-25 18:49:08 +09:00
smoogipoo	da135346b2	Fix screen titles	2019-01-25 18:38:48 +09:00
smoogipoo	15100632f1	Remove MultiplayerSubScreen and fix multiplayer crashes	2019-01-25 18:26:04 +09:00
ekrctb	aaba377e11	Add a test for catch slider conversion	2019-01-25 18:13:14 +09:00
ekrctb	3375096f1d	Fix juice stream generates tiny droplet at tick time	2019-01-25 18:11:27 +09:00
Dean Herbert	4a59ccb81d	Merge branch 'master' into fix-idle-weirdness	2019-01-25 17:52:59 +09:00
Dean Herbert	a5f1aa644b	Fix cursor sensitivity tooltip not updating instantly	2019-01-25 17:30:35 +09:00
Dean Herbert	f89c57d1af	Merge pull request #4149 from smoogipoo/crlf-licenseheader ... Force crlf for osu.licenseheader	2019-01-25 16:53:18 +09:00
smoogipoo	a0be223f16	Force crlf for osu.licenseheader	2019-01-25 16:22:20 +09:00
Dean Herbert	6b9841c0fa	Merge pull request #4142 from ProgrammaticNajel/fix-multiplayer-parallax-overflow ... Fix multiplayer screen "pushed" by notifications overlay parallax	2019-01-25 15:54:33 +09:00
smoogipoo	f0e0088f43	Create a custom background stack to fix various background issues	2019-01-25 15:36:22 +09:00
Dean Herbert	a25dce53cd	Fix logical regression	2019-01-25 15:03:32 +09:00
Dean Herbert	e88d36ed38	Merge branch 'master' into fix-multiplayer-parallax-overflow	2019-01-25 14:55:28 +09:00
Dean Herbert	7ed215c521	Make InternalPadding a bit simpler	2019-01-25 14:46:45 +09:00
Dean Herbert	787d4da153	Combine constant	2019-01-25 14:10:59 +09:00
Dean Herbert	1500fe74ae	Merge pull request #4144 from Aergwyn/mania-settings ... Add "Scroll speed" to osu!mania settings subsection	2019-01-25 13:10:05 +09:00
Dean Herbert	67331039ef	Don't use TransferValueOnCommit	2019-01-25 12:53:30 +09:00
Dean Herbert	0d814c5cdd	Merge branch 'master' into mania-settings	2019-01-25 12:44:31 +09:00
Dean Herbert	99d349c865	Merge branch 'master' into fix-texture-loader-stores	2019-01-25 12:39:02 +09:00
Dean Herbert	7f8da819a0	Merge pull request #4136 from Aergwyn/fix-tracked-config-disposal ... Fix crash when config doesn't have track-able settings	2019-01-25 12:38:50 +09:00
Dean Herbert	2b250aa47b	Merge branch 'master' into fix-tracked-config-disposal	2019-01-25 12:14:58 +09:00
Dean Herbert	c3b73d2d53	ALlow null host	2019-01-25 12:08:31 +09:00
Dean Herbert	014ea972d9	Merge remote-tracking branch 'origin/master' into samah-ios	2019-01-25 11:51:44 +09:00
Dean Herbert	bda5a90252	Readonly variable	2019-01-25 11:50:52 +09:00
Dean Herbert	6b3d53750c	Fix remaining cases of not using host-created TextureLoaderStore	2019-01-25 11:48:28 +09:00
Unknown	01ab371c87	add "Scroll speed" to ManiaSettingsSubsection	2019-01-24 17:39:23 +01:00
Unknown	f07ac8ebd8	remove osu! specific settings from global config again	2019-01-24 16:11:55 +01:00
Unknown	2bbaa2ac60	silently return instead of throwing	2019-01-24 16:02:47 +01:00
ProgrammaticNajel	4cae9bae83	Merge branch 'master' into fix-multiplayer-parallax-overflow	2019-01-24 20:41:10 +08:00
Dan Balasescu	d2ee08ad7b	Merge pull request #4140 from peppy/update-licence-header ... Update licence header (and remove year)	2019-01-24 21:27:05 +09:00