387 Commits

Author	SHA1	Message	Date
smoogipoo	bcdaee7d39	Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle" ... This reverts commit 3e2e2a7000, reversing changes made to d94801b6c6.	2018-11-19 17:52:31 +09:00
Dan Balasescu	e8f34ddff0	Merge branch 'master' into return_to_large_logo_after_idle	2018-11-15 15:16:10 +09:00
Dean Herbert	4b1282235a	Merge remote-tracking branch 'upstream/master' into Private_Messages	2018-11-12 20:41:10 +09:00
Dean Herbert	3be50c2941	Merge branch 'master' into return_to_large_logo_after_idle	2018-10-09 18:02:36 +09:00
smoogipoo	97c585c54c	Fix cursor not hiding in screenshots	2018-10-02 10:12:07 +09:00
Roman Kapustin	baf9e028c3	Fix possible idleTracker nullref	2018-09-26 19:44:01 +03:00
Roman Kapustin	c7b3fa51d5	Inject IdleTracker into ButtonSystem	2018-09-25 19:58:50 +03:00
UselessToucan	3c0b77658c	Merge branch 'master' into return_to_large_logo_after_idle	2018-09-25 19:48:38 +03:00
Dean Herbert	3c8c7a0459	Move ChannelManager to OsuGame ... There's no reason for it to exist at OsuGameBase	2018-09-14 13:31:25 +09:00
Roman Kapustin	60c0428979	Remove redundant empty argument list	2018-09-12 20:54:40 +03:00
Roman Kapustin	749e89bd25	Introduce IdleTracker	2018-09-12 20:34:52 +03:00
Roman Kapustin	761d7629cd	Return to large logo after idle period	2018-09-12 18:09:19 +03:00
Dean Herbert	5d264fdbdd	Merge remote-tracking branch 'upstream/master' into Private_Messages	2018-09-11 13:56:57 +09:00
Dean Herbert	27ac7685e1	Bring music controller in front of notification overlay	2018-09-09 22:12:37 +09:00
Dean Herbert	ce92c8d2eb	Merge branch 'master' into Private_Messages	2018-09-05 02:40:02 +09:00
Dean Herbert	144e80dff6	Add "import all skins from stable" option (and mass delete)	2018-09-03 10:10:04 +09:00
Dean Herbert	e503878956	Merge branch 'master' into master	2018-09-01 17:31:04 +09:00
Dean Herbert	20817fdf1d	Avoid using symbol windows can't diplay	2018-08-30 14:34:45 +09:00
unknown	499c5d28ff	Refactored variable names in OsuGame.cs for improved code readability.	2018-08-29 18:04:51 -04:00
Dean Herbert	4b54c65d3f	Fix single file component loading not actually working correctly	2018-08-29 15:11:02 +09:00
Dean Herbert	4376ad107e	Merge branch 'master' into Private_Messages	2018-08-24 17:26:33 +09:00
Dean Herbert	295ccabf64	Expand out on to multiple lines	2018-08-20 16:06:12 +09:00
Dean Herbert	65dc9f44e5	Catch OperationCanceledException in single file load sequence	2018-08-20 14:42:37 +09:00
Dean Herbert	7a8aabc402	Fix notifications suggesting automatic reporting in non-deployed builds	2018-08-17 13:18:48 +09:00
Dean Herbert	12b81df2f3	Fix unhandled exception on startup when arguments are present	2018-08-16 22:01:04 +09:00
Dean Herbert	9f55afe569	Let user know automatic reporting happened	2018-08-16 16:44:12 +09:00
Dean Herbert	9fc0a75b71	Merge branch 'master' into sentry-logging	2018-08-16 13:33:24 +09:00
smoogipoo	bfbe00e6ec	Remove multiple caching	2018-08-08 15:38:09 +09:00
Dean Herbert	4453b5faca	Cache mods at PlaySongSelect	2018-08-08 12:43:08 +09:00
Dean Herbert	4cb7063801	Add automated testing of mod preservation/removal	2018-08-07 16:45:18 +09:00
Dean Herbert	7b8bd7f21c	Fix mod selection not restoring when re-entering song select	2018-08-07 14:49:44 +09:00
miterosan	cc640893c2	Merge branch 'master' into Private_Messages	2018-08-04 00:33:46 +02:00
Dean Herbert	2ea90ef98a	Add sentry logging	2018-08-03 19:25:55 +09:00
miterosan	b1e9a4fd24	Merge branch 'master' of https://github.com/ppy/osu into Private_Messages	2018-07-29 23:28:34 +02:00
Dean Herbert	b7de922896	Merge branch 'master' into open-downloaded-beatmas	2018-07-28 12:44:34 +09:00
smoogipoo	464333cf0b	Merge remote-tracking branch 'origin/master'	2018-07-26 21:28:31 +09:00
miterosan	9f43e0c900	Merge branch 'master' of https://github.com/ppy/osu into Private_Messages ... # Conflicts: # osu.Game/Overlays/Chat/ChatTabControl.cs # osu.Game/Overlays/ChatOverlay.cs	2018-07-23 15:45:54 +02:00
Dean Herbert	f1c3fbe644	Improve integrity of song select bind/change logic	2018-07-18 13:18:50 +09:00
Dean Herbert	ac35e8bd99	Remove redundant empty statement	2018-07-13 21:27:09 +09:00
Dean Herbert	6d8923a37c	Use better logic	2018-07-13 21:08:41 +09:00
Dean Herbert	a1a077398c	Merge remote-tracking branch 'upstream/master' into peppy-clickable-download-notifications	2018-07-13 21:04:17 +09:00
Dean Herbert	95f314d949	Fix crash when clicking notification from player	2018-07-13 21:04:10 +09:00
Dean Herbert	b33a0f772e	Don't close toolbar	2018-07-13 21:00:52 +09:00
Dean Herbert	96eb44425b	Fix informational overlays not hiding when user toggles other overlay views ... Closes #3014.	2018-07-13 20:34:41 +09:00
Dean Herbert	fbc5250bf1	Update framework	2018-07-11 17:12:01 +09:00
Dean Herbert	1418d1369f	Add the ability to click completed download notifications to select beatmap ... Closes #2731.	2018-07-11 01:32:10 +09:00
miterosan	c56a4ea893	Merge branch 'master' into Private_Messages	2018-07-08 19:29:33 +02:00
Dean Herbert	e5001b84bd	Merge remote-tracking branch 'upstream/master' into ekrctb-fix-volme-meter	2018-07-05 21:04:19 +09:00
ekrctb	bbceac6cda	Apply renaming of wheel -> scroll	2018-07-05 16:50:04 +09:00
Jacob Odgård Tørring	9248340df8	Merge branch 'master' into master	2018-07-04 20:51:05 +02:00