18780 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	491c9e96e0	Fix tests not ending execution after some exceptions	2019-06-03 16:42:27 +09:00
Dean Herbert	171fc14776	Fix editor regressions	2019-06-03 16:34:09 +09:00
Welsar55	fa331fbee1	Merge branch 'master' of https://github.com/ppy/osu	2019-06-03 01:23:25 -05:00
Nathan Alo	78f8157e2b	Merge pull request #6 from ppy/master ... Sync fork up to date	2019-06-03 13:41:31 +08:00
Dean Herbert	cf9bc831ab	Merge branch 'master' into osu-clickable-container	2019-06-03 13:55:08 +09:00
Dean Herbert	3ef17a54f6	Fix sizing of OsuAnimatedButton and OsuClickableContainer ... Was incorrect under some combinations of relative and autosize usage.	2019-06-03 13:53:24 +09:00
Dean Herbert	dff7053a07	Merge branch 'master' into more_button_update	2019-06-03 11:48:05 +09:00
Dean Herbert	1c96e7593a	Prevent logo idle state from being updated incorrectly (#4882) ... Prevent logo idle state from being updated incorrectly Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-05-31 19:04:15 +09:00
Dean Herbert	32a2aba631	Merge branch 'master' into logo-idle	2019-05-31 18:50:28 +09:00
Dean Herbert	e017350b80	Changelog overlay (#3074) ... Changelog overlay	2019-05-31 15:08:08 +09:00
Dean Herbert	b20ea93906	Merge branch 'master' into audio-refactor-update	2019-05-31 14:58:53 +09:00
Dean Herbert	7bed4eb23b	Tidy up WaveformTestBeatmap	2019-05-31 14:57:11 +09:00
Dean Herbert	b52276c489	Pass individual components to DummyWorkingBeatmap, not game	2019-05-31 14:51:12 +09:00
Dean Herbert	f33a5bc54c	Centralise and update WorkingBeatmap creation in test cases	2019-05-31 14:40:53 +09:00
Dean Herbert	80d65f9a3b	Update resource stores with GetAvailableResources	2019-05-31 14:33:18 +09:00
Dean Herbert	1629534a0c	More disposal?	2019-05-31 14:28:53 +09:00
David Zhao	465aa4e0f6	Prevent idle state from being updated incorrectly	2019-05-31 14:06:18 +09:00
smoogipoo	d7ccf939d8	General refactoring	2019-05-31 13:54:40 +09:00
smoogipoo	e7ae9c249f	Fix size of release stream separator in listing	2019-05-31 13:53:55 +09:00
smoogipoo	57d648df6d	Add comment + fix spinlocking	2019-05-31 13:38:48 +09:00
smoogipoo	4dc77d64a3	Fix overlay group + depth	2019-05-31 13:23:50 +09:00
smoogipoo	f780c80c17	Fix bar not expanding/collapsing correctly	2019-05-31 13:08:35 +09:00
smoogipoo	c211f1d0fe	Merge remote-tracking branch 'Joehuu/master' into changelog-overlay	2019-05-31 12:28:28 +09:00
EVAST9919	cfa0ef6fd9	convert field to a local variable	2019-05-30 23:22:08 +03:00
EVAST9919	fe9e53e383	Add a testcase	2019-05-30 23:07:04 +03:00
EVAST9919	2933169614	Move the button into a separate class	2019-05-30 22:55:59 +03:00
EVAST9919	73fb28f9f7	Make the button inherit from OsuHoverContainer	2019-05-30 22:48:27 +03:00
EVAST9919	877fe97107	Merge remote-tracking branch 'refs/remotes/ppy/master' into more_button_update	2019-05-30 22:17:22 +03:00
Dean Herbert	dc36b81cee	Update Kudosu section inline with the web version (#4880) ... Update Kudosu section inline with the web version Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-05-30 17:33:47 +09:00
Dean Herbert	c950f37497	Ad missing link	2019-05-30 16:57:54 +09:00
Dean Herbert	e5999dd9b1	Update font sizes to match web	2019-05-30 16:49:18 +09:00
EVAST9919	9a13c52ffd	Add missing lines	2019-05-29 21:19:03 +03:00
EVAST9919	97dbc95bc6	Kudosu section update	2019-05-29 21:02:20 +03:00
Dean Herbert	a1cc8c448f	Update TrackVirtual consumption	2019-05-29 16:43:27 +09:00
Dean Herbert	08ab1e5df7	Use new ITrackStore interface	2019-05-29 16:43:15 +09:00
EVAST9919	5169e31d54	Fix CI issues	2019-05-28 19:53:00 +03:00
EVAST9919	19fbab6892	Applied suggested changes	2019-05-28 19:39:31 +03:00
Dean Herbert	a20eda7b5f	Fix remaining cases to work without things	2019-05-28 23:54:42 +09:00
EVAST9919	857eb9b83a	Fix CI stuff	2019-05-28 17:21:34 +03:00
EVAST9919	6ca3bd086f	ShowMore button update	2019-05-28 17:04:05 +03:00
Dean Herbert	23b5d30360	Remove csproj changes	2019-05-28 17:10:46 +09:00
Dean Herbert	4ca34bd5e8	Update osu! in line with audio subsystem refactor	2019-05-28 17:06:01 +09:00
Dan Balasescu	2d4ef1bec9	Merge pull request #4861 from peppy/settings-flexibility ... Store databased settings based on string keys rather than ints	2019-05-28 14:23:22 +09:00
Dan Balasescu	5742984c97	Merge branch 'master' into settings-flexibility	2019-05-28 13:35:06 +09:00
Dan Balasescu	1f4957a2da	Merge pull request #4860 from peppy/isolate-checkbox-alpha ... Isolate alpha usage in OsuCheckbox	2019-05-28 13:25:37 +09:00
Dan Balasescu	0d2eef68b2	Merge branch 'master' into settings-flexibility	2019-05-28 13:21:33 +09:00
Dan Balasescu	4852519259	Merge branch 'master' into isolate-checkbox-alpha	2019-05-28 13:12:12 +09:00
Dan Balasescu	7ff1fc1a3e	Merge pull request #4859 from peppy/settings-subpanel ... Consolidate settings subpanel logic	2019-05-28 13:11:20 +09:00
Dean Herbert	31e6a4fa59	Add optional skin foreign key to databased settings	2019-05-27 01:56:19 +09:00
Dean Herbert	127858d398	Store databased settings based on string keys rather than ints ... Allows for rearranging/removal from enums without consequence.	2019-05-27 01:53:49 +09:00