889 Commits

Author	SHA1	Message	Date
Dean Herbert	23a46819dc	Merge branch 'master' into multiplayer-confirm-on-exit	2021-03-03 20:35:31 +09:00
Dean Herbert	0f5bce70ad	Split confirmation dialog classes apart	2021-03-03 20:34:37 +09:00
Dean Herbert	7dce9b04fa	Add a more basic ConfirmDialog implementation	2021-03-03 14:50:45 +09:00
Dean Herbert	fcea900a53	Move main menu (song select) presentation logic to a local implementation ... Reduces cross-dependencies between OsuGame and MainMenu.	2021-03-03 14:13:51 +09:00
Dean Herbert	90e8308716	Merge branch 'master' into localisation-refactor-framework	2021-02-25 17:28:55 +09:00
Dean Herbert	e82eaffaed	Flip order back to original for romanisable strings	2021-02-25 14:14:07 +09:00
Dean Herbert	e1f71038e3	Remove unncessary action	2021-02-24 12:13:55 +09:00
Dean Herbert	71182347d6	Also add a notifiation when trying to enter the multiplayer screen ... Turns out the only check required to get into this screen was that the API was online, which it always is even if the multiplayer component isn't. This provides a better end-user experience.	2021-02-24 11:30:14 +09:00
Dean Herbert	8a97e2e28d	Update LocalisedString usages to RomanisedString	2021-02-22 19:01:42 +09:00
Dean Herbert	1fd76ea3fb	Apply changes to UI components overriding functions with changing signatures	2021-02-22 19:01:42 +09:00
Dean Herbert	421cdb6650	Consume new method in existing usages (and remove some unnecessary set/unset code)	2021-02-18 15:01:11 +09:00
Dean Herbert	49589b64c3	Intro track should not restart from preview point	2021-02-18 14:55:15 +09:00
Dean Herbert	c1620ce21b	Fix intro beatmap always being imported even if already in a good state	2021-02-17 19:19:49 +09:00
smoogipoo	c6ed3efa4a	Merge branch 'master' into non-concurrent-sample-playback	2021-02-15 14:47:32 +09:00
smoogipoo	d3f0c0730d	Merge branch 'master' into non-concurrent-sample-playback	2021-02-12 17:22:15 +09:00
Dean Herbert	4ab16694d1	Fix classic "welcome" intro not looping as expected	2021-02-12 16:22:19 +09:00
Dean Herbert	3344e9f27f	Merge pull request #11720 from nekodex/new-buttonsystem-edit-sound ... Use unique sample for edit button click (ButtonSystem)	2021-02-11 15:10:35 +09:00
Jamie Taylor	996f1098f6	Use alternate sample on the downbeat while hovering OsuLogo	2021-02-10 18:17:48 +09:00
Jamie Taylor	22995c216d	Use unique sample for edit button click (ButtonSystem)	2021-02-10 17:23:55 +09:00
smoogipoo	de9d075f94	Initial sample + samplechannel rework	2021-01-19 17:11:40 +09:00
Dean Herbert	0560eb4120	Reduce final fill alpha of main menu confirm-to-exit	2021-01-18 18:22:21 +09:00
Dean Herbert	35be7ec0e1	Add back button but rename to "browse"	2021-01-06 23:28:14 +09:00
Dean Herbert	cfbfb8d58b	Revert "Remove related events" ... This reverts commit 59025e9d50.	2021-01-06 23:21:46 +09:00
Dean Herbert	59025e9d50	Remove related events	2021-01-06 23:09:58 +09:00
Dean Herbert	32accc8eab	Remove "osu!direct" button	2021-01-06 22:56:10 +09:00
Dean Herbert	b3f08b29ca	Ensure that all changes to screen backgrounds are on the correct thread	2021-01-05 15:22:50 +09:00
Bartłomiej Dach	361d215ab4	Reword notification messages to match new logic	2020-12-29 10:56:59 +01:00
Bartłomiej Dach	5d23199233	Trim redundant IsLoggedIn checks	2020-12-29 10:56:29 +01:00
Dean Herbert	4d04e0dee7	Disallow entering the playlists/multiplayer screens if API is failing	2020-12-29 16:25:51 +09:00
Bartłomiej Dach	83fb7c7a1a	Re-namespace all files in OnlinePlay directory	2020-12-25 16:50:09 +01:00
Dean Herbert	836d1491d0	PlaylistsMultiplayer -> Playlists	2020-12-25 23:47:18 +09:00
Dean Herbert	5d4b73baa5	RealtimeMultiplayer -> Multiplayer	2020-12-25 14:10:59 +09:00
Dean Herbert	a1384942b1	Timeshift -> Playlists at a code level	2020-12-25 13:11:21 +09:00
Dean Herbert	60c7c8b63b	Pluralise playlists in tip	2020-12-25 00:44:42 +09:00
Dean Herbert	aec25e2d73	Rename "timeshift" to "playlists" ... This only covers the user-facing instances. Code and class name changes will happen once things have calmed down.	2020-12-24 21:53:20 +09:00
Dean Herbert	85e93c5dde	Fix main menu multiplayer icons being back to front	2020-12-22 15:22:27 +09:00
smoogipoo	3bf670510a	Split into two actions	2020-12-22 14:55:25 +09:00
smoogipoo	0566ed1a9b	Add button to main menu	2020-12-21 18:38:44 +09:00
smoogipoo	4494bb1eb5	Abstract RoomManager and Multiplayer	2020-12-19 00:52:27 +09:00
Dean Herbert	206bf3713e	Make IAPIProvider read-only bindables into IBindables	2020-12-18 15:16:36 +09:00
Dean Herbert	898e2dae27	Restore kiai time flashing behaviour	2020-11-23 14:27:02 +09:00
Dean Herbert	ae609b9d48	Remove unnecessary local variable	2020-11-23 13:35:13 +09:00
Dean Herbert	2ae5a95d77	Change opacity value to match master implementation	2020-11-23 13:35:02 +09:00
Derrick Timmermans	61078e9ae1	Use 0.2f instead of .2f	2020-11-22 18:59:16 +01:00
Derrick Timmermans	ba7ce4c933	Make colour readonly	2020-11-22 18:37:49 +01:00
Derrick Timmermans	458016d17d	Remove AccentColour member variable from LogoVisualisation	2020-11-22 17:36:59 +01:00
Derrick Timmermans	1551402a8d	Change IntroWelcome visualiser to use Colour instead of AccentColour	2020-11-22 17:33:40 +01:00
Derrick Timmermans	b468f061f1	Remove unused using	2020-11-22 17:20:00 +01:00
Derrick Timmermans	cc33b0f2c6	Apply MenuGlow to Visualisation Colour instead of AccentColour	2020-11-22 16:53:53 +01:00
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
Shivam	444504f2b9	Expose MainMenu Track as internal get private set	2020-06-29 02:10:40 +02:00
Shivam	24dceb9f84	Make only "Welcome" loop	2020-06-29 01:41:47 +02:00
Shivam	270384e71e	Remove redundant get set	2020-06-29 00:59:44 +02:00
Shivam	5689f27987	Make sure it only loops for themed intros if true	2020-06-29 00:54:06 +02:00
Shivam	ffbce61ca8	Add the option to loop the intro in the main menu	2020-06-29 00:42:47 +02:00
jorolf	820056cc4e	update colours/transformations	2020-06-28 17:53:53 +02:00
jorolf	1409ace282	apply suggestions	2020-06-25 00:59:12 +02:00
jorolf	6f0ec36407	remove size from hue animation	2020-06-24 16:27:00 +02:00
jorolf	768e28faba	generalize and simplify animation	2020-06-24 14:11:38 +02:00
Sebastian Krajewski	68f078c9e6	Replace logo-triangles.mp4 with shadered logo-triangles.png	2020-06-24 10:30:33 +02:00
Dean Herbert	ccb27082d5	Fix background appearing too late	2020-06-24 11:08:32 +09:00
Dean Herbert	4244024fc3	Merge branch 'master' into fallback-intro	2020-06-24 10:49:45 +09:00
Dean Herbert	9d753a4fc2	Update intro resource locations	2020-06-23 21:34:57 +09:00
Dean Herbert	5cdabbc8bb	Update access to FrequencyAmplitudes via span	2020-06-23 21:33:03 +09:00
Dean Herbert	14ad3835ff	Update naming	2020-06-23 21:27:01 +09:00
Dean Herbert	49d3511063	Read amplitudes from piano reverb source	2020-06-23 13:55:44 +09:00
Dean Herbert	4554a7db33	Update naming	2020-06-23 13:49:18 +09:00
Dean Herbert	b289beca53	Fix samples being played too early	2020-06-23 13:33:33 +09:00
Dean Herbert	f60a80b263	Fix animations and general code quality	2020-06-22 21:35:52 +09:00
Dean Herbert	8d3ed05848	Update welcome text sprite location	2020-06-22 17:42:54 +09:00
Shivam	693a760a19	Use RelativeSizeAxes for width	2020-06-16 15:44:59 +02:00
Shivam	4bfc16b4ce	Implement changes from review ... Moves seeya back to the introscreen and uses a virtual string to change whenever it's needed and removed remainingTime()	2020-06-13 17:48:15 +02:00
Shivam	81c392b841	Change hash to be lowercase and change sample directories	2020-06-12 15:57:23 +02:00
Dean Herbert	c0afe4c880	Merge branch 'master' into fallback-intro	2020-06-12 17:19:11 +09:00
Dan Balasescu	527577d7c3	Merge pull request #9236 from MiraiSubject/logovisualisation-subclass ... Move user and skin specific settings for LogoVisualisation to a subclass	2020-06-09 19:16:24 +09:00
Shivam	a60bb5feac	Rename baseclass, add xmldoc & change access to internal	2020-06-08 23:45:40 +02:00
Shivam	0b6ae08c93	Removed unneeded properties	2020-06-08 21:31:03 +02:00
Shivam	d52e3f9386	Removed logovisualisation changes ... Now depends on https://github.com/ppy/osu/pull/9236 for accent color changes to apply	2020-06-08 21:26:48 +02:00
Shivam	2a5e960025	Move user and skin specific settings to a subclass	2020-06-08 21:15:51 +02:00
Shivam	e821d787b4	Implement suggested changes ... Note: LogoVisualisation is likely going to be needed in a separate PR to conform to the review.	2020-06-08 20:13:02 +02:00
Shivam	229a40e6e3	Code formatting fixed ... Somehow slipped through after pushing	2020-06-08 15:39:15 +02:00
Shivam	f80cdeac5c	Change transforms to roughly match fallback visually	2020-06-08 15:31:30 +02:00
Dean Herbert	dd61d6ed04	Attempt to reimport intro if a bad state is detected	2020-06-08 14:48:42 +09:00
Dean Herbert	72ada020a2	Don't attempt to use virtual track for intro sequence clock	2020-06-08 13:42:16 +09:00
Shivam	d002c0c03f	Revert piano reverb to a separate sample	2020-06-03 11:39:08 +02:00
Shivam	9cd66dcdef	Fix styling error	2020-06-02 21:54:39 +02:00
Shivam	b79773cdb1	Modify LogoVisualisation to allow color changes ... Also change the color from blue to dark blue	2020-06-02 21:50:50 +02:00
Shivam	4ebc1d3721	Add original sprite and visualiser ... Notes: This is using a modified version of welcome.osz to facilitate the visualiser and the animation of the sprite is not accurate.	2020-06-02 21:06:41 +02:00
Shivam	3d78ec90ac	Rename legacy to welcome to match osu-resources	2020-06-02 13:26:37 +02:00
Shivam	888b90b426	Rename IntroFallback classes to IntroLegacy ... This commit also renames files accordingly with https://github.com/ppy/osu-resources/pull/103	2020-06-02 13:14:50 +02:00
Shivam	19d73af90d	Implement basic intro sequence	2020-06-02 12:51:42 +02:00
Shivam	2aadb9deba	Implement welcome and seeya samples	2020-06-02 11:05:18 +02:00
Shivam	578c955658	Add fallback intro screen	2020-06-02 03:48:23 +02:00
alex	0e2ccac33b	Add spaces to comments	2020-05-04 18:36:24 -07:00
Dean Herbert	21c6ac8c43	Allow closing the game during intro	2020-04-30 12:12:28 +09:00
Dean Herbert	119000f1ab	Reduce database includes where possible	2020-04-28 21:43:35 +09:00
Dean Herbert	1cec0575b7	Remove unused classes and replace overlay in game	2020-04-21 16:38:47 +09:00
Dean Herbert	61d8cfd224	Fix triangle intro video being out of time	2020-04-08 19:51:55 +09:00
Alchyr	737a3b608a	Correct spelling	2020-04-07 17:34:18 -07:00
Dean Herbert	51db361c32	Update usages of Animation and Video in line with framework changes	2020-04-03 16:00:06 +09:00
Dean Herbert	880d138a47	Fix intro tests not asserting pass or working at all	2020-03-25 15:12:19 +09:00