27705 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Bartłomiej Dach	8952eb2a01	Merge branch 'master' into correct-trail-animation-frame	2020-03-15 15:24:26 +01:00
Dean Herbert	340d362d69	Appease inspectcode	2020-03-15 03:51:30 +09:00
Dean Herbert	12b7727af6	Update framework	2020-03-15 03:25:01 +09:00
Dean Herbert	4e8e222996	Merge branch 'master' into fix-carousel-scroll-while-import	2020-03-15 03:24:19 +09:00
Dean Herbert	b9cdb317c5	Merge pull request #8259 from peppy/torus ... Switch game to use new font (Torus)	2020-03-15 03:21:22 +09:00
Dan Balasescu	d4f5d67efc	Merge branch 'master' into torus	2020-03-15 02:34:22 +09:00
Dean Herbert	1a6056637b	Turn off italics test for now (may come back if we switch chat to content font)	2020-03-15 01:43:48 +09:00
Dean Herbert	0b788065b4	Update resources package	2020-03-15 01:00:25 +09:00
Dean Herbert	cd604785a8	Ignore italics specification for now	2020-03-15 00:38:27 +09:00
Dan Balasescu	ec9b499354	Merge pull request #8262 from peppy/tournament-resolution-selector ... Add resolution selector in tournament setup screen	2020-03-15 00:38:00 +09:00
Dean Herbert	62ce503126	Fix changelog alignment and italics usage	2020-03-15 00:36:21 +09:00
Dan Balasescu	70a17ae6cc	Merge branch 'master' into tournament-resolution-selector	2020-03-15 00:15:31 +09:00
Dean Herbert	735396c6d6	Merge branch 'master' into torus	2020-03-14 23:40:55 +09:00
Dean Herbert	08d72d1a5c	Merge pull request #8267 from EVAST9919/follow-circle-fix ... Fix osu! slider ball tint colour being applied to follow circle	2020-03-14 23:22:29 +09:00
Andrei Zavatski	c271d17557	Remove useless field	2020-03-14 14:07:52 +03:00
Andrei Zavatski	74c9d5fc93	Use AccentColour	2020-03-14 13:45:55 +03:00
Dean Herbert	d3f23b766e	Move across to new file in line with master	2020-03-14 17:06:23 +09:00
Dean Herbert	9ea0e83f3d	Merge branch 'master' into correct-trail-animation-frame	2020-03-14 16:57:35 +09:00
Dean Herbert	45dfb22bd5	Centralise additive texture creation	2020-03-14 16:39:44 +09:00
Dean Herbert	cd0f1c98ba	Update framework	2020-03-14 16:17:14 +09:00
Dean Herbert	63b4fa0d56	Merge branch 'master' into correct-trail-animation-frame	2020-03-14 16:12:52 +09:00
Dean Herbert	d5f15e62fa	Merge pull request #8257 from peppy/catcher-area-file-cleanup ... Split out CatcherArea nested classes and reorder methods	2020-03-14 16:06:28 +09:00
Dean Herbert	1523c4c63f	Merge branch 'master' into catcher-area-file-cleanup	2020-03-14 15:41:26 +09:00
Dean Herbert	202c8cdad8	Add braces to satisfy codefactor	2020-03-14 15:35:59 +09:00
Dean Herbert	fcbf83cd74	Merge pull request #8217 from smoogipoo/limit-max-slider-length ... Add more sane limit for maximum slider length	2020-03-14 15:08:39 +09:00
Dean Herbert	17b0b3df35	Merge pull request #8256 from smoogipoo/expose-catcher-width ... Expose half catcher width to movement skill	2020-03-14 15:07:49 +09:00
TheWildTree	38d00c7f0a	Revert unnecessary changes and actually trim the whitespace	2020-03-13 21:29:10 +01:00
TheWildTree	8d3cab0e16	Trim whitespace	2020-03-13 18:58:32 +01:00
TheWildTree	0bbae094dd	Add active tab closing behaviour tests	2020-03-13 18:34:51 +01:00
TheWildTree	694e56b0d1	Add non-PM chat tabs to tests	2020-03-13 18:34:51 +01:00
TheWildTree	8991e88039	Fix active tab closing behaviour	2020-03-13 18:34:51 +01:00
TheWildTree	097bd37e37	Fix SelectorTab crashing tests after a reload ... For some reason, the default channel type (Public) caused the channel manager to attempt to connect to an API, which was null at that time, after hot reloading the test environment (via dynamic compilation). Changing the channel type seems to fix that.	2020-03-13 18:34:51 +01:00
Andrei Zavatski	7e9d28b1b1	Fix slider ball colour affects follow circle	2020-03-13 13:42:33 +03:00
Dan Balasescu	481e4ed66f	Merge branch 'master' into catcher-area-file-cleanup	2020-03-13 18:55:34 +09:00
Dean Herbert	70427a19c1	Merge pull request #8261 from peppy/fix-mod-sprite-bleed ... Fix mod sprite bleeding border colour	2020-03-13 16:58:20 +09:00
Dean Herbert	bee855bd1d	Remove using	2020-03-13 15:54:46 +09:00
Dean Herbert	b902e50396	Add resolution selector in tournament setup screen	2020-03-13 15:44:23 +09:00
voidedWarranties	c27751050b	Switch back to strings and update setting labels	2020-03-12 23:29:11 -07:00
Dean Herbert	edd444ea73	Fix mod sprite bleeding border colour	2020-03-13 14:36:46 +09:00
Dean Herbert	30ad580993	Fix map pool screen vertical layout	2020-03-13 14:34:33 +09:00
smoogipoo	c33ca6e99c	Decorate usages with exception management	2020-03-13 14:28:11 +09:00
Dean Herbert	00d7dc19cc	Update tests and logic	2020-03-13 14:25:58 +09:00
Dean Herbert	fbb7e9f12a	Add tests (wip)	2020-03-13 14:25:58 +09:00
Dean Herbert	ef0acde458	Adjust to allow for extra row	2020-03-13 14:25:58 +09:00
smoogipoo	f7c036726a	Add beatmap loading timeout	2020-03-13 13:52:40 +09:00
Dean Herbert	c45f9cafd4	Add medium -> regular fallback for torus	2020-03-13 13:43:48 +09:00
Dean Herbert	288470c313	Remove exo specification completely	2020-03-13 13:43:48 +09:00
Dean Herbert	ae112cf14f	Reorder torus loading to provide regular as default	2020-03-13 13:43:48 +09:00
Dean Herbert	4a774d02e0	Remove exo font loading	2020-03-13 13:43:37 +09:00
Dean Herbert	1733519c3a	Split out CatcherArea nested classes and reorder methods	2020-03-13 12:59:30 +09:00