1406 Commits

Author	SHA1	Message	Date
Dean Herbert	68a359698d	Fix potential nullref caused by test data.	2017-03-02 18:35:24 +09:00
Dean Herbert	51950eef43	Merge branch 'master' into master	2017-03-02 18:06:31 +09:00
Dean Herbert	963117f07d	Fix incorrect event order.	2017-03-02 17:41:33 +09:00
Dean Herbert	68857b573d	More code tidying.	2017-03-02 17:14:05 +09:00
Dean Herbert	c4871bbbf3	Tidy up code. ... The triggered bool is not even necessary because input is no longer handled after the OverlayContainer's state is set to hidden.	2017-03-02 17:08:00 +09:00
Dean Herbert	d1cd077e0d	Post-merge fixes.	2017-03-02 16:54:55 +09:00
Dean Herbert	ff5f0af2d3	Merge branch 'master' into popup-dialog	2017-03-02 16:42:20 +09:00
Dean Herbert	c4ca18eeba	Remove references to PassThrough.	2017-03-02 16:28:51 +09:00
DrabWeb	befdf68abe	Made DialogOverlay use PopupDialog's direct valfixed last dialogs not expiring, DialogOverlay actually hides now, fixed an issue where multiple buttons could be pressed at once	2017-03-01 18:41:00 -04:00
Thomas Müller	4d28696479	FlowDirection -> FillDirection	2017-03-01 20:15:38 +01:00
Thomas Müller	9c853b0465	Update framewörk	2017-03-01 19:33:01 +01:00
Thomas Müller	d46e68b36b	Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor ... # Conflicts: # osu-framework # osu.Game/Beatmaps/Drawables/BeatmapGroup.cs	2017-03-01 18:05:58 +01:00
Andrey Zavadskiy	a6504e8f22	Triggering fix	2017-03-01 13:36:53 +03:00
Andrey Zavadskiy	cc92459ee1	KeyCounter visibility	2017-03-01 13:22:01 +03:00
Dean Herbert	327300e9a7	Merge pull request #408 from Jorolf/pluginManager ... Disable mousewheel while playing	2017-03-01 13:10:47 +09:00
DrabWeb	d5d8352b62	Testing build	2017-02-28 17:09:31 -04:00
Jorolf	61cbcfd597	Merge branch 'master' into pluginManager	2017-02-28 20:34:56 +01:00
Thomas Müller	e462ec46c3	Merge branch 'master' into general-fixes	2017-02-28 19:02:07 +01:00
Thomas Müller	585d42f89f	Improve naming and correctness of triangles fading	2017-02-28 19:01:02 +01:00
Jorolf	522034020e	Moved Bindable init	2017-02-28 11:44:12 +01:00
DrabWeb	ce1798b8bc	DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay	2017-02-28 02:09:36 -04:00
DrabWeb	50d172be39	Added DialogManager(not wired up for desktop project yet)	2017-02-28 00:59:36 -04:00
Dean Herbert	654859a2a1	Restore potentially breaking change.	2017-02-28 13:56:35 +09:00
Dean Herbert	e60cead483	Merge remote-tracking branch 'upstream/master' into warning_fixes	2017-02-28 13:49:19 +09:00
DrabWeb	fbd9523596	Added beatmap delete dialog	2017-02-27 23:19:28 -04:00
DrabWeb	bc7fd3bd39	Remove uneccesary cast, move enter OK button to one liner	2017-02-27 22:38:44 -04:00
DrabWeb	94f34b985b	Forgot returns	2017-02-27 22:32:30 -04:00
DrabWeb	0ce8fff666	Enter key presses first OK button, 1-9 presses button at number	2017-02-27 22:31:23 -04:00
Dean Herbert	aa9582c0fa	Add exponential fall-off of triangles' alpha values.	2017-02-28 11:28:25 +09:00
DrabWeb	e8cae3b45e	Remove new override in DialogButton	2017-02-27 21:38:25 -04:00
DrabWeb	164f205ee5	Remove SpaceTextOnHover	2017-02-27 21:30:10 -04:00
DrabWeb	b3a231185b	Conform to naming conventions	2017-02-27 20:55:10 -04:00
DrabWeb	34ba3129a3	Removed background triangles	2017-02-27 20:44:27 -04:00
Jorolf	8b3477820f	Disable mousewheel while playing	2017-02-28 00:08:34 +01:00
DrabWeb	64d036fe81	Update to work with latest framework	2017-02-27 16:41:45 -04:00
DrabWeb	3094c01a40	Merge https://github.com/ppy/osu into popup-dialog	2017-02-27 16:40:04 -04:00
Thomas Müller	f96144f234	Merge branch 'master' into fix-db-deletion	2017-02-27 20:59:52 +01:00
default0	03889e6ca6	Update References to FlowStrategies ... References now use the Create*-names instead of the outdated Get*-names to create instances of FlowStrategies.	2017-02-27 16:55:55 +01:00
Andrey Zavadskiy	e06b3ecf2d	Input fix	2017-02-27 18:18:12 +03:00
Andrey Zavadskiy	9444ffd849	Removed redundant qualifiers	2017-02-27 17:37:38 +03:00
Andrey Zavadskiy	3487dfe236	Removed unused variables and parameters	2017-02-27 17:32:32 +03:00
Dean Herbert	e8b027130f	Remove unused variable.	2017-02-27 23:17:21 +09:00
Alex Amadori	8b336156f0	Merge remote-tracking branch 'upstream/master'	2017-02-27 14:55:44 +01:00
Dean Herbert	afdb95f4d5	Fix even more test regressions.	2017-02-27 20:39:04 +09:00
Dean Herbert	a22216d0b0	Update nuget packages.	2017-02-27 20:38:30 +09:00
Dean Herbert	777f673a46	Fix more test regressions.	2017-02-27 19:48:48 +09:00
Dean Herbert	4a4f1f4d82	Actually delete all related database entries, not just the set.	2017-02-27 18:27:38 +09:00
Dean Herbert	4da09713a9	Fix test case regression.	2017-02-27 18:09:27 +09:00
Dean Herbert	68dd3c02aa	Fix failing testcase (nullref).	2017-02-27 17:05:12 +09:00
Dean Herbert	7c602a2af3	Update framework.	2017-02-27 15:55:57 +09:00