740 Commits

Author	SHA1	Message	Date
Dean Herbert	46f6e84a33	Fix disclaimer potentially running same code from two different threads	2020-10-06 12:33:57 +09:00
Dean Herbert	4792b44911	Merge branch 'master' into editor-new-beatmap	2020-09-07 18:42:51 +09:00
Dean Herbert	1f2f21e07a	Merge branch 'master' into editor-new-beatmap	2020-09-04 13:11:59 +09:00
Lucas A	82e314da59	Fix merge conflicts.	2020-09-03 21:56:47 +02:00
Dan Balasescu	cf89a6e1a4	Merge pull request #10043 from peppy/better-outro-music-fade ... Improve music fade on game exit	2020-09-03 14:24:46 +09:00
Dan Balasescu	84b3604192	Merge branch 'master' into game-overlay-activation-mode	2020-09-03 13:34:22 +09:00
Dean Herbert	e032844570	Start with a fresh beatmap when entering editor from main menu	2020-09-03 13:20:23 +09:00
Dean Herbert	2f42c57f4b	Add safeties to ensure the current track doesn't loop or change	2020-09-03 13:15:23 +09:00
Dean Herbert	547c8090e5	Improve game exit music fade	2020-09-03 13:15:23 +09:00
Dean Herbert	6a765d2d76	Add smooth fading between audio tracks on transition	2020-09-02 20:04:56 +09:00
Dan Balasescu	f08e7828da	Merge branch 'master' into beatmap-track-rework	2020-09-01 16:06:38 +09:00
Lucas A	8de7744b52	Add back disabling of overlays on exiting game.	2020-08-29 19:34:53 +02:00
Lucas A	ad223bc460	Make game bindable immutable.	2020-08-29 19:34:53 +02:00
Poliwrath	edc15c965c	Update osu.Game/Screens/Menu/IntroSequence.cs ... Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2020-08-26 12:52:39 -04:00
Dean Herbert	f65991f31f	Revert some usages based on review feedback	2020-08-26 23:28:58 +09:00
Poliwrath	c50e495e03	fix lingering small ring in circles! intro	2020-08-26 02:49:55 -04:00
Dean Herbert	f63d1ba612	Remove stray call to LoadTrack that was forgotten	2020-08-21 18:52:53 +09:00
Dean Herbert	1edafc39ba	Fix intro welcome playing double due to missing conditional	2020-08-21 18:33:24 +09:00
Dean Herbert	0ae460fb8f	Avoid beatmap load call in IntroScreen	2020-08-21 15:50:14 +09:00
Dean Herbert	d9debef156	Add explicit LoadTrack method	2020-08-17 15:38:16 +09:00
Dean Herbert	0c4aefb15e	Merge branch 'master' into beatmap-track-rework	2020-08-17 15:00:29 +09:00
Dean Herbert	5d433c0b05	Fix a couple of new Resharper inspections	2020-08-16 23:11:29 +09:00
Dean Herbert	a6708c4286	Rename resolved variable in MainMenu	2020-08-16 23:04:54 +09:00
smoogipoo	c0031955c9	Update with further framework changes	2020-08-12 01:50:18 +09:00
smoogipoo	070d71ec27	More cleanups	2020-08-12 00:48:38 +09:00
smoogipoo	7d35893ecd	Make MusicController non-nullable	2020-08-11 12:40:58 +09:00
smoogipoo	e87f50f74f	Rename method	2020-08-07 22:31:41 +09:00
smoogipoo	5002d69f69	Update inspections	2020-08-07 20:51:56 +09:00
smoogipoo	61b632516e	Ensure CurrentTrack is never null	2020-08-07 19:43:16 +09:00
smoogipoo	f8279dab32	Refactor MainMenu	2020-08-06 18:54:14 +09:00
smoogipoo	ef689d943a	Fix intros playing incorrectly	2020-08-06 18:54:08 +09:00
smoogipoo	5c05fe3988	Expose track from MusicController	2020-08-06 16:24:14 +09:00
smoogipoo	6e42b8219c	Move track to MusicController, compiles	2020-08-06 16:24:14 +09:00
Lucas A	71895964f4	Refactor overlay activation logic and reword tip.	2020-08-05 11:21:09 +02:00
Dan Balasescu	33330701e1	Merge branch 'master' into osu-logo-no-update-transforms	2020-07-28 15:36:37 +09:00
Dean Herbert	5b724d9659	Adjust damp base component to provide ample tweening	2020-07-27 15:10:32 +09:00
jorolf	50f72ac9cb	rename classes	2020-07-22 22:10:59 +02:00
Dean Herbert	20096f9aea	Remove remaining per-Update transform in OsuLogo to reduce allocations	2020-07-18 11:44:18 +09:00
jorolf	87f7d8744d	simplify transform	2020-07-15 12:40:46 +02:00
Dean Herbert	fe68e8276d	Merge branch 'master' into logo-shader	2020-07-15 19:06:35 +09:00
Dean Herbert	675544ec2f	Tidy up colour and variable usage	2020-07-15 19:03:59 +09:00
Dean Herbert	1760cc2427	Fix behavioural regression by splitting methods out	2020-07-10 18:03:56 +09:00
Dean Herbert	44fdb5b82e	Ensure music starts when returning to lounge or main menu	2020-07-10 17:20:27 +09:00
Dean Herbert	efdf179906	Replace poo icon at disclaimer screen	2020-07-09 12:31:20 +09:00
Dean Herbert	3f3bfb1ffb	Minor reshuffling / recolouring	2020-07-06 23:51:16 +09:00
Dean Herbert	a650a5ec83	Move dialog classes to own file	2020-07-06 23:44:26 +09:00
smoogipoo	ddac511c8c	Move start fresh button above	2020-07-06 22:41:51 +09:00
Dan Balasescu	8f792603ee	Apply suggestions from code review ... Co-authored-by: Dean Herbert <pe@ppy.sh>	2020-07-06 22:40:45 +09:00
smoogipoo	1effe71ec2	Add dialog for storage options	2020-07-06 22:03:09 +09:00
jorolf	52b313f290	change textures	2020-07-04 19:06:26 +02:00