1542 Commits

Author	SHA1	Message	Date
smoogipooo	26b81a14cf	Ctrl+Shift+D at main menu to open up drawings, until we get a permanent place for it.	2017-03-03 12:42:19 +09:00
smoogipooo	062d8ddc7c	Don't handle menu buttons when Shift or Ctrl or Alt is pressed.	2017-03-03 12:41:45 +09:00
John Leuenhagen	417c7e341a	Password textbox now performs login on enter	2017-03-02 22:41:14 -05:00
smoogipooo	febdfd5de4	Make groups fill up in round robin way, rather than sequentially.	2017-03-03 12:06:35 +09:00
Dean Herbert	78a0bce3bb	Merge pull request #423 from peppy/general-fixes ... Move PauseOverlay to correct namespace.	2017-03-03 11:32:42 +09:00
Dean Herbert	70f046092c	Merge pull request #424 from DrabWeb/namespace-fix ... Fix BeatmapDeleteDialog namespace	2017-03-03 11:32:35 +09:00
Huo Yaoyuan	ef13cdbff7	Disallow copying from OsuPasswordTextBox.	2017-03-03 10:00:39 +08:00
DrabWeb	f872330902	Fix BeatmapDeleteDialog namespace	2017-03-02 21:28:05 -04:00
DrabWeb	7a4b9c5571	osu.Game.Overlays.BeatmapOptions -> osu.Game.Screens.Select.Options	2017-03-02 21:20:30 -04:00
Dean Herbert	3a8246f56d	Move PauseOverlay to correct namespace.	2017-03-03 10:17:39 +09:00
Dean Herbert	f81836f635	Merge remote-tracking branch 'upstream/master' into no-negative-margin	2017-03-03 09:58:40 +09:00
Thomas Müller	c732890664	Remove usages of negative Margin / Padding ... Replaces such usage with more sensible settings, like changing the position or size.	2017-03-02 19:16:31 +01:00
Mikal Stodal	c88c6c4c62	More summaries	2017-03-02 15:37:45 +01:00
Dean Herbert	ecd3453774	Fix potential nullref.	2017-03-02 22:17:14 +09:00
Mikal Stodal	dfa21444b4	Ensure correct exception logged	2017-03-02 14:10:32 +01:00
DrabWeb	fcda2f0e4e	Fixed shadow	2017-03-02 09:05:10 -04:00
Dean Herbert	f9b87ad08c	Fix selection on entry to song select. ... Also only shows sets with beatmaps for current play mode.	2017-03-02 22:02:32 +09:00
Dean Herbert	9ea83230aa	Formatting fixes.	2017-03-02 22:01:53 +09:00
Dean Herbert	ef8a35f5cc	Fix Toolbar's mode changer not working correctly.	2017-03-02 22:01:24 +09:00
DrabWeb	b856fb5991	Implemented beatmap options overlay	2017-03-02 08:40:55 -04:00
Mikal Stodal	2498305174	Merged branch master into remove-source-on-import	2017-03-02 13:39:22 +01:00
Mikal Stodal	47162a3e91	Update summary and commentary	2017-03-02 13:39:02 +01:00
Mikal Stodal	6661195e92	Only add set if ID is 0	2017-03-02 13:36:01 +01:00
Dean Herbert	e399d6c6d1	Use bindable for PlayMode.	2017-03-02 21:16:58 +09:00
Dean Herbert	ab91333b21	Replace missing perfect icon with cross.	2017-03-02 20:29:48 +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
Dean Herbert	4163569e57	Fix some license headers.	2017-03-02 18:45:20 +09:00
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
Dean Herbert	8040d6a03f	Fix CursorTrail corruption by resetting on load.	2017-03-02 16:08:10 +09:00
DrabWeb	482be9f451	Remove AvailableMods	2017-03-02 02:04:26 -04:00
DrabWeb	367d6d694c	Merge https://github.com/ppy/osu into mod-overlay	2017-03-02 01:44:18 -04:00
DrabWeb	37ed1b3d09	Moved key press select mods to ModSection	2017-03-02 01:24:32 -04: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
smoogipooo	b0d5d88fe9	Fix slight threading scheduling issue.	2017-03-02 12:26:42 +09:00
smoogipooo	1a4f0a92a5	Add saving + reloading (to/from drawings_results.txt) functionality.	2017-03-02 12:20:31 +09: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	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
Mikal Stodal	418ae24fea	Document private method getBeatmapSet(path)	2017-03-01 17:57:57 +01:00
Mikal Stodal	1e901a1604	Only set StoryBoardFile once	2017-03-01 17:08:12 +01:00
Dean Herbert	b6e7e054c3	wankoz	2017-03-01 22:56:20 +09:00
Dean Herbert	58ae9e888d	Basic partial replay support.	2017-03-01 22:04:20 +09:00
Andrey Zavadskiy	a6504e8f22	Triggering fix	2017-03-01 13:36:53 +03:00
smoogipooo	35d246b59d	Merge remote-tracking branch 'origin/master' into tournament_drawings	2017-03-01 19:32:33 +09: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
Mikal Stodal	eff66a1da6	Only delete on successful import.	2017-02-28 14:46:16 +01:00
Mikal Stodal	d54a75a5c5	Delete file after importing BeatmapSet w/error handling, ... also changed batch-commit of multiple sets to database.	2017-02-28 14:35:42 +01:00
Jorolf	522034020e	Moved Bindable init	2017-02-28 11:44:12 +01:00
DrabWeb	c3a81127f2	Updated to work with latest framework	2017-02-28 02:25:38 -04:00
DrabWeb	570c95cb98	Merge https://github.com/ppy/osu into mod-overlay	2017-02-28 02:22:59 -04: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
smoogipooo	1e15318da6	Add background.	2017-02-28 10:26:37 +09: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
smoogipooo	44f3dfa3fe	Make it display by default.	2017-02-27 23:38:37 +09: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
smoogipooo	fc33bf4761	Add drawings config.	2017-02-27 23:29:18 +09:00
smoogipooo	9d731af01b	Finish it up, slightly hackishly, but that's ok.	2017-02-27 23:29:17 +09:00
smoogipooo	5f3e484353	Add scrolling teams container.	2017-02-27 23:29:06 +09: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