129 Commits

Author	SHA1	Message	Date
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