10884 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	ddf49c2e65	Fix intro not being replaced by a playable song when entering song select	2018-02-16 10:45:15 +09: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
Dan Balasescu	c5b71d2cb7	Remove unused using	2018-02-14 23:15:34 +09:00
Dan Balasescu	9f7736fab3	Merge branch 'master' into restore-ruleset-tests	2018-02-14 22:48:29 +09:00
Dean Herbert	22192c4569	Merge pull request #2066 from ppy/osu/update-framework ... Update framework with GameThread fixes	2018-02-14 17:55:14 +09:00
smoogipoo	115484741d	Capture -> Select	2018-02-14 17:54:43 +09:00
smoogipoo	a9d14eadac	Add clearSelection method	2018-02-14 17:53:04 +09:00
smoogipoo	20de3c421a	Update framework	2018-02-14 17:43:45 +09:00
smoogipoo	27c6f4ee83	Update framework	2018-02-14 14:41:06 +09:00
smoogipoo	344da5965c	Add a CaptureBox that encloses hitobjects from the drag selection	2018-02-14 14:38:37 +09:00
smoogipoo	fcbeb97a54	Merge remote-tracking branch 'origin/master' into editor-hitobject-movement	2018-02-14 14:08:36 +09:00
Dan Balasescu	44c9d14142	Merge pull request #2064 from peppy/drag-lenience ... Fix drag handling in line with framework changes	2018-02-13 22:19:20 +09:00
smoogipoo	bf6c93e77e	Update framework	2018-02-13 21:50:46 +09:00
smoogipoo	bfb21d3d69	Merge remote-tracking branch 'origin/master' into drag-lenience	2018-02-13 21:39:28 +09:00
Dean Herbert	32d45ccdb4	Merge pull request #2044 from UselessToucan/PlayerResumeHotfix ... Fix pressing escape quickly unexpectedly exiting gameplay	2018-02-13 20:51:19 +09:00
Dean Herbert	30581d03d2	Merge branch 'master' into PlayerResumeHotfix	2018-02-13 20:34:22 +09:00
Dean Herbert	d8224809e6	Merge pull request #2049 from sunghwan2789/default-approachrate ... Fix ApproachRate not inheriting OverallDifficulty when it is undefined	2018-02-13 20:34:02 +09:00
Dean Herbert	86acc84988	Apply formatting	2018-02-13 20:23:51 +09:00
Dean Herbert	5ecb77fda7	Merge remote-tracking branch 'upstream/master' into default-approachrate	2018-02-13 20:23:01 +09:00
Dean Herbert	6f29cd35af	Merge branch 'master' into PlayerResumeHotfix	2018-02-13 20:21:45 +09:00
Dean Herbert	f4ddc0717b	Fix incorrect PlaylistItem drag handling	2018-02-13 20:08:59 +09:00
Dean Herbert	e2d11af4ef	Fix incorrect MusicController drag handling	2018-02-13 20:08:59 +09:00
Dean Herbert	58f20c3723	Merge branch 'master' into editor-hitobject-movement	2018-02-13 18:56:16 +09:00
Dan Balasescu	110cd02e20	Merge pull request #2054 from peppy/beatmap-import-simplification ... Improvments to EF context handling and BeatmapManager	2018-02-13 18:51:51 +09:00
Dan Balasescu	8e9deb53fa	Merge branch 'master' into beatmap-import-simplification	2018-02-13 18:38:45 +09:00
Dan Balasescu	7bf5b837bc	Merge pull request #2057 from Aergwyn/fade-slider-ticks ... Fade slider ticks with hidden mod	2018-02-13 18:14:43 +09:00