4384 Commits

Author	SHA1	Message	Date
Jorolf	bae1340b50	mask the settings overlay	2017-08-19 17:00:01 +02:00
smoogipooo	3ea7be1ccf	Fix selecting unranked beatmaps in song select crashing the game. Fixes #1134.	2017-08-19 12:28:54 +09:00
Dean Herbert	86d97aa16b	Merge branch 'master' into taiko-timingchanges-2	2017-08-18 22:44:36 +09:00
Dean Herbert	c34033c94a	Merge branch 'master' into fix-track-not-resetting	2017-08-18 22:31:59 +09:00
Dean Herbert	bc7621607a	Merge upstream/master in.	2017-08-18 22:20:45 +09:00
Dean Herbert	d6249e7a63	Add support for binding mouse buttons to actions	2017-08-18 20:01:41 +09:00
Shane Woolcock	4901ac9e35	Add some comments explaining why the Track is being forcefully added to the TrackManager	2017-08-18 18:01:18 +09:30
Dean Herbert	ffc8f763e5	Merge branch 'master' into fix-track-not-resetting	2017-08-18 17:24:22 +09:00
smoogipooo	90885a31ae	Round 2 of CI fixes.	2017-08-18 15:09:54 +09:00
smoogipooo	a47b6526a2	Fix CI issues.	2017-08-18 14:40:36 +09:00
Dan Balasescu	68303accef	Merge branch 'master' into make-rulesetinfo-iequatable	2017-08-18 14:28:42 +09:00
Dan Balasescu	0f635c77b3	Merge branch 'master' into fix-ruleset-changing	2017-08-18 13:42:29 +09:00
Dan Balasescu	cc6a5824f0	Merge branch 'master' into fix-ruleset-changing	2017-08-18 13:40:52 +09:00
Dan Balasescu	243a6ca774	Update OsuLegacyDecoder.cs	2017-08-18 13:27:16 +09:00
Dan Balasescu	5a9375f336	Merge branch 'master' into fix-duplicate-difficulty-control-points	2017-08-18 13:12:00 +09:00
Dan Balasescu	f5c3af2f20	Merge branch 'master' into fix-nullref	2017-08-18 12:38:20 +09:00
Dean Herbert	02aa38d1c2	Merge branch 'master' into toolbar-button-swap	2017-08-18 11:18:19 +09:00
Dean Herbert	d919d8b0a3	Merge branch 'master' into onscreendisplay-fix	2017-08-18 11:06:12 +09:00
Dean Herbert	e4b832e8a6	Fix a possible nullref when login fails	2017-08-18 10:49:41 +09:00
PoULkY	cc39aad7f8	Fix OsuButton doesn't implement IFilterable	2017-08-18 01:23:44 +07:00
MrTheMake	6118209200	Fix unlit initial state of the OnScreenDisplay	2017-08-17 18:46:16 +02:00
Shane Woolcock	df683d9114	Fix multiple difficulty control points sharing the same time and thus confusing slider velocity calculations	2017-08-17 23:28:26 +09:30
tgi74000	dc31a0f0ac	Merged ppy/master	2017-08-17 13:01:42 +02:00
Dean Herbert	f459794665	Update MainSettings.cs	2017-08-17 18:11:15 +09:00
Dean Herbert	58b1e9c954	Remove unused DI retrieval	2017-08-17 17:47:55 +09:00
Dean Herbert	a44ff5a2c2	Fix regression causing global hotkeys to no longer work	2017-08-17 17:47:44 +09:00
Dean Herbert	a19fc28cff	Visually improve settings transitions and back button	2017-08-17 17:31:14 +09:00
smoogipooo	cceeb864d5	Fix hitobjects in TestCaseHitObjects not receiving actions.	2017-08-17 12:16:33 +09:00
Dan Balasescu	69a3251f61	Merge branch 'master' into toolbar-button-swap	2017-08-17 10:39:02 +09:00
Thomas Müller	4ef1be3080	More localised key binding hover colour logic	2017-08-17 08:43:45 +09:00
MrTheMake	94d664a626	Swap the order of the social and chat toolbar buttons	2017-08-16 17:00:30 +02:00
Dean Herbert	0c19202b9a	Add basic back button	2017-08-16 23:20:18 +09:00
Dean Herbert	09089a3126	Fix potential nullref	2017-08-16 23:20:08 +09:00
Dean Herbert	e64f455ff7	Escape to cancel, again	2017-08-16 23:01:10 +09:00
Dean Herbert	c41ba7b704	Update with latest framework changes	2017-08-16 22:56:32 +09:00
Dean Herbert	71f83dbdfa	Add null check for safety	2017-08-16 22:56:32 +09:00
Dean Herbert	5ebec53970	Integrate key binding config with main settings	2017-08-16 22:56:32 +09:00
Dean Herbert	7e21ddb5eb	Remove usage of HideOnEscape	2017-08-16 22:56:32 +09:00
Thomas Müller	16372d9b45	Merge branch 'master' into key-config-settings	2017-08-16 17:48:00 +09:00
Dean Herbert	7e1fc47b76	Fix forgotten rename	2017-08-16 17:43:01 +09:00
Dean Herbert	3df51540e1	Code review fixes	2017-08-16 17:39:57 +09:00
Dean Herbert	54698f2d8f	Use IntAction instead of new	2017-08-16 17:27:09 +09:00
Dean Herbert	dc82a88bb8	Improve namespaces of key bindings	2017-08-16 17:24:01 +09:00
Dean Herbert	25a3835c3c	Cancel pending sidebar expansion when a button is clicked	2017-08-16 17:06:20 +09:00
Dean Herbert	89987229de	Merge remote-tracking branch 'origin/is-alive' into key-config-settings	2017-08-16 15:49:43 +09:00
Dean Herbert	a5007fc64f	Fix some remaining usage of local InputManager instances	2017-08-16 13:07:18 +09:00
Dean Herbert	2c7f0629ef	Merge remote-tracking branch 'upstream/master' into is-alive	2017-08-16 12:11:32 +09:00
Dean Herbert	c221472d6e	Code tidy-ups	2017-08-16 01:19:21 +09:00
Dean Herbert	72eb082f91	Use .Equals	2017-08-16 01:14:37 +09:00
Dean Herbert	9c75df884f	Add initial implementation of KeyConfiguration overlay	2017-08-16 00:17:33 +09:00
Dean Herbert	2bd0981738	Improve default key binding logic ... Defaults will be added to the database as long as the database has unbalanced counts for any actions.	2017-08-15 23:59:58 +09:00
Dean Herbert	3bee36f6a2	Add index to Action column ... Is used for default assignment	2017-08-15 23:59:06 +09:00
Dean Herbert	143ff695ef	Remove unused using statements	2017-08-15 17:44:04 +09:00
Dean Herbert	6ded194c53	Remove all usage of DI to retrieve InputManager ... Uses GetContainingInputManager instead, as per framework changes.	2017-08-15 14:30:50 +09:00
Dean Herbert	97ac8e1a64	Update usages of IsAlive/IsLoaded in line with framework changes	2017-08-15 13:57:48 +09:00
Dean Herbert	70f148f0b4	Fix icons on skip button	2017-08-15 09:30:46 +09:00
Dean Herbert	46bfa4db29	Load defaults, pass around live IEnumerable, add PK for updating	2017-08-14 22:31:23 +09:00
Dean Herbert	7c9d6c9c83	Initial refactoring of key binding logic	2017-08-14 20:19:25 +09:00
Dean Herbert	dccefe1c0e	Make the settings sidebar optional ... Also removes an unnecessary secondary list of SidebarButtons by using generic containers.	2017-08-14 14:40:48 +09:00
Dean Herbert	66fa84a451	Make settings more modular	2017-08-14 13:09:59 +09:00
Dean Herbert	c57c106b9d	Merge branch 'master' into fix-leaderboard-icons	2017-08-14 12:54:54 +09:00
Dean Herbert	9e1ffa27dc	Fix leaderboard icons not displaying correctly	2017-08-14 12:52:20 +09:00
Dan Balasescu	bdf064e6ee	Merge branch 'master' into MillhioreF/fix_stable_import_errors	2017-08-14 12:40:35 +09:00
MillhioreF	e216bfcf10	Recommended fixes (obsolete try/catch, fix infinite loop during variable parsing in a better way)	2017-08-13 00:40:05 -05:00
Shane Woolcock	d19c8f56be	Make RulesetInfo implement IEquatable since EqualityComparer was sometimes giving false negatives and causing Bindable observers to fire	2017-08-13 15:03:01 +09:30
Dean Herbert	94b8d1de8b	Merge branch 'master' into fix-ruleset-changing	2017-08-13 11:14:41 +09:00
Dean Herbert	fe2911f165	Fix some formatting issues	2017-08-13 10:36:57 +09:00
Dean Herbert	b6fb68c6e2	Update framework	2017-08-12 22:13:40 +09:00
Dean Herbert	99458aab48	Propagate framework updates	2017-08-12 19:54:07 +09:00
Shane Woolcock	096e574401	Selecting a beatmap set no longer updates the ruleset to the first map of that set (since it causes the carousel to refilter)	2017-08-12 19:52:09 +09:30
Shane Woolcock	e48c5898bd	Ensure the Track for the selected beatmap is added to the TrackManager. Fixes the problem where a beatmap would be stuck at 100% if it is replayed.	2017-08-11 17:26:30 +09:30
Dean Herbert	48d4ed55e9	Move a lot of code to framework	2017-08-11 16:11:46 +09:00
Dean Herbert	8ae010f62b	Don't pass through repeat events if we've already handled an action	2017-08-11 11:46:21 +09:00
Dean Herbert	a93a92a2bb	Remove GlobalHotkeys	2017-08-10 19:52:45 +09:00
Dean Herbert	641b3bd27e	Improve documentation	2017-08-10 19:36:47 +09:00
Dean Herbert	798fff00b2	Remove shortcomings, remove InputState.Data usage, make everything amazing ... No more casting!	2017-08-10 19:28:24 +09:00
Dean Herbert	1fe273cbc0	Move GameplayCursor to osu! ruleset and make work with OsuActions	2017-08-10 18:37:41 +09:00
Dean Herbert	e9a11ebc9f	Use new population methods and implement osu! ruleset actions	2017-08-10 18:31:12 +09:00
Dean Herbert	b6bb07c0b5	Add ConcurrentActionModes to support osu! gameplay more easily	2017-08-10 18:28:22 +09:00
Dean Herbert	c82db54fb5	Rename OsuAction to GlobalAction	2017-08-10 17:22:08 +09:00
Dean Herbert	6ba5bdf1e6	Add description attributes to all actions	2017-08-10 17:14:30 +09:00
Dean Herbert	da50101c25	Don't match on partial key chords when concurrent is disallowed	2017-08-10 16:45:33 +09:00
Dean Herbert	d9e36237c7	Move all OsuGame events to OsuAction	2017-08-10 16:45:10 +09:00
Dean Herbert	30bd1d70b5	ActionMapping doesn't support concurrent actions by default ... But can when required. Also supports key combination bindings now.	2017-08-10 16:08:43 +09:00
MillhioreF	e42c279229	More generic catching for broken hitobject strings	2017-08-10 01:50:20 -05:00
MillhioreF	2e5a7374a8	Actually use mapName whoops	2017-08-10 01:49:34 -05:00
MillhioreF	f819ffce2b	Make the legacy decoder more resilient against leading linebreaks	2017-08-10 00:08:39 -05:00
MillhioreF	c16dbc05aa	Add new error for malformed (too many variables) hit objects during import	2017-08-09 23:41:22 -05:00
MillhioreF	64d92c1557	Fix infinite loop when importing maps that have storyboard elements with '$' in the filename	2017-08-09 23:31:18 -05:00
MillhioreF	a8cf7ff93a	Add a better error message for corrupt maps with no .osu files	2017-08-09 23:27:13 -05:00
MillhioreF	10321497ca	Add decoder entries for v3/4	2017-08-09 21:21:43 -05:00
tgi74000	8dd4f513e7	Symplified migration using MigrateTable<> instead of commands	2017-08-09 11:55:36 +02:00
tgi74000	c0642ad6d3	Added database migration	2017-08-09 10:54:03 +02:00
Dean Herbert	720bd38d8e	Fix CI issues	2017-08-09 17:30:37 +09:00
Dean Herbert	34b12fbfa4	Add global actions; improve default assignment	2017-08-09 17:10:32 +09:00
smoogipooo	d83c218e08	Remove various scrolling container optimisations (removing when not alive).	2017-08-09 16:19:09 +09:00
tgi74000	b00d1cd077	Merged ppy:master	2017-08-09 08:49:29 +02:00
tgi74000	a751c19cf7	Moved JsonProperty file_md5 and added file_sha2	2017-08-09 08:36:15 +02:00
Dean Herbert	3b48a6c668	Fix CI issues	2017-08-09 15:15:41 +09:00
Dean Herbert	976cff9af6	Merge remote-tracking branch 'upstream/master' into catch ... # Conflicts: # osu.Desktop.Tests/Visual/TestCaseScrollingPlayfield.cs	2017-08-09 15:08:43 +09:00