778 Commits

Author	SHA1	Message	Date
Dean Herbert	d229fbba6e	Merge branch 'master' into present-recommended	2020-12-22 13:52:29 +09:00
Lucas A	4fba0c8e6a	Remove not used using statement.	2020-12-19 10:55:39 +01:00
Lucas A	a397db4f15	Resolve merge conflicts	2020-12-19 10:55:18 +01:00
Dean Herbert	206bf3713e	Make IAPIProvider read-only bindables into IBindables	2020-12-18 15:16:36 +09:00
Lucas A	5d7294451f	Refactor Import() overload to take a list of import tasks instead.	2020-12-16 14:28:16 +01:00
Dean Herbert	c5112edd08	Add comment regarding the reasoning for encapsulating the task in another	2020-12-14 18:03:01 +09:00
Dean Herbert	f3e6c586f7	Change waitForReady back to private implementation	2020-12-14 17:59:04 +09:00
Lucas A	08b79bb921	Store and return unstarted task for consumers to await on.	2020-12-12 17:12:15 +01:00
Lucas A	6da854e37c	Move scheduled import logic to OsuGame.	2020-12-09 13:32:59 +01:00
Lucas A	2ea8b105d5	Apply review suggestions	2020-12-06 18:46:30 +01:00
Endrik Tombak	cbbcf36eaa	Merge branch 'master' of https://github.com/ppy/osu into present-recommended	2020-12-03 19:38:32 +02:00
Lucas A	827e957568	Allow importing osz files / osk files from Downloads directory.	2020-12-02 18:03:49 +01:00
Endrik Tombak	72d9da5fac	Apply review suggestions	2020-11-21 14:26:09 +02:00
Endrik Tombak	944f3480c2	Merge branch 'master' of https://github.com/ppy/osu into present-recommended ... Conflicts: osu.Game/OsuGameBase.cs osu.Game/Screens/Select/DifficultyRecommender.cs osu.Game/Screens/Select/SongSelect.cs	2020-11-21 14:01:01 +02:00
Dean Herbert	2db42f8e67	Remove default allowRetry parameter value from ResultsScreen	2020-11-20 14:35:44 +09:00
Bartłomiej Dach	96fbfc33fa	Merge branch 'master' into perform-from-menu-dialog-aware	2020-11-12 15:05:45 +01:00
Dean Herbert	6fa0cc9bda	Merge pull request #10792 from peppy/remove-double-external-link-opener ... Remove duplicate instantiation of externalLinkOpener	2020-11-11 16:58:35 +09:00
Dean Herbert	804450e707	Remove duplicate instantiation of externalLinkOpener	2020-11-11 15:49:45 +09:00
Dean Herbert	c308eb75d9	Move logic for performing actions from specific screen to its own component	2020-11-11 14:45:50 +09:00
Dean Herbert	f78f2fb59e	Merge branch 'osd-custom-bindings-display' into add-random-skin-hotkey	2020-11-11 13:53:49 +09:00
Dean Herbert	324626e097	Move default config tracking calls out of OnScreenDisplay itself	2020-11-11 13:53:09 +09:00
Dean Herbert	8d38d9cc93	Add hotkey to select random skin	2020-11-11 13:05:03 +09:00
Dean Herbert	6014751e29	Add the ability for the game OSD to display user bindings ... Adds binding display for mouse button toggle / HUD toggle keys. - [ ] Depends on #10786 for ease-of-merge	2020-11-11 12:56:10 +09:00
Dean Herbert	9caa56c64f	Display skin changes via on-screen display overlay	2020-11-11 12:19:01 +09:00
Lucas A	790a2ca97d	Extract UserActivity logic to OsuGame.	2020-11-08 12:29:52 +01:00
Dean Herbert	1e1569eb53	Use int instead of long for user_id fields for now	2020-11-06 12:59:46 +09:00
Berkan Diler	cc11283143	Use string.Starts-/EndsWith char overloads	2020-10-16 11:27:02 +02:00
Dean Herbert	cc41845f56	Add missing string function ordinal specifications	2020-10-16 12:49:31 +09:00
Dean Herbert	dbdb25ccf7	Move reset logic to OsuGame	2020-10-08 18:29:19 +09:00
Dean Herbert	0967db768f	Add xmldoc covering usage restrictions	2020-10-08 18:28:56 +09:00
Shane Woolcock	f88ba1734b	Remove ConfineMouseTracker field	2020-10-07 18:11:47 +10:30
Shane Woolcock	d1ec380692	Don't cache ConfineMouseTracker	2020-10-07 16:15:32 +10:30
Shane Woolcock	7fff762dfc	Rename IsGameplay	2020-10-07 16:14:49 +10:30
Shane Woolcock	478f2dec96	Maintain the current gameplay state in OsuGame	2020-10-06 22:39:35 +10:30
Shane Woolcock	4b6f893408	Merge branch 'master' into confine-during-gameplay ... # Conflicts: # osu.Game/Configuration/OsuConfigManager.cs # osu.Game/OsuGame.cs # osu.Game/Screens/Play/Player.cs	2020-10-05 10:23:37 +10:30
smoogipoo	0360f7d845	Move CollectionManager to OsuGame	2020-09-09 15:39:15 +09:00
Dean Herbert	66d3bda962	Merge branch 'master' into collection-database	2020-09-08 23:18:47 +09:00
Dean Herbert	072aab90ab	Merge branch 'master' into fix-music-controller-regressed	2020-09-08 18:26:15 +09:00
Dean Herbert	b1110e5e3a	Rename class to match derived class	2020-09-08 18:10:14 +09:00
smoogipoo	06328e0000	Add import/deletion progress notifications	2020-09-08 17:59:27 +09:00
smoogipoo	98e9c4dc25	General refactorings	2020-09-07 21:08:48 +09:00
smoogipoo	6cc4517600	Merge branch 'master' into collection-database	2020-09-07 20:03:11 +09:00
smoogipoo	345fb9d8e0	Rename classes	2020-09-05 03:55:43 +09:00
smoogipoo	ebd11ae0b7	Add a collection management dialog	2020-09-05 03:52:07 +09:00
smoogipoo	1143d5d992	Update class exclusion for dynamic compilation	2020-09-04 20:41:08 +09:00
Salman Ahmed	001509df55	Move music global action handling to an own component ... Due to requiring components that are added at an OsuGame-level	2020-09-04 10:24:54 +03:00
Dean Herbert	2fac0a180e	Adjust toolbar button sizing	2020-09-03 16:34:58 +09:00
Dan Balasescu	84b3604192	Merge branch 'master' into game-overlay-activation-mode	2020-09-03 13:34:22 +09:00
Lucas A	754274a146	Fix and add XMLDoc	2020-09-02 20:55:26 +02:00
smoogipoo	a56f9d6770	Implement collection import	2020-09-03 00:08:33 +09:00
Lucas A	ad223bc460	Make game bindable immutable.	2020-08-29 19:34:53 +02:00
Lucas A	5949a281fc	Make Introduce bindable property OverlayActivationMode in OsuScreen	2020-08-29 19:34:35 +02:00
Shane Woolcock	00f15231bc	Cache ConfineMouseTracker	2020-08-16 21:52:39 +09:30
Dean Herbert	429ad783cf	Merge branch 'update-framework' into beatmap-track-rework	2020-08-12 23:35:46 +09:00
Dean Herbert	8bfe6ba27c	Fix informational overlays not hiding each other correctly	2020-08-11 23:15:08 +09:00
Dean Herbert	730d13fda6	Always show newly presented overlay at front ... This feels much better. Does not change order if the overlay to be shown is not yet completely hidden. - Closes #9815.	2020-08-10 20:48:04 +09:00
smoogipoo	bf21fdd6da	Merge branch 'master' into beatmap-track-rework	2020-08-07 18:41:34 +09:00
smoogipoo	adf4f56dce	Move MusicController to OsuGameBase	2020-08-06 19:01:23 +09:00
smoogipoo	ef689d943a	Fix intros playing incorrectly	2020-08-06 18:54:08 +09:00
Joehu	7bcb68ffac	Handle overlay toggling with toolbar buttons instead	2020-08-06 01:17:24 -07:00
smoogipoo	e9fc783b1d	Add back loop-on-completion	2020-08-06 16:24:14 +09:00
smoogipoo	58660c70a3	Cache before idle tracker	2020-08-06 16:24:14 +09:00
smoogipoo	6e42b8219c	Move track to MusicController, compiles	2020-08-06 16:24:14 +09:00
Andrei Zavatski	b821d619b5	Merge remote-tracking branch 'refs/remotes/ppy/master' into news	2020-07-25 09:13:12 +03:00
Dean Herbert	d093dc09f9	Limit notification text length to avoid large error messages degrading performance	2020-07-24 14:10:05 +09:00
Dean Herbert	a7fcce0bf7	Fix hard crash on notifications firing before NotificationOverlay is ready	2020-07-19 11:52:30 +09:00
Andrei Zavatski	f67b93936f	Remove shortcut	2020-07-16 23:11:55 +03:00
Andrei Zavatski	dac98c8914	Add shortcut for news overlay	2020-07-16 14:55:02 +03:00
Andrei Zavatski	68d2888a8c	Add NewsOverlay to the game	2020-07-16 14:48:40 +03:00
Joehu	1a2f5cb477	Add OnBackButton bool to OsuScreen	2020-07-13 23:59:20 -07:00
vntxx	d18609e900	Added notifications keybinding ... Implementation of #9502	2020-07-12 12:44:00 +02:00
Lucas A	508d34fd3a	Fix notification redirecting to the old log folder when game installation has been migrated to another location.	2020-06-30 19:51:10 +02:00
Dan Balasescu	b4dfd2bbaa	Merge branch 'master' into score-results-screen	2020-06-15 22:58:33 +09:00
Dean Herbert	c3c5a99a22	Load imported scores to results screen rather than gameplay	2020-06-15 20:23:35 +09:00
Dean Herbert	93572fc17d	Merge branch 'master' into present-recommended	2020-06-03 12:31:23 +09:00
Dean Herbert	9ab3e3a6d5	Merge branch 'master' into update-button	2020-05-13 20:50:33 +09:00
Dean Herbert	bbf4c687a8	Improve xmldoc	2020-05-13 11:09:17 +09:00
Craftplacer	39c36998c9	Revert changes that are to be resolved in #9002	2020-05-12 06:06:31 +02:00
Craftplacer	a86c7f478c	Initial commit	2020-05-12 05:49:35 +02:00
Dean Herbert	3f78ddf482	Add CanBeNull hinting	2020-05-09 19:13:18 +09:00
Dean Herbert	fa711a6456	Fix null reference causing hard freeze if game is forcefully closed during disclaimer	2020-05-09 19:11:51 +09:00
Craftplacer	75e65766ff	Annotate dependency	2020-05-08 01:09:16 +02:00
Craftplacer	c025814f40	Finalize changes	2020-05-07 23:04:18 +02:00
alex	0e2ccac33b	Add spaces to comments	2020-05-04 18:36:24 -07:00
Endrik Tombak	33a608fd15	Merge branch 'master' of https://github.com/ppy/osu into present-recommended ... Conflicts: osu.Game/Screens/Select/SongSelect.cs	2020-05-01 11:06:20 +03:00
Dean Herbert	21c6ac8c43	Allow closing the game during intro	2020-04-30 12:12:28 +09:00
Endrik Tombak	cea582992f	Fix early return check	2020-04-25 10:47:12 +03:00
Endrik Tombak	657bf5ad86	Merge branch 'master' of https://github.com/ppy/osu into present-recommended	2020-04-25 10:13:57 +03:00
Dean Herbert	1cec0575b7	Remove unused classes and replace overlay in game	2020-04-21 16:38:47 +09:00
Andrei Zavatski	894598eb22	Replace SocialOverlay with DashboardOverlay	2020-04-16 12:05:51 +03:00
Endrik Tombak	47187ec14c	Simplify recommended beatmap presenting	2020-04-15 18:04:23 +03:00
Endrik Tombak	58e122a7cb	Better fallback logic	2020-04-14 19:56:41 +03:00
Endrik Tombak	80949e89b9	Offline fallback and commenting	2020-04-14 19:49:42 +03:00
Endrik Tombak	872551733f	Present recommended beatmaps	2020-04-14 19:39:14 +03:00
Endrik Tombak	ed28e8c8f5	Rename param	2020-04-12 19:38:09 +03:00
Endrik Tombak	ecd25e567d	Present selected difficulty	2020-04-12 16:00:05 +03:00
Dan Balasescu	aafdfbca1f	Merge pull request #8129 from peppy/fix-dummy-track-completion-feedback ... Fix DummyWorkingBeatmap's track completion attempting to change game-wide beatmap	2020-03-05 17:57:57 +09:00
smoogipoo	0c1775b522	Fix incorrect condition and add test	2020-03-05 17:12:14 +09:00
smoogipoo	9307caa3bf	Fix typos	2020-03-05 16:58:07 +09:00
Dean Herbert	74b5e76c0e	Fix dependency initialisation ordering	2020-03-05 13:39:55 +09:00