11061 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	fae6ea1ee2	Merge branch 'master' into storyboard-improvements	2018-02-19 17:28:53 +09:00
Dan Balasescu	6cad316d69	Merge pull request #2087 from peppy/fix-replay-import ... Fix replay import	2018-02-19 17:28:26 +09:00
smoogipoo	4898c321f8	Merge branch 'osu-rulesetcontainer-aspect' into editor-hitobject-movement	2018-02-19 17:07:03 +09:00
smoogipoo	b7be162f28	Remove AspectAdjust property (override GetAspectAdjustedSize instead)	2018-02-19 17:05:10 +09:00
smoogipoo	cd2c9a9de6	Adjust xmldoc and rename to GetAspectAdjustedSize	2018-02-19 17:04:18 +09:00
smoogipoo	ef11ce3dd1	Remove Size override from OsuPlayfield	2018-02-19 17:02:27 +09:00
Dean Herbert	d70d40e3b8	Add back forgotten score store to valid importers	2018-02-19 15:52:14 +09:00
Dan Balasescu	34f76a4136	Merge branch 'master' into storyboard-improvements	2018-02-19 15:40:09 +09:00
Dan Balasescu	999d0f99a6	Merge pull request #2070 from peppy/abstract-model-managers ... Abstract away model-filemodel and add mutable stores	2018-02-19 15:25:42 +09:00
Dan Balasescu	80010dd845	Merge branch 'master' into api-interface	2018-02-19 15:24:50 +09:00
Dan Balasescu	5401b0dfcd	Merge branch 'master' into abstract-model-managers	2018-02-19 14:56:21 +09:00
Dean Herbert	7c43a3b4c0	Merge branch 'master' into storyboard-improvements	2018-02-19 14:54:12 +09:00
Dean Herbert	57e61b0b0e	Update xmldoc	2018-02-19 14:50:42 +09:00
Dan Balasescu	8d61f60388	Merge pull request #2074 from peppy/visual-settings-improvements ... Collapse visual settings by default in player	2018-02-19 14:31:08 +09:00
Dean Herbert	8b89735e9e	Improve xmldoc for DatabaseContextFactory.Get	2018-02-19 14:17:41 +09:00
Dean Herbert	a7915e7041	Fix typo	2018-02-19 14:00:48 +09:00
Dean Herbert	e0faf14a3e	Actually consume ReplacesBackground	2018-02-19 12:33:07 +09:00
Dean Herbert	58af66bfc0	Merge branch 'master' into editor-hitobject-movement	2018-02-16 13:59:11 +09:00
Dean Herbert	75dcf72520	Improve testability of API	2018-02-16 13:57:39 +09:00
Dean Herbert	29adedfa96	Collapse visual settings by default in player	2018-02-16 12:47:32 +09:00
Dean Herbert	21b641b302	Give storyboards a BeatmapInfo to reduce weird method calls ... Also removes unnecessary background texture (the actual storyboard background spec wasn't implemented correctly anyway).	2018-02-16 12:09:23 +09:00
Dean Herbert	9760f30ce9	Tidy things up to make more sense	2018-02-16 12:08:36 +09:00
Dean Herbert	f22f9b5de0	Merge branch 'master' into PlayerBase	2018-02-16 11:26:57 +09:00
Dean Herbert	ddf49c2e65	Fix intro not being replaced by a playable song when entering song select	2018-02-16 10:45:15 +09:00
TocoToucan	c57e8785e2	Move all storyboard loading to Player itself	2018-02-15 23:57:53 +03:00
Dean Herbert	9ea7f12f8d	Merge branch 'master' into abstract-model-managers	2018-02-15 20:39:08 +09:00
Dean Herbert	e1f81488cd	Merge pull request #2071 from peppy/fix-textboxes ... Update framework (and fix left/right arrow control of textboxes)	2018-02-15 20:28:33 +09:00
Dean Herbert	96c23d2a62	Add override to fix left/right arrow control	2018-02-15 19:41:15 +09:00
Dean Herbert	e2421ffe31	Update framework	2018-02-15 19:41:03 +09:00
smoogipoo	cbac4de9c2	Expire + dispose CaptureBoxes	2018-02-15 19:11:29 +09:00
smoogipoo	ebcdb62570	Remove now unneeded hide	2018-02-15 19:10:55 +09:00
smoogipoo	9583191556	Dispose SelectionBoxes when they die	2018-02-15 19:08:03 +09:00
smoogipoo	4ac0c48ba6	Add fadein to SelectionBox	2018-02-15 19:07:53 +09:00
smoogipoo	dcbc8c3dcd	Remove animated capture boxes for now	2018-02-15 18:06:33 +09:00
Dean Herbert	fa05822d7d	Add missing licence headers	2018-02-15 16:33:33 +09:00
Dean Herbert	b9ef32b09b	Further xmldoc and restoring of Cleanup method	2018-02-15 16:31:42 +09:00
Dean Herbert	1b13be1372	Cleanups and xmldoc additions	2018-02-15 16:24:14 +09:00
Dean Herbert	8c1d581fb3	Fix hiding beatmaps not refreshing correctly	2018-02-15 16:15:40 +09:00
Dean Herbert	89cf794f98	Add a lower level ConsumableItems implementation	2018-02-15 16:15:40 +09:00
Dean Herbert	671475f3b4	Ensure undeleted items are populated with includes before firing events	2018-02-15 16:15:40 +09:00
Dean Herbert	e51450a064	Fix query construction	2018-02-15 15:24:28 +09:00
Dean Herbert	d07ab1fbea	Fix undelete all	2018-02-15 15:14:55 +09:00
Dean Herbert	fe5df663be	Add more xmldoc	2018-02-15 15:14:46 +09:00
Dean Herbert	a0a65abcac	Crentalise all import logic	2018-02-15 14:22:39 +09:00
Dean Herbert	d3dd31dadb	Make deletion and purging logic even more global	2018-02-15 14:22:39 +09:00
Dean Herbert	d340509b1d	Move ArchiveReaders to a more global namespace ... Also moves delete and action logic to a shared implementation	2018-02-15 14:22:39 +09:00
Dean Herbert	6ff63c2f0c	Move deletion to ArchiveModelImportManager	2018-02-15 14:22:39 +09:00
Dean Herbert	d8f84fcca3	Give ArchiveReader a filename	2018-02-15 14:22:39 +09:00
Dean Herbert	e0d28564d0	Move import logic to shared implementation	2018-02-15 14:22:39 +09:00
Dean Herbert	af61a524b5	Merge pull request #2034 from smoogipoo/restore-ruleset-tests ... Restore nunit ruleset + waveform test cases	2018-02-15 00:12:39 +09:00