8586 Commits

Author	SHA1	Message	Date
Dean Herbert	df67c0498d	Fix OSD fade-in not correctly debouncing ... It could potentially never fade in on quick presses.	2018-07-09 17:53:39 +09:00
Dean Herbert	6ced51bb67	Merge branch 'master' into removeAge	2018-07-09 17:43:23 +09:00
HoutarouOreki	10aae3b0ee	Remove age from User class	2018-07-09 10:33:46 +02:00
HoutarouOreki	930667d0f9	Remove unused age display code	2018-07-09 10:12:10 +02:00
smoogipoo	0a67e5a274	Fix some possible null reference exceptions	2018-07-09 17:09:17 +09:00
Dean Herbert	b20afb915d	Fix right mouse activated absolute scroll not working	2018-07-09 15:26:22 +09:00
Dean Herbert	e223074876	Fix import failures if single set has multiple conflicting OnlineBeatmapIDs ... Resolves #2970.	2018-07-09 00:24:55 +09:00
Dean Herbert	ad51d95c1a	Merge branch 'master' into more-mania-conversion-fixes	2018-07-08 01:44:06 +09:00
Dean Herbert	f872c56deb	Merge branch 'master' into improve-button-system	2018-07-06 18:25:34 +09:00
Dean Herbert	0b30e6eb6a	Merge remote-tracking branch 'upstream/master' into peppy-improve-button-system	2018-07-06 17:55:02 +09:00
Dean Herbert	c025158735	Give VisibleState a default rather than nullable	2018-07-06 17:53:06 +09:00
Dean Herbert	c4952569cc	Merge branch 'master' into fix-menu-cursor-animation	2018-07-06 17:46:29 +09:00
Dean Herbert	54db287791	Remove casting	2018-07-06 17:45:39 +09:00
Dan Balasescu	8f3f872182	Merge branch 'master' into go-forward	2018-07-06 14:29:26 +09:00
Dan Balasescu	290812cf65	Merge branch 'master' into more-mania-conversion-fixes	2018-07-06 13:29:16 +09:00
Dean Herbert	dffe6af5d9	Merge branch 'master' into fix-menu-cursor-animation	2018-07-06 11:29:53 +09:00
Dean Herbert	7e28a993f7	Update framework	2018-07-05 21:08:53 +09:00
Dean Herbert	e5001b84bd	Merge remote-tracking branch 'upstream/master' into ekrctb-fix-volme-meter	2018-07-05 21:04:19 +09:00
Dean Herbert	5f5790f566	Merge branch 'master' into fix-menu-cursor-animation	2018-07-05 21:04:06 +09:00
Dean Herbert	625b9ead4c	Fix links from profile top scores to beatmaps not working correctly	2018-07-05 21:00:23 +09:00
Dean Herbert	8f04acc506	Add missing xmldoc	2018-07-05 20:16:55 +09:00
Dean Herbert	4f894969df	Merge branch 'master' into hitobject-samples	2018-07-05 19:43:19 +09:00
ekrctb	bbceac6cda	Apply renaming of wheel -> scroll	2018-07-05 16:50:04 +09:00
Dean Herbert	44aecdc3a0	Rename method to EquivalentTo	2018-07-05 15:00:02 +09:00
Dean Herbert	d11ba2df0e	Merge remote-tracking branch 'upstream/master' into smoogipoo-legacy-custom-banks	2018-07-05 14:53:31 +09:00
Dean Herbert	aea1299762	Merge branch 'master' into fix-footer-clicking-area	2018-07-05 13:39:53 +09:00
Dan Balasescu	7a4d3f9ffa	Merge branch 'master' into fix-popup-dialog-regression	2018-07-04 11:15:18 +09:00
ekrctb	d71b61c122	Rewrite disable mouse buttons logic	2018-07-03 20:04:15 +09:00
Dean Herbert	1e1ff8339e	Merge branch 'master' into non-null-nestedobjects	2018-07-03 19:43:46 +09:00
Dean Herbert	5fc17bacf3	Add "Select" action ... Allows progressing forwards in the interface	2018-07-03 18:39:15 +09:00
Dean Herbert	b33206c212	Fix selecting a button on a dialog causing both that button and exit to animate	2018-07-03 18:35:09 +09:00
Dean Herbert	2aae528e1c	Improve code quality of main menu button system	2018-07-03 18:23:41 +09:00
smoogipoo	73851fb194	Fix beatmap details not working for unranked beatmaps	2018-07-03 15:57:05 +09:00
ekrctb	f9f192ce34	Modify MenuCursor hightlight animation	2018-07-03 15:15:03 +09:00
Joehu	d476842c44	Fix FooterButton clicking area	2018-07-02 22:03:17 -07:00
Dean Herbert	627a5deff9	Merge branch 'master' into fix-menu-cursor-crash	2018-07-02 18:09:11 +09:00
Dean Herbert	6c848f135c	Add comment about last button invocation	2018-07-02 17:48:16 +09:00
Dan Balasescu	e99c05c85e	Merge branch 'master' into fix-dialog-popups	2018-07-02 17:41:16 +09:00
Dan Balasescu	6abb3fa62c	Merge branch 'master' into add-scroll-speed-keybinds	2018-07-02 17:26:05 +09:00
smoogipoo	f0ec117bcb	Merge remote-tracking branch 'origin/master' into add-scroll-speed-keybinds ... # Conflicts: # osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs	2018-07-02 17:21:18 +09:00
Dan Balasescu	118366303c	Merge branch 'master' into fix-leaderboard-placeholder	2018-07-02 17:17:40 +09:00
smoogipoo	9f405b0894	Don't hard-bail if config skin doesn't exist anymore	2018-07-02 16:49:07 +09:00
ekrctb	ae6fdd8e29	whitespace	2018-07-02 16:20:44 +09:00
smoogipoo	45a4187923	Tidy up lookups to NestedHitObjects	2018-07-02 16:10:56 +09:00
ekrctb	63746876c2	typo	2018-07-02 16:09:33 +09:00
ekrctb	341ffa4667	Fix MenuCursor crash	2018-07-02 16:07:52 +09:00
Dan Balasescu	e5947cc969	Merge branch 'master' into non-null-ruleset	2018-07-02 15:32:55 +09:00
smoogipoo	b61fe10f62	Adapt to IBindables	2018-07-02 15:07:18 +09:00
smoogipoo	4070c1a888	Merge remote-tracking branch 'origin/master' into non-null-ruleset ... # Conflicts: # osu.Game/Screens/Select/FilterControl.cs	2018-07-02 15:05:34 +09:00
Dan Balasescu	2c19790a97	Merge branch 'master' into fix-background-screen-crash	2018-07-02 15:01:59 +09:00
Dan Balasescu	50f561fbc2	Merge branch 'master' into allow-back-in-player	2018-07-02 14:44:58 +09:00
smoogipoo	189194ee8d	Don't include empty namespace in sample lookup	2018-07-02 14:35:03 +09:00
smoogipoo	7f832e34c0	Reorder sample bank property setters	2018-07-02 14:29:18 +09:00
Dean Herbert	596787c941	Standardise input handling of popup dialogs	2018-07-02 14:25:12 +09:00
smoogipoo	73fac2115a	Implement hitobject sample files	2018-07-02 14:20:35 +09:00
smoogipoo	310c4a7d6c	Make SampleInfo choose its own lookup name	2018-07-02 14:18:41 +09:00
smoogipoo	8b0c6a4c85	Make SampleControlPoint clone the existing SampleInfo	2018-07-02 14:17:19 +09:00
Dan Balasescu	37495c34fa	Fix possible nullreference	2018-07-02 13:51:47 +09:00
smoogipoo	b664d3ef81	Fix time being a part of controlpoint change comparisons	2018-07-02 13:34:25 +09:00
smoogipoo	aea50e770b	Use .Equals everywhere	2018-07-02 13:34:14 +09:00
Dean Herbert	812929fa05	Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess	2018-07-02 13:10:42 +09:00
Dean Herbert	b7893bc994	Remove unnecessary comments	2018-07-02 13:07:44 +09:00
smoogipoo	9f85c55915	Merge remote-tracking branch 'origin/master' into legacy-custom-banks	2018-07-02 12:34:51 +09:00
Dean Herbert	6a459efd8f	Don't allow Key.Escape	2018-07-02 11:04:40 +09:00
Dean Herbert	2c597874bf	Fix leaderboard showing placeholder briefly when entering song select	2018-07-01 18:17:02 +09:00
Dean Herbert	98fb2e03c0	Fix rulesets not loading in debug builds after running a release build	2018-07-01 18:03:15 +09:00
Dean Herbert	b1403d837e	Add back support for closing focused overlays using back key	2018-07-01 15:52:47 +09:00
Dean Herbert	7028767e50	Fix regression in HoldFocus behaviour	2018-07-01 14:08:34 +09:00
Dean Herbert	00fd5c8dbc	Fix regression causing binding settings to fail	2018-06-30 23:51:27 +09:00
Dean Herbert	754e072e01	Don't handle all actions	2018-06-29 23:35:14 +09:00
Dean Herbert	fb90a4924b	Only clear text in FocusedTextBox	2018-06-29 23:28:15 +09:00
Dean Herbert	7c0547b4ee	Replace todo	2018-06-29 23:16:05 +09:00
Dean Herbert	b9b1e77172	Merge branch 'master' into allow-back-in-player	2018-06-29 21:54:18 +09:00
Dean Herbert	ad28f88498	Fix protection change	2018-06-29 21:25:51 +09:00
Dean Herbert	cd47bd2cf8	Update framework	2018-06-29 21:06:43 +09:00
Dean Herbert	6a80a21078	Tidy up escape handling	2018-06-29 21:06:38 +09:00
smoogipoo	6d6436c8d3	Fix ruleset not getting updated if changed	2018-06-29 20:50:39 +09:00
smoogipoo	9187eb8626	SongSelect needs to recache as IBindable	2018-06-29 20:50:30 +09:00
Dean Herbert	8cf1553fd5	Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player	2018-06-29 20:30:42 +09:00
Dean Herbert	06bd3d4815	Use IBindable where possible	2018-06-29 20:28:28 +09:00
Dean Herbert	0e649b8866	Change logic	2018-06-29 20:16:24 +09:00
Dean Herbert	34fef3caba	Update exception type	2018-06-29 20:13:29 +09:00
Dean Herbert	9fce4eaccf	Merge branch 'master' into di-backed-ruleset	2018-06-29 19:33:12 +09:00
Dean Herbert	1c32951d4b	Ensure toolbar triggers updates to SongSelect's ruleset	2018-06-29 19:32:42 +09:00
Dean Herbert	182ac80881	Cache also as IBindable	2018-06-29 19:25:28 +09:00
Dean Herbert	6d6fcc953b	Trim lines	2018-06-29 19:25:20 +09:00
Dan Balasescu	513129d4a8	Merge branch 'master' into fix-dialog-overlay-sounds	2018-06-29 18:45:37 +09:00
smoogipoo	1e696d247e	Re-privatise	2018-06-29 18:33:28 +09:00
Dan Balasescu	8abcf68188	Merge branch 'master' into fix-negative-online-set-id	2018-06-29 18:29:36 +09:00
Dean Herbert	4212a9d0d7	Fix incorrect migration conditional	2018-06-29 18:23:53 +09:00
Dan Balasescu	f149289c83	Merge branch 'master' into fix-delta-patching	2018-06-29 18:01:56 +09:00
Dean Herbert	23aa2a2361	Merge branch 'master' into catch-scoring	2018-06-29 17:29:15 +09:00
Dean Herbert	e12ce3c2a8	Adjust xmldoc	2018-06-29 17:21:55 +09:00
Dean Herbert	098aeabc9e	Merge branch 'master' into catch-scoring	2018-06-29 17:16:14 +09:00
Dan Balasescu	845d1400dc	Merge branch 'master' into beatmap-defaults	2018-06-29 17:14:40 +09:00
Dean Herbert	c0b65a6a73	Change default IsBonus definition and remove unnecessary overrides	2018-06-29 17:07:08 +09:00
Dean Herbert	750f5a86c3	Fix catch test failing due to disabled bindable	2018-06-29 16:49:11 +09:00
Dean Herbert	0940715631	Merge branch 'master' into catch-scoring	2018-06-29 14:59:15 +09:00
smoogipoo	99068debc4	Split out into separate interface + add xmldocs	2018-06-29 13:24:33 +09:00
smoogipoo	756cabd5d0	Add a preprocess method to BeatmapProcessor	2018-06-29 12:45:48 +09:00