8232 Commits

Author	SHA1	Message	Date
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
Dean Herbert	2e23da1dfa	Merge branch 'master' into beatmap-set-downloader	2018-06-06 20:32:58 +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
smoogipoo	83ff47ec80	Rewrite difficulty mod combinations	2018-06-06 16:20:17 +09: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
DrabWeb	7819be7957	Remove unused using.	2018-06-06 03:28:07 -03:00
DrabWeb	188272e15d	Replace OnAlreadyDownloading with returning a bool from Download.	2018-06-06 03:18:42 -03:00
DrabWeb	df4c855aa2	Manage subtitle inside of DownloadButton.	2018-06-06 03:13:37 -03:00
Dean Herbert	86be1bef6b	Use UserTriggered in Player	2018-06-06 15:10:15 +09:00
Dean Herbert	3567823759	Reverse order of exposed objects in HitObjectContainer ... Closes #2740.	2018-06-06 15:03:47 +09:00
Dean Herbert	d3cd267036	Formatting fixes	2018-06-06 14:20:51 +09:00
smoogipoo	e19ca0c120	Add nomod mod type	2018-06-06 14:08:02 +09:00
smoogipoo	8274623ad6	Cleanup multi mod constructions	2018-06-06 14:07:50 +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
DrabWeb	80951eae68	Inherit BeatmapSetDownloader from Component.	2018-06-05 18:09:26 -03: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
DrabWeb	4cf7a64636	Remove unused parameter.	2018-06-04 22:26:52 -03:00
DrabWeb	d8154f8cad	Fix BeatmapSetInfos with OnlineBeatmapSetID set to null being marked as downloaded.	2018-06-04 21:11:27 -03:00
DrabWeb	61e1358410	Add OnAlreadyDownloading animations.	2018-06-04 21:07:17 -03:00
DrabWeb	c524289b24	Update DirectListPanel to properly handle hiding DownloadButton.	2018-06-04 21:01:15 -03:00
DrabWeb	01c5060bcf	Move BeatmapSetDownloader to osu.Game.Beatmaps.Drawables	2018-06-04 20:30:54 -03:00
DrabWeb	9377ffb784	Update BeatmapSetOverlay to use BeatmapSetDownloader.	2018-06-04 20:27:34 -03:00
DrabWeb	698a42f145	BeatmapSetDownloadButton -> BeatmapSetDownloader ... Allows it to integrate better with existing buttons, like HeaderButton.	2018-06-04 20:12:43 -03: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
DrabWeb	4bdc1fb781	Remove unused using.	2018-06-04 07:10:33 -03:00
DrabWeb	416384956d	Use a protected Downloaded bindable instead of abstract methods.	2018-06-04 06:47:39 -03:00
DrabWeb	7eeba2cf9a	Unsubscribe from BeatmapManager events in Dispose.	2018-06-04 06:34:48 -03:00
DrabWeb	b332c22fe5	Update DirectPanel to use BeatmapSetDownloadButton.	2018-06-04 06:29:35 -03:00
DrabWeb	7b7236929a	Add BeatmapSetDownloadButton.	2018-06-04 06:08:39 -03: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
Dean Herbert	4b604bf055	Merge branch 'master' into disallow-beatmap-change	2018-06-04 10:53:04 +09:00
DrabWeb	a7bab14b30	Add tooltip to ScoreComponentLabel.	2018-06-03 22:26:30 -03:00
DrabWeb	db4c26e1ab	Rewrite ScoreComponentLabel.	2018-06-03 22:22:44 -03:00
Joehu	bd7c9cd8bf	Set 'Colour' when creating 'textFlow'	2018-06-03 17:41:34 -07:00
Dean Herbert	7ca437aa8e	Merge branch 'master' into fix-expand-button-colour	2018-06-04 02:16:27 +09:00
Dean Herbert	3a823d6c25	Fix multiple issues causing database reset to fail	2018-06-04 02:12:16 +09:00
Joehu	7101533926	Remove 'description' field	2018-06-03 08:02:57 -07:00
Joehu	5c713ac2ab	Use default colour in MetadataSection	2018-06-03 07:51:57 -07:00
Dean Herbert	3795a55808	Fix menu flashes not extending to the edge of screen during parallax	2018-06-03 22:26:47 +09:00
Aergwyn	2afe0feb24	remove white space ... I think	2018-06-03 12:02:43 +02:00
Aergwyn	f0095193b3	Merge branch 'master' into overlay-activation	2018-06-03 11:52:33 +02:00
Aergwyn	707af02097	apply feedback ... -don't directly set AllowOverlay Bindable this should be done specifically where needed -remove AllowOverlay Bindable from ButtonSystem -remove unnecessary xmldoc	2018-06-03 11:31:04 +02:00
Dean Herbert	645f6efce7	Fix web request failures not being correctly handled at an APIRequest level	2018-06-03 13:01:52 +09:00
smoogipoo	2ccffb9ac4	Add difficulty calculation mod types	2018-06-03 10:59:56 +09:00
Joehu	0f13acf67e	Use updateExpanded method	2018-06-02 12:52:31 -07:00
Joehu	dc2a004c87	Remove link colours for all unlinked text	2018-06-02 12:04:58 -07:00
Dean Herbert	652e2ccaf5	Merge branch 'master' into netcoreapp2.1	2018-06-03 03:55:33 +09:00
Dean Herbert	64eda27547	Update framework	2018-06-03 03:05:53 +09:00
Dean Herbert	eb135b2e85	Merge branch 'master' into participant-count-default	2018-06-03 03:05:17 +09:00
Dean Herbert	88628812c6	Logexceptions when loading ruleset DLLs	2018-06-03 00:28:29 +09:00
FreezyLemon	a0c643fae5	Fix SongProgressInfo timespan formatting	2018-06-02 11:25:49 +02:00
Joehu	8d3de3affb	Use '?:' expression instead	2018-06-01 15:58:05 -07:00
Joehu	5d1421c0e9	Fix visual settings expand button colour	2018-06-01 15:31:25 -07:00
DrabWeb	cc32adf51f	Move max text updating into updateMax.	2018-06-01 14:28:24 -03:00
Dean Herbert	9b7741b353	Avoid using update for fading logic	2018-06-01 22:19:11 +09:00
Dean Herbert	ae6f603d16	Merge branch 'master' into match-panel-with-web	2018-06-01 21:31:18 +09:00
Dean Herbert	5c2a2e394e	Fix incorrect async logic in BeatmapInfoWedge ... Closes #2653. Alternative to #2657.	2018-06-01 20:31:29 +09:00
DrabWeb	59762c0393	Change Room.Participants to an IEnumerable.	2018-06-01 06:15:23 -03:00
DrabWeb	8dd36ee1a9	Default Max to null in ParticipantCount.	2018-06-01 06:08:57 -03:00
Dean Herbert	b9c601074d	Formatting fixes	2018-06-01 15:45:09 +09:00
Dean Herbert	c5a3eff182	Merge branch 'master' into multiplayer-logic-encapsulation	2018-06-01 15:31:19 +09:00
Dean Herbert	8bde1fd327	Merge branch 'master' into updateable-beatmap-set-cover	2018-06-01 15:20:59 +09:00
Joehu	729f2ec725	Match authorinfo with web	2018-05-31 14:34:47 -07:00
Joehu	b4d621a2cb	Add link colour to beatmap source	2018-05-31 10:21:22 -07:00
Joehu	1095669a55	Match panel with web	2018-05-31 08:09:19 -07:00
Dean Herbert	b68a5f5eab	Tidy up Loader logic	2018-05-31 20:07:44 +09:00
smoogipoo	4eb7a34944	Always update children when ruleset input manager is updated	2018-05-31 18:02:10 +09:00
DrabWeb	6781b81336	Cleanup.	2018-05-31 05:48:42 -03:00
Dean Herbert	42bc6b6b2e	Merge branch 'master' into updateable-beatmap-set-cover	2018-05-31 17:33:31 +09:00
Dean Herbert	dfbcf4d7b7	Add tests	2018-05-31 17:29:59 +09:00
Dean Herbert	7487c82ec1	Stop the logo from beating	2018-05-31 17:14:47 +09:00
Dean Herbert	c161d82474	Reduce the length of the fadeout animation	2018-05-31 17:14:04 +09:00
Dean Herbert	9df173b339	Merge branch 'master' into better-loading-logo	2018-05-31 15:59:04 +09:00
Dan Balasescu	29f3011f75	Merge branch 'master' into fix-osu-logo-discrepancies	2018-05-31 15:21:44 +09:00
smoogipoo	e48b17fb0d	Unindent	2018-05-31 15:17:59 +09:00
smoogipoo	4ff803d11d	Merge remote-tracking branch 'origin/master' into fix-osu-logo-discrepancies	2018-05-31 14:47:47 +09:00
Dan Balasescu	76567ae98b	Merge branch 'master' into song-selet-enumerable	2018-05-31 14:42:58 +09:00
Dan Balasescu	cd3ca68f03	Merge branch 'master' into song-selet-enumerable	2018-05-31 14:38:04 +09:00
Dan Balasescu	35d8ec8df6	Merge branch 'master' into fix-player-life-management	2018-05-31 14:34:31 +09:00
smoogipoo	9da7bfd615	Merge remote-tracking branch 'origin/master' into fix-beatmap-import-conflicts ... # Conflicts: # osu.Game/Database/ArchiveModelManager.cs	2018-05-31 14:02:52 +09:00
Dan Balasescu	a9db479b27	Merge branch 'master' into import-fixes	2018-05-31 13:49:12 +09:00
Dean Herbert	0f6c623ebb	Tidy up some unnecessary lines	2018-05-31 12:44:59 +09:00
Dean Herbert	205aa1a3cd	Fetch colour from OsuColour palette	2018-05-31 12:44:11 +09:00
Dean Herbert	319faf12f7	Fix incorrect naming of label	2018-05-31 12:39:56 +09:00
Dean Herbert	2f21b9c4ea	Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits	2018-05-31 12:36:37 +09:00
DrabWeb	ff93a54a64	Default Type to Title, use ToLower for the screen type title.	2018-05-30 23:16:54 -03:00
Dean Herbert	74c52e0a7c	Merge branch 'master' into multiplayer-screen-type	2018-05-31 00:16:43 +09:00
Dean Herbert	9ea6ab28ea	Fix intro potentially starting out-of-sync due to logo's outward animation	2018-05-30 20:22:31 +09:00
Dean Herbert	9497db0b0b	Add a delay before the loading logo is displayed	2018-05-30 20:22:26 +09:00
Dean Herbert	0caf15166e	Remove unnecessary FinishTransforms	2018-05-30 20:05:31 +09:00
Dean Herbert	0dafcf00b7	Fix some discrepancies with the main menu logo transitions	2018-05-30 19:50:00 +09:00
Dean Herbert	6d6b186fb2	Fix delayed logo animations playing even if screen has already been exited	2018-05-30 19:25:39 +09:00
Dean Herbert	a28e71995d	Offload database query to task ... Allows song select to load a touch faster, in theory.	2018-05-30 16:15:57 +09:00
Dean Herbert	5872b61988	Fix potential double-disposal of player if PlayerLoader is finalised	2018-05-30 15:48:26 +09:00
Dean Herbert	54e53f7190	Fix player getting loaded when exiting song select	2018-05-30 15:48:20 +09:00
Dean Herbert	6000a90721	Merge branch 'master' into overlay-activation	2018-05-30 13:59:20 +09:00
Dean Herbert	eb89317494	Remove performance optimisation tracking disables to keep things simple for now	2018-05-30 13:43:43 +09:00
Dean Herbert	4a7de043e0	Recycle all contexts on beginning a write operation for the time being	2018-05-30 13:43:25 +09:00
Dean Herbert	e23e2bd348	Fix recycling never being performed due to incorrect ordering	2018-05-30 13:37:52 +09:00
Dean Herbert	31ab6f2408	Fix event flushing sticking on early return	2018-05-29 19:43:52 +09:00
Dean Herbert	4a18951cce	Report full error to log file	2018-05-29 18:37:45 +09:00
Dean Herbert	0adc16f9bd	Handle online ID mismatches and clashes on beatmap import	2018-05-29 16:26:50 +09:00
Dean Herbert	47d88a48a2	Add logging on import processes	2018-05-29 16:26:42 +09:00
Dean Herbert	de8c4e6d56	Remove unique constraints on hash columns ... We are going to allow multiple instances of the same beatmap info hash as they could be in different beatmap sets.	2018-05-29 16:26:32 +09:00
Dean Herbert	c1f416b1cc	Add back missing rethrow	2018-05-29 16:23:38 +09:00
Dean Herbert	3d3026a80c	Report any error during import to the write context to allow for rollback	2018-05-29 16:23:38 +09:00
Dean Herbert	72da640059	Change order of event firing in Update calls ... A remove event should not be fired before the update is successful.	2018-05-29 16:23:38 +09:00
Dean Herbert	80806be047	Don't start transactions for migration ... It looks like transactions are used internally during migration.	2018-05-29 16:23:38 +09:00
Dean Herbert	a3287b8cf2	Correctly rollback failed imports	2018-05-29 16:23:38 +09:00
DrabWeb	7b8211e6db	Add MultiplayerScreen.Type	2018-05-29 04:23:29 -03:00
Dean Herbert	bcb04f6168	Improve transaction handling flexibility	2018-05-29 16:23:27 +09:00
Dean Herbert	d4e7f08c20	Bring entity framework up-to-date and re-enable transactions	2018-05-29 16:23:27 +09:00
Dean Herbert	2a87b851fa	Add proper transaction rollback logic on exception	2018-05-29 16:23:27 +09:00
DrabWeb	d090323c00	Add ParticipantCount to share with the Match screen.	2018-05-29 00:51:56 -03:00
DrabWeb	852d7ef48d	Use ?: expression instead of if/else.	2018-05-29 00:07:33 -03:00
DrabWeb	7beac3a712	Cleanup DrawableRoom.	2018-05-28 23:56:00 -03:00