15759 Commits

Author	SHA1	Message	Date
Dean Herbert	6bff5cfb9e	Merge remote-tracking branch 'upstream/master' into avoid-duplicate-empty-archives	2019-12-27 14:07:34 +09:00
Dean Herbert	ea52bbea35	Update framework	2019-12-27 14:05:48 +09:00
Dean Herbert	9478fe5ec3	Revert to using empty container, not null	2019-12-27 13:15:55 +09:00
Andrei Zavatski	04a4821a9f	Make CreateContent a method again	2019-12-27 06:36:41 +03:00
Andrei Zavatski	2d167a5161	Some little size adjustments	2019-12-27 05:53:31 +03:00
Andrei Zavatski	3feaaa3e4d	Use FillMode.Fit for icons	2019-12-27 05:37:06 +03:00
Andrei Zavatski	dc720dd653	Bump ppy.osu.Game.Resources from 2019.1215.0 to 2019.1227.0	2019-12-27 05:27:36 +03:00
Andrei Zavatski	3ae0564db7	Merge master with conflicts resolved	2019-12-27 05:17:53 +03:00
Dean Herbert	183307d636	Use circle instead of CircularContainer	2019-12-27 10:53:20 +09:00
Andrei Zavatski	bd6e603be3	Add icon for profile header	2019-12-27 04:01:33 +03:00
Andrei Zavatski	25f6517fba	Update dependency	2019-12-27 03:53:01 +03:00
Andrei Zavatski	3d7c7a1ced	Fix profile title wasn't in lowercase	2019-12-26 22:39:13 +03:00
Andrei Zavatski	e360aa4588	Fix TabControl wasn't on top of everything	2019-12-26 22:16:20 +03:00
Andrei Zavatski	a1c91af095	Update layout of every overlay using OverlayHeader	2019-12-26 22:09:06 +03:00
Andrei Zavatski	647c83e6c8	Add ability to not create content for headers ... Rather than creating an empty container	2019-12-26 21:21:15 +03:00
Andrei Zavatski	ca3e8db79f	Merge dependency	2019-12-26 21:03:39 +03:00
Andrei Zavatski	2d32fe08ff	Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay_headers_update	2019-12-26 21:02:14 +03:00
Dean Herbert	033bb15500	Fix early-escape not continuing to results screen (#7362) ... Fix early-escape not continuing to results screen	2019-12-26 23:50:21 +09:00
Dean Herbert	3d5561b02e	Separate health and score processing components (#7358) ... Separate health and score processing components	2019-12-26 23:48:55 +09:00
Dean Herbert	a041f32072	Use cleaner solution via cancellation of older schedule	2019-12-26 19:05:32 +09:00
Dean Herbert	74d875a2e0	Give empty archives a hash based on archive name to avoid duplicate imports	2019-12-26 18:44:50 +09:00
smoogipoo	8903f286ef	Fix escape not continuing to results screen	2019-12-26 18:27:48 +09:00
smoogipoo	96a4f9ae53	Fix nub position getting offset by size changes	2019-12-26 15:14:19 +09:00
smoogipoo	7414a6aadd	Merge remote-tracking branch 'huoyaoyuan/master' into health-processor ... # Conflicts: # osu.Game.Rulesets.Catch/CatchRuleset.cs # osu.Game.Rulesets.Mania/ManiaRuleset.cs # osu.Game.Rulesets.Taiko/TaikoRuleset.cs	2019-12-26 14:56:54 +09:00
Andrei Zavatski	bb4d02a1f8	Fix incorrect icon offset	2019-12-25 22:09:14 +03:00
Andrei Zavatski	c77679e36c	Naming fixes for overlays using ScreenTitle	2019-12-25 21:57:22 +03:00
Andrei Zavatski	3e34155114	Update ScreenTitle with the new design	2019-12-25 21:56:43 +03:00
Dean Herbert	a47e5aeead	Fix sample lookup not working correctly for custom rulesets	2019-12-26 00:51:44 +09:00
Dean Herbert	9b0af901ef	Merge branch 'master' into remove-legacy-id	2019-12-25 21:25:33 +09:00
Dan Balasescu	9702cc9809	Merge branch 'master' into remove-legacy-id	2019-12-25 21:01:12 +09:00
Dean Herbert	41d99df73c	Merge branch 'master' into allow-ctrl-tabbing-on-more-tab-controls	2019-12-25 20:49:45 +09:00
Dean Herbert	1b1c255394	Make the Easy mod's extra life count customizable (#7331) ... Make the Easy mod's extra life count customizable	2019-12-25 20:19:08 +09:00
Dean Herbert	504a55e803	Merge branch 'master' into better-beatmap-conversion	2019-12-25 19:52:06 +09:00
Dean Herbert	4e419cabdc	Merge branch 'master' into update-framework	2019-12-25 19:32:17 +09:00
Dean Herbert	81c330ec26	Update framework	2019-12-25 18:51:44 +09:00
Dan Balasescu	38219255c7	Merge branch 'master' into settings-source-value-changed	2019-12-25 18:03:36 +09:00
Dan Balasescu	a265a0c7c5	Merge branch 'master' into settings-source-value-changed	2019-12-25 17:23:08 +09:00
Dean Herbert	d84b319a3a	Merge remote-tracking branch 'upstream/master' into adjustable-map-settings	2019-12-25 15:20:17 +09:00
Dean Herbert	911dc2d98d	Fix code inspections	2019-12-25 15:20:10 +09:00
Dean Herbert	52ba0cd816	Rename method to be more appropriate ... Also adds xmldoc.	2019-12-25 15:20:04 +09:00
Dean Herbert	783159f7a0	Remove redundant logic	2019-12-25 14:55:22 +09:00
Dean Herbert	145ac8e0b5	Remove redundant setter	2019-12-25 14:55:05 +09:00
Dean Herbert	f84d98223f	Merge branch 'master' into fallback-to-skin-combo-colours	2019-12-25 14:38:09 +09:00
Dean Herbert	e019ea408a	Merge branch 'master' into adjustable-map-settings	2019-12-25 13:16:47 +09:00
Dean Herbert	89886ceb79	Fix incorrect dialog button animating on requesting quit twice (#7325) ... Fix incorrect dialog button animating on requesting quit twice	2019-12-25 13:15:30 +09:00
Joseph Madamba	2a5f661408	Merge branch 'master' into allow-ctrl-tabbing-on-more-tab-controls	2019-12-24 08:29:56 -08:00
Dean Herbert	bc75bd34f6	Fix caret width having changed	2019-12-24 18:23:09 +09:00
Lucas A	e3753ae29f	Make the easy mod's extra life count customizable	2019-12-24 10:13:12 +01:00
Dean Herbert	e088a85662	Update framework	2019-12-24 17:12:12 +09:00
smoogipoo	00546787c8	Remove unused method	2019-12-24 16:52:49 +09:00