331 Commits

Author	SHA1	Message	Date
Dean Herbert	af270cccc4	Fix cross talk between ModSelectOverlays	2021-07-08 17:59:04 +09:00
PercyDan54	e1c646b9b2	Remove redundant arguments	2021-07-05 23:52:39 +08:00
Dean Herbert	5883922177	Remove mod multiplier completely	2021-06-25 16:36:31 +09:00
aitani9	62566f2a4a	Remove "Score Multiplier" text	2021-06-24 14:29:47 -07:00
Dean Herbert	abc96057b2	Remove relative height specification and use constant height	2021-05-21 17:55:46 +09:00
Dean Herbert	7fc450c620	Fix mod settings blocking input outside its visible area ... Closes #12502.	2021-04-20 23:42:56 +09:00
smoogipoo	ccb83ef3a3	Fix checkbox not being updated	2021-02-22 15:47:47 +09:00
smoogipoo	d3f0c0730d	Merge branch 'master' into non-concurrent-sample-playback	2021-02-12 17:22:15 +09:00
Dean Herbert	98c5b0220c	Merge pull request #11725 from smoogipoo/freemods-user-settings ... Add local user customisation for freemod mod settings	2021-02-11 16:02:24 +09:00
smoogipoo	822c66033f	Add local-user freemod configuration	2021-02-10 19:56:59 +09:00
Dean Herbert	b3b0d97354	Avoid potential feedback from bindable event binds	2021-02-10 15:33:04 +09:00
Dean Herbert	435c85a2e7	Avoid executing selection twice on ModSelectOverlay load	2021-02-10 15:13:09 +09:00
Dean Herbert	75bc9f607e	Rename wrongly named method	2021-02-10 14:55:15 +09:00
Dean Herbert	bf239f8bef	Flush animation on closing mod overlay	2021-02-04 19:12:37 +09:00
Dean Herbert	f23ca7c7cf	Centralise selection animation logic	2021-02-04 18:10:55 +09:00
Dean Herbert	4bfe3aabdc	Simplify sound debounce logic	2021-02-04 17:06:11 +09:00
smoogipoo	f25535548a	Fix buzzing on select all/deselect all	2021-02-02 21:20:16 +09:00
smoogipoo	643c0605d8	Implement the freemod selection overlay	2021-02-02 21:14:38 +09:00
smoogipoo	8b3a85daa7	Merge branch 'refactor-mod-sections' into freemod-select-overlay	2021-02-02 21:09:51 +09:00
smoogipoo	728f8599b2	Move incompatible mod deselection to SoloModOverlay	2021-02-02 21:06:32 +09:00
smoogipoo	e58ece9e10	Make ModSelectOverlay abstract	2021-02-02 21:06:04 +09:00
smoogipoo	50e92bd0ed	Fix selection not being preserved when IsValidMod changes	2021-02-02 20:50:54 +09:00
smoogipoo	10ceddf3ff	Make IsValidMod adjustable	2021-02-02 20:47:50 +09:00
smoogipoo	75f81bfa06	Add back mod validation	2021-02-02 20:35:41 +09:00
smoogipoo	6d620264f4	Allow mod buttons to not be stacked	2021-02-02 20:27:41 +09:00
smoogipoo	3741f05ab3	Refactor mod sections and make them overridable	2021-02-02 20:11:40 +09:00
Dean Herbert	bb8113fb51	Fix mod select footer not animating correctly on first reveal	2021-01-25 14:47:47 +09:00
smoogipoo	de9d075f94	Initial sample + samplechannel rework	2021-01-19 17:11:40 +09:00
Dean Herbert	0b165dce4b	Fix multiplayer mod select showing autoplay as a choice	2021-01-18 17:50:32 +09:00
Salman Ahmed	375ecf92ed	Merge remote-tracking branch 'upstream/master' into fix-mod-buttons-not-copying-settings	2021-01-09 00:26:18 +03:00
Dean Herbert	4d6c13f169	Privatise ModSelectOverlay methods that may be unsafe to be called externally	2021-01-05 16:18:13 +09:00
Salman Ahmed	2ce9599957	Copy selected mods properties into overlay's buttons	2021-01-01 03:47:13 +03:00
Dean Herbert	7253866e17	Move customisation panel to be in same area as main content	2020-12-07 16:42:55 +09:00
Joehu	0f9b38da08	Add fade in/out animations to mod settings container	2020-12-06 11:35:14 -08:00
Dean Herbert	3e326a9234	Use bindable flow for event propagation	2020-10-14 15:22:17 +09:00
Dean Herbert	24eff8c66d	Rename container to match "settings" term used everywhere	2020-10-14 15:13:49 +09:00
Leon Gebler	3fd913b13f	rename customisation container class	2020-10-13 19:38:25 +02:00
Leon Gebler	663b806974	move ModSettingsContainer to seperate component	2020-10-13 17:45:40 +02:00
Leon Gebler	1a85123b89	rename container class to be more descriptive	2020-10-12 21:24:42 +02:00
Leon Gebler	7df9282727	CodeAnalysis fixes	2020-10-12 15:58:34 +02:00
Leon Gebler	e5548a1216	Move ModSettingsContainer class inside ModSelectOverlay	2020-10-12 00:16:18 +02:00
Joehu	4dacdb9994	Fix mod select overlay absorbing input from toolbar ruleset selector	2020-09-13 11:50:21 -07:00
smoogipoo	d8ebb8e3eb	Move override to a bit better location	2020-07-15 13:17:22 +09:00
Joehu	79f6092344	Fix back button not glowing when closing mod select with escape	2020-07-14 13:31:15 -07:00
Dean Herbert	832fa74a5e	Reword comment slightly	2020-04-28 13:26:42 +09:00
Joseph Madamba	a34ec03efc	Reword width comment ... Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2020-04-27 12:44:20 -07:00
Joehu	1b9362041a	Revert multiplier number changes and set width ... Safe arbitrary width taken from "0.00x" (highest width of 67), rounded to the nearest tenth.	2020-04-26 19:50:11 -07:00
Joehu	8a47a615db	Remove unranked label from footer	2020-04-26 19:29:22 -07:00
Joehu	4b60be87b5	Move unranked label under multiplier number to avoid width changes	2020-04-24 16:34:41 -07:00
Joehu	0f6ec274f9	Add transitions to footer when flowing to another row	2020-04-23 22:44:17 -07:00
Joehu	118db03b56	Fix vertical spacing and score multiplier splitting apart ... Also cleans up margin and its hacks (alignment done with anchor/origin now).	2020-04-23 22:41:38 -07:00
Joehu	abb687286b	Fix score multiplier being cut off in mod select at higher ui scales	2020-04-23 22:34:00 -07:00
Dean Herbert	ed837d3115	Use framework extension method for FromHex	2020-03-11 10:18:41 +09:00
Dan Balasescu	3600b0daf0	Merge branch 'master' into fix-mod-select-overflowing	2020-02-04 11:57:54 +09:00
Joehu	22e3150f68	Fix comment and remove magic numbers	2020-02-03 17:21:06 -08:00
Joehu	609ee26030	Fix mod select overlay not showing up in test	2020-02-01 11:41:41 -08:00
Joehu	2d42a83bb9	Fix mod select overlay overflowing toolbar at max ui scale	2020-02-01 11:24:29 -08:00
Dean Herbert	7bf2e9b369	Decouple ModSelectOverlay from global SelectedMods	2020-01-30 17:38:15 +09:00
ProTheory8	61d7b63914	Readability Improvement	2020-01-21 09:30:11 +05:00
ProTheory8	41295bc27c	Difficulty Adjust mod customisation menu opens automatically now	2020-01-20 21:06:36 +05:00
Dean Herbert	8052aeb238	Fix potential nullref in disposal logic	2019-12-13 21:36:50 +09:00
Dean Herbert	440a8470e1	Move available mods to global context ... This also tidies up ModSelectOverlay and setting creation flow in general.	2019-12-13 21:36:50 +09:00
Dean Herbert	5624b9fd3f	Fix US english	2019-12-11 13:19:13 +09:00
Dean Herbert	a37af311d0	Simplify settings update logic	2019-12-11 13:19:02 +09:00
Dean Herbert	46d055604a	Customize -> Customise	2019-12-06 18:59:45 +09:00
Dean Herbert	a5d5099868	Use SettingsSource for mod cusomisation	2019-12-06 17:09:48 +09:00
Dean Herbert	af35df4077	Add multiple mod testing and update test code style	2019-12-06 15:42:11 +09:00
unknown	a92b32f6dc	add basic tests	2019-11-05 00:56:09 +08:00
LeNitrous	9375ef5eea	clear settings controls when changing rulesets	2019-10-08 19:42:15 +08:00
LeNitrous	59b2f02828	initial implementation of customizable mods	2019-10-08 18:34:09 +08:00
andy840119	3a14794c43	use show/hide instead because FillFlowContainer's spacing	2019-06-14 01:43:20 +09:00
Dean Herbert	609a82bc94	Update VisibilityContainer usage in line with framework	2019-06-11 15:13:58 +09:00
Dean Herbert	8f30c9b0a3	Fix file layout of ModSelectOverlay	2019-06-07 15:58:24 +09:00
Dean Herbert	7ffc08b187	Merge branch 'master' into master	2019-06-07 15:34:14 +09:00
Dean Herbert	b914bb1e2e	Remove key hints for now ... A proper design for this will come in the future.	2019-06-07 15:32:48 +09:00
Dean Herbert	0ce5c7468f	Use switch and consume/block input	2019-06-07 15:31:23 +09:00
Welsar55	c04c6693c2	Change close action from PopOut to Hide and switched to TriangleButton.Click()	2019-06-05 13:01:21 -05:00
Welsar55	194bb80354	Added close button and indictors of hotkeys to buttons	2019-06-03 11:09:21 -05:00
Dean Herbert	4ca34bd5e8	Update osu! in line with audio subsystem refactor	2019-05-28 17:06:01 +09:00
smoogipoo	0222424aef	Make mods IReadOnlyList<Mod> gamewide ... Prevents potential multiple evaluations of enumerable.	2019-04-10 17:20:36 +09:00
smoogipoo	4310f07a5c	Rename SelectedMods -> Mods	2019-04-10 12:03:57 +09:00
Dean Herbert	b7126b3efb	Fix mod select overlay dimming itself	2019-03-02 14:48:05 +09:00
Dean Herbert	26d53d06a9	Fix remaining issues	2019-02-28 13:31:40 +09:00
Dean Herbert	3015d40f8f	Merge branch 'master' into osu-fontusage	2019-02-22 18:09:23 +09:00
smoogipoo	d8c55bc729	Adjust namespaces	2019-02-21 19:05:52 +09:00
smoogipoo	bca347427f	Update with framework bindable changes	2019-02-21 18:56:34 +09:00
smoogipoo	4db5531e4b	Replace copy-constructor/method with extension method	2019-02-20 19:32:30 +09:00
smoogipoo	a2aa3ec5cb	Adjust sprite texts in-line with framework changes	2019-02-20 15:03:20 +09:00
Dean Herbert	a25dce53cd	Fix logical regression	2019-01-25 15:03:32 +09:00
Dean Herbert	787d4da153	Combine constant	2019-01-25 14:10:59 +09:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Unknown	6eff79913b	remove blank lines	2019-01-11 10:34:56 +01:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
smoogipoo	a8f156584b	Update framework with positional/non-positional changes	2018-09-26 14:01:15 +09:00
Dean Herbert	03084aa04b	Revert async changes	2018-08-31 07:07:10 +09:00
smoogipoo	e7a5816d27	Use GetAsync for all samples	2018-08-27 17:30:16 +09:00
smoogipoo	aa3f6337a2	Add comment	2018-08-15 09:14:07 +09:00
smoogipoo	f69bc23ab8	Overflow mod select to account for parallax	2018-08-14 17:26:25 +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
Dean Herbert	3c06655672	Split out Special mods into Automation and Conversion	2018-07-31 18:00:42 +09:00
Dean Herbert	e28a610757	Fix mods not correctly resetting when changing ruleset at song select	2018-07-05 13:22:52 +09:00
smoogipoo	b61fe10f62	Adapt to IBindables	2018-07-02 15:07:18 +09:00
Dean Herbert	4bcc05a7fc	Remove null checks on ruleset ... Add a default ruleset to `OsuTestCase` to cover testing scenarios.	2018-06-26 18:24:34 +09:00
Dean Herbert	b0a1b25983	Privatise game ruleset and access via DI ... Also decouples the bindable at SongSelect, where it is debounced in line with the carousel being updated.	2018-06-26 16:32:32 +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
Dean Herbert	ae77c010e2	Merge remote-tracking branch 'upstream/master' into wave-container	2018-04-15 21:03:18 +09:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
DrabWeb	0bede52381	Move the waves portion of WaveOverlayContainer to WaveContainer to allow usage in other places.	2018-04-11 16:22:27 -03:00
Joseph Madamba	5457f17e79	Clean up code from reviews	2018-03-28 19:53:15 -07:00
Joseph Madamba	ac9527147f	Fix transitioning of unranked label	2018-03-27 03:05:05 -07:00
Joseph Madamba	90d763fda5	Apply review changes and suggestions	2018-03-25 10:00:30 -07:00
Joseph Madamba	78a7564acd	Score multiplier edits	2018-03-24 16:00:18 -07:00
Dean Herbert	65b6a2faad	Fix mod button sounds playing when mod overlay is not visible ... Resolves #2240.	2018-03-21 18:41:21 +09:00
Dean Herbert	4411758ff7	Merge branch 'master' into fix-autoplay-button-deselect	2018-03-16 17:31:14 +09:00
FreezyLemon	a438e45434	make SelectTypes set mods instead of only adding new ones ... also made the method actually take types as parameter to make it consistent	2018-03-14 12:33:08 +01:00
Joseph Madamba	1eeacb7bf7	Change descriptions and special section	2018-03-14 01:05:19 -07:00
Dean Herbert	034875be47	Fix bindings not being unbound on ModSelect ... Resolves #2018. Closes #2079.	2018-02-27 20:45:32 +09:00
Dean Herbert	7852015db3	Remember mod selection when re-entering song select ... Removes mod application when exiting back to main menu. Alternative to #1968. Closes #1961.	2018-01-26 19:32:57 +09:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
Dean Herbert	f72239ef7a	Centralise deselect logic and add animation to deselection	2018-01-02 16:09:22 +09:00
Dean Herbert	1895b16d67	Correctly make fullscreen overlays block keyboard input from drawables behind them ... - [ ] Depends on #1711 to get correct global binding handling.	2017-12-21 19:34:20 +09:00
Aergwyn	ebc2ad55f8	greatly expanded tests for ModSelectOverlay	2017-12-20 19:05:23 +01:00
Aergwyn	5fbe7dfd8c	added Deselect All button to ModSelectOverlay	2017-12-16 17:53:22 +01:00
Dean Herbert	acc299c7b9	Correct and simplify RulesetStore	2017-10-16 17:02:31 +09:00
Dean Herbert	5f53426a9a	*Database -> *Store ... Welcome back BeatmapManager	2017-07-27 16:56:41 +09:00
Dean Herbert	fce580d717	Reshuffle namespaces	2017-07-26 13:22:46 +09:00
Thomas Müller	e68675f970	Rename EasingTypes to Easing	2017-07-22 20:53:53 +02:00
paparony03	62dee59672	Shapes namespace ... Depends on https://github.com/ppy/osu-framework/pull/837	2017-06-20 15:54:23 +10:00
Dean Herbert	efab186384	Update namespaces in line with framework	2017-05-16 12:50:30 +09:00
Dean Herbert	6298b3effd	Refactor ModSection and ModIcon to avoid null mods.	2017-05-05 12:16:41 +09:00
Dean Herbert	fbd26a1d5e	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
Dean Herbert	af13f97435	Fix regressions and test cases.	2017-04-17 19:44:03 +09:00
Dean Herbert	a4e2f34ee7	Make a RulesetDatabase.	2017-04-17 17:43:48 +09:00
smoogipooo	4a149c4ab8	Better default values + don't set Mode from outside.	2017-04-15 06:14:31 +09:00
smoogipooo	0a1376c2db	Remove PlayMode game-wide.	2017-04-15 05:22:41 +09:00
smoogipooo	59bfc7abad	Move statics to RulesetCollection to avoid conflicts later on.	2017-04-15 04:53:37 +09:00
Dean Herbert	7c74951454	Update bindables. ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCaseResults.cs # osu.Game/Screens/Ranking/ResultModeButton.cs # osu.Game/Screens/Ranking/Results.cs	2017-04-04 11:34:13 +09:00
Dean Herbert	f7dc7e9bb9	Update references.	2017-03-28 21:26:20 +09:00
Dean Herbert	54e1b24fe9	Enforce readonly private members where possible.	2017-03-23 13:50:08 +09:00
smoogipooo	c0e29652a6	Initial attempt at making mods apply better.	2017-03-12 22:13:43 +09:00
Dean Herbert	115ebd4773	Merge branch 'master' into modselect	2017-03-09 17:31:25 +09:00
Dean Herbert	da751804b6	Reduce error count.	2017-03-09 14:24:16 +09:00
Dean Herbert	bff1179624	Merge branch 'master' into replay ... # Conflicts: # osu.Game/Modes/Mod.cs	2017-03-07 14:32:14 +09:00
Huo Yaoyuan	27edc9971e	Update deselect logic. ... Change to DeselectTypes to avoid enumerating children for multi times.	2017-03-07 01:15:21 +08:00
Huo Yaoyuan	eda7e1b26f	Fix and update mode changing handling.	2017-03-07 01:01:42 +08:00
Huo Yaoyuan	836484ba51	Add abstract ModType for ModSection.	2017-03-07 00:32:22 +08:00
Huo Yaoyuan	318ab68af1	Use Bindable<IEnumerable<Mod>> to fit other changes.	2017-03-07 00:17:06 +08:00
Huo Yaoyuan	f6f20cafd3	Merge remote-tracking branch 'peppy/less-mods-enum' into modselect	2017-03-06 17:35:15 +08:00
Dean Herbert	45f500920c	Don't use Mods enum for handling incompatible mods.	2017-03-06 18:29:17 +09:00
Huo Yaoyuan	a34e6453bf	Simplify SelectedMods.	2017-03-06 15:39:27 +08:00
Dean Herbert	2de25c23b4	Make Mods IEnumerable.	2017-03-06 15:20:55 +09:00
Thomas Müller	a14bdf8624	Use Color4Extensions from Framework and remove redundant Name	2017-03-04 19:42:37 +01:00
Dean Herbert	e12d89529c	Merge remote-tracking branch 'upstream/master' into update-flow	2017-03-04 23:28:39 +09:00
Thomas Müller	a2317e5a1e	Update usage of FillDirection	2017-03-04 11:00:17 +01:00
DrabWeb	5a83687a27	Small cleanups	2017-03-03 18:02:31 -04:00
Dean Herbert	71534b3e13	Fix incorrect triangle density on first display.	2017-03-03 18:09:16 +09:00
Dean Herbert	e399d6c6d1	Use bindable for PlayMode.	2017-03-02 21:16:58 +09:00
Dean Herbert	471b9daa93	Merge branch 'master' into mod-overlay ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/osu.Game.csproj	2017-03-02 20:27:04 +09:00
DrabWeb	1eee587c18	CreateModSections -> GetModsFor(PlayMode), fixed deselect not working in ModSelectOverlay, added MultiMod for multiple mods in one mod, fixed issues with SelectedColour in ModSection	2017-03-02 01:07:28 -04:00
DrabWeb	6c680825ed	ModSections in Ruleset, fixed toolbar play mode changed not firing	2017-03-01 22:05:52 -04:00
DrabWeb	bb12463ae4	Working on better way to handle mods	2017-03-01 20:57:33 -04:00
DrabWeb	c3a81127f2	Updated to work with latest framework	2017-02-28 02:25:38 -04:00
DrabWeb	e1c4abd8c5	Cleaned ModSelectOverlay	2017-02-23 07:36:31 -04:00
Dean Herbert	c683cdbb1d	Derive from FocusedOverlayContainer and remove custom focus logic.	2017-02-23 12:51:32 +09:00
Dean Herbert	8d1498a8db	Fix initial state and shorten disappear animation.	2017-02-23 12:47:20 +09:00
Dean Herbert	b33627a750	Make transitions better.	2017-02-23 12:42:31 +09:00
Dean Herbert	9f367bcc0e	Fix line endings.	2017-02-23 11:16:23 +09:00
DrabWeb	cf5258ceb0	Thanks refactoring	2017-02-22 13:17:06 -04:00
DrabWeb	bf1d13e734	Comply to formatting style	2017-02-22 13:12:39 -04:00
DrabWeb	8cd7ebcb43	readonly -> const	2017-02-22 13:03:19 -04:00
DrabWeb	bac0431102	Fixed build failing	2017-02-22 12:28:34 -04:00
DrabWeb	4821f323b8	Cleanup	2017-02-22 12:12:41 -04:00
DrabWeb	337a1004d3	Made mod disabling better	2017-02-22 11:34:22 -04:00
DrabWeb	3f5d155583	Added DeselectAll	2017-02-18 11:40:05 -04:00
DrabWeb	a024353574	Wave animation fine tuning	2017-02-18 11:21:41 -04:00
DrabWeb	d1af050355	Fixed typo, made mod select take focus when visible	2017-02-18 07:50:22 -04:00
DrabWeb	006fb5502d	ModSelect -> ModSelectOverlay, + WaveOverlayContainer, + ModButton selected colours, made song select OnExit not handle closing mod select	2017-02-18 07:28:22 -04:00