16369 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	628b3e1119	Move osu-resources to nuget	2019-01-28 18:33:39 +09:00
Shane Woolcock	c3ba3c4405	Update iOS dotsettings file	2019-01-28 17:55:54 +10:30
Dean Herbert	1404ba6625	Remove unnecessary changes	2019-01-28 15:56:55 +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	8cc2583946	Target iOS 10	2019-01-28 15:41:45 +09:00
Dean Herbert	70a5c54a50	Update resources	2019-01-28 15:40:21 +09:00
Dean Herbert	354a99f5e1	Merge branch 'master' into samah-ios	2019-01-28 15:34:46 +09:00
Dan Balasescu	22926bad9f	Merge pull request #4162 from ProgrammaticNajel/fix-editor-hitobject-position ... Fix hit object placement positions in editor not initializing to cursor position	2019-01-28 14:07:06 +09:00
Dan Balasescu	7d5adc5cc3	Merge branch 'master' into fix-editor-hitobject-position	2019-01-28 13:59:55 +09:00
Dan Balasescu	cc8793a45e	Merge pull request #4154 from phosphene47/carousel-wedge-level ... Display carousel over beatmap info wedge	2019-01-28 13:59:50 +09:00
Dan Balasescu	47f35c423b	Merge branch 'master' into carousel-wedge-level	2019-01-28 13:49:12 +09:00
Dan Balasescu	94276c8abb	Merge pull request #4153 from peppy/dont-always-focus-textboxes ... Dont always focus textboxes	2019-01-28 13:49:00 +09:00
Dan Balasescu	610c2df2d4	Merge branch 'master' into dont-always-focus-textboxes	2019-01-28 13:40:08 +09:00
ProgrammaticNajel	2058604ef3	Typo fix	2019-01-26 23:10:13 +08:00
ProgrammaticNajel	0797f5d644	Update SliderPlacementBlueprint.cs	2019-01-26 22:56:31 +08:00
ProgrammaticNajel	e71b13683a	Add null check	2019-01-26 22:55:33 +08:00
ProgrammaticNajel	e939f75f4b	Transform screen mouse coordinates to local space coordinates.	2019-01-26 18:19:01 +08:00
ekrctb	ea48d6a88a	reduce code duplication / allocations	2019-01-26 16:16:49 +09:00
ekrctb	1a5a238752	Use integer count for tiny droplet generation	2019-01-26 16:14:37 +09:00
Shane Woolcock	a14ad4f53f	Merge branch 'master' into samah-ios	2019-01-25 22:43:21 +10:30
smoogipoo	117703374e	Fix logo animations	2019-01-25 21:02:35 +09:00
smoogipoo	60cc2314ef	Fix ruleset + beatmap being changeable in match	2019-01-25 21:02:30 +09:00
phosphene47	5c70be07ab	Display carousel over beatmap info wedge	2019-01-25 22:58:55 +11:00
Dean Herbert	718136a892	Merge pull request #4147 from peppy/fix-texture-loader-stores ... Fix remaining cases of not using host-created TextureLoaderStore	2019-01-25 20:48:32 +09:00
Shane Woolcock	6fddc36843	Move iOS package references to shared props	2019-01-25 22:18:29 +10:30
smoogipoo	b3403c78da	Fix a few potential crashes	2019-01-25 20:47:37 +09:00
smoogipoo	e2891ab1e9	Fix anchors + origins	2019-01-25 20:47:31 +09:00
smoogipoo	95e6785968	Make Multiplayer not an OsuScreen	2019-01-25 20:25:55 +09:00
Dean Herbert	2e36d13aba	Merge remote-tracking branch 'origin/fix-texture-loader-stores' into fix-texture-loader-stores	2019-01-25 20:24:52 +09:00
Dean Herbert	28f529ca19	Rename to host	2019-01-25 20:24:32 +09:00
Dean Herbert	0b587baab8	Merge remote-tracking branch 'upstream/master' into fix-texture-loader-stores	2019-01-25 20:23:51 +09:00
Dean Herbert	4d032af26d	Merge pull request #3919 from peppy/fix-idle-weirdness ... Fix global idle state being entered when overlays are visible	2019-01-25 20:18:33 +09:00
Dean Herbert	a110569f56	Merge pull request #4151 from peppy/fix-sensitivity-tooltip ... Fix cursor sensitivity tooltip not updating instantly	2019-01-25 20:17:56 +09:00
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
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
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
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