8092 Commits

Author	SHA1	Message	Date
smoogipoo	55a5dfa9b6	Add column testcase	2018-06-07 20:24:33 +09:00
Dean Herbert	475fb06559	Use new bind method	2018-06-07 16:46:54 +09:00
Dean Herbert	e6158bc348	Merge remote-tracking branch 'upstream/master' into disallow-beatmap-change	2018-06-07 16:35:07 +09:00
Dan Balasescu	ef287eaa7f	Merge branch 'master' into fix-menu-notifications	2018-06-07 15:35:30 +09:00
Dean Herbert	f3c9049660	Merge branch 'master' into disallow-beatmap-change	2018-06-07 15:34:19 +09:00
smoogipoo	d516a0a05c	Store platform offset clock in variable for visibility	2018-06-07 13:42:31 +09:00
smoogipoo	3745f9000b	Merge remote-tracking branch 'origin/master' into remove-decoder-offset	2018-06-07 13:37:19 +09:00
Dean Herbert	f491a18d40	Fix notifications not showing at main osu! logo on menu	2018-06-07 01:49:34 +09:00
Dean Herbert	621be3bbfc	Merge branch 'master' into disallow-beatmap-change	2018-06-07 00:38:40 +09:00
Dan Balasescu	b59c45ca57	Merge branch 'master' into fix-database-migration-failure	2018-06-06 22:44:35 +09:00
Dean Herbert	ee6f107f08	Merge remote-tracking branch 'upstream/master' into peppy-fix-import-path-failures	2018-06-06 22:12:10 +09:00
Dean Herbert	a60c888ae5	Add comment about reasoning for local context variable	2018-06-06 22:05:25 +09:00
Dean Herbert	00b4a2519f	Update framework	2018-06-06 21:22:22 +09:00
Dean Herbert	ea1336d243	Merge remote-tracking branch 'upstream/master' into nuget-consumption	2018-06-06 21:09:51 +09:00
Dean Herbert	70478e2216	Merge remote-tracking branch 'upstream/master' into fix-import-path-failures	2018-06-06 20:55:51 +09:00
Dean Herbert	c756a89daf	Standardise path	2018-06-06 20:55:42 +09:00
smoogipoo	18fc63bac2	Add back removed using	2018-06-06 20:32:37 +09:00
Dan Balasescu	c30861186b	Merge branch 'master' into disallow-beatmap-change	2018-06-06 20:26:17 +09:00
smoogipoo	ebcfe97ccf	Expose Dependencies from base OsuTestCase	2018-06-06 20:25:40 +09:00
smoogipoo	f2ac5b8b2d	CreatePlayer shouldn't receive a beatmap	2018-06-06 20:21:47 +09:00
smoogipoo	e77084bec4	Give OsuScreen a mutable BindableBeatmap	2018-06-06 20:19:53 +09:00
smoogipoo	ff60f69f47	Explicitly construct local beatmaps rather than using GetBoundCopy	2018-06-06 20:19:30 +09:00
smoogipoo	72cc53aded	Rename GameBeatmap -> BindableBeatmap	2018-06-06 20:16:20 +09:00
Dean Herbert	a645a109be	Merge branch 'master' into overlay-activation	2018-06-06 19:18:28 +09:00
Dean Herbert	0a97b8ae25	Implement DebugUtils locally ... Has been removed from framework	2018-06-06 18:33:10 +09:00
smoogipoo	4086ff7313	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change ... # Conflicts: # osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs # osu.Game/Screens/Menu/Intro.cs # osu.Game/Screens/Menu/MenuSideFlashes.cs	2018-06-06 18:26:51 +09:00
Dean Herbert	5a4408e359	Merge remote-tracking branch 'upstream/master' into nuget-consumption	2018-06-06 18:22:22 +09:00
Dean Herbert	9306fec498	Fix missing null checks	2018-06-06 18:21:03 +09:00
Aergwyn	aaaa8a3b7c	match Bindable names	2018-06-06 09:55:16 +02:00
Dean Herbert	55921efffb	Rewrite much state logic	2018-06-06 16:17:51 +09:00
Dean Herbert	9e25e02696	Ensure notifications don't appear during UserTriggered mode ... Closes #2640.	2018-06-06 15:50:24 +09:00
Dean Herbert	d1fd09ed47	Rename variables	2018-06-06 15:49:27 +09:00
Dean Herbert	86be1bef6b	Use UserTriggered in Player	2018-06-06 15:10:15 +09:00
Dean Herbert	d3cd267036	Formatting fixes	2018-06-06 14:20:51 +09:00
Dean Herbert	a5679f7bf5	Improve readability of code	2018-06-06 14:04:20 +09:00
Dean Herbert	1dd5bdcf72	Move setting to new "mods" section	2018-06-06 12:32:59 +09:00
Dean Herbert	ee92986494	Merge branch 'master' into osu-hd-setting	2018-06-06 12:09:12 +09:00
Dean Herbert	6be382aab6	Merge branch 'master' into overlay-activation	2018-06-06 10:07:22 +09:00
Dean Herbert	26569b434c	Merge branch 'master' into fix-replay-updates	2018-06-06 09:40:46 +09:00
Dean Herbert	d2633a706d	Merge branch 'master' into score-component-tooltips	2018-06-06 09:06:22 +09:00
Dean Herbert	00c8d2ff11	Merge branch 'master' into source-link-colour	2018-06-06 08:27:28 +09:00
Dean Herbert	601ef3b6f7	Consume osu.Framework via nuget	2018-06-05 14:14:56 +09:00
Dean Herbert	3b03a25ea5	Fix beatmaps with subfolders importing incorrectly on windows ... Closes #2718.	2018-06-05 11:36:44 +09:00
Dan Balasescu	b2cc7b9a5c	Merge branch 'master' into fix-beatmap-info-wedge-async	2018-06-04 20:29:29 +09:00
Dan Balasescu	566470e852	Merge branch 'master' into better-loading-logo	2018-06-04 20:06:22 +09:00
Dan Balasescu	5d45664669	Merge branch 'master' into handle-web-request-failures	2018-06-04 19:49:12 +09:00
Dan Balasescu	f9b6de67b8	Merge branch 'master' into hide-flash-gap	2018-06-04 19:29:10 +09:00
Thomas Müller	88b23d4e66	Merge branch 'master' into netcoreapp2.1	2018-06-04 05:30:25 +02:00
Dean Herbert	7701cac297	Merge branch 'master' into overlay-activation	2018-06-04 11:37:14 +09:00
Dan Balasescu	0f7b23d765	Add param explanatory blurb to xmldoc	2018-06-04 11:11:07 +09:00