11832 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	fd54ae3c87	Simplify logic	2018-04-15 16:12:42 +09:00
Dean Herbert	069d48ac14	Remove unused variable	2018-04-15 15:29:00 +09:00
TocoToucan	671de4f6c2	Resolve merge conflicts	2018-04-14 15:11:28 +03:00
FreezyLemon	3ece54e1c3	make buttons only accept input when expanded ... both other states are "inactive"/invisible so should never accept keyboard input	2018-04-14 00:08:54 +02:00
tgi74000	73ba8e1c87	CI: remove unused directive	2018-04-13 16:10:01 +02:00
tgi74000	b23b0a445b	Add support for replay mods	2018-04-13 15:41:35 +02:00
Dan Balasescu	f59eef072d	Merge pull request #2389 from UselessToucan/ignored_input_handler ... Fix new input handlers not being enabled by default	2018-04-13 22:36:04 +09:00
smoogipoo	a6dfe0d4c9	Final framework update	2018-04-13 22:24:19 +09:00
smoogipoo	fe77417e03	Merge remote-tracking branch 'origin/master' into ignored_input_handler	2018-04-13 22:23:33 +09:00
Dan Balasescu	aadde08396	Merge pull request #2399 from FreezyLemon/update-nunit-3.10.1 ... Update NUnit to version 3.10.1	2018-04-13 22:22:37 +09:00
Dan Balasescu	258e17566c	Merge branch 'master' into update-nunit-3.10.1	2018-04-13 22:05:26 +09:00
Dean Herbert	a0f9f8d512	Update frramework again	2018-04-13 21:47:50 +09:00
smoogipoo	cf65833572	Reword xmldoc	2018-04-13 21:15:08 +09:00
smoogipoo	733f70cbd5	Merge remote-tracking branch 'origin/master' into instant-hide-screenshot	2018-04-13 21:13:09 +09:00
smoogipoo	34adb2527c	A lot more protection from outsiders	2018-04-13 21:12:33 +09:00
smoogipoo	cd594ce12b	BDL cache screenshot manager	2018-04-13 20:46:01 +09:00
FreezyLemon	4b3a129738	bump NUnit to version 3.10.1	2018-04-13 13:19:52 +02:00
Dean Herbert	9f5a52b641	Merge remote-tracking branch 'upstream/master' into UselessToucan-ignored_input_handler	2018-04-13 19:54:15 +09:00
Dean Herbert	e962bc312e	Update framework	2018-04-13 19:53:29 +09:00
Dean Herbert	81f0649e44	Merge remote-tracking branch 'origin/master' into tgi74-rightclickscrolling	2018-04-13 19:50:44 +09:00
Dan Balasescu	632befb210	Merge pull request #2378 from peppy/fix-line-endings ... Normalize line endings to LF	2018-04-13 19:47:30 +09:00
tgi74000	1a2b1d4c98	Use the already existent RightMouseScrollbar field	2018-04-13 11:32:33 +02:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Dean Herbert	f99503b60c	Add new gitattributes	2018-04-13 18:19:38 +09:00
Dean Herbert	5f020074e0	Merge pull request #2332 from LittleEndu/alt-eagerselect ... Make beatmap carousel select a random beatmap when there was no previous selection	2018-04-13 18:11:45 +09:00
tgi74000	e3cd0ef200	Add right click scrolling in song select (and its option)	2018-04-13 11:09:49 +02:00
Dean Herbert	a1a7e63646	Merge branch 'master' into ignored_input_handler	2018-04-13 18:05:12 +09:00
Endrik Tombak	d9f587edff	Merge remote-tracking branch 'upstream/master' into alt-eagerselect	2018-04-13 11:55:35 +03:00
smoogipoo	0235eba9de	Make TakeScreenshotAsync await on the internal task	2018-04-13 17:51:09 +09:00
smoogipoo	2e5bbe7074	Don't expose CursorOverrideContainer via DI + internalise access	2018-04-13 17:36:38 +09:00
smoogipoo	826a8552e5	Reword options item to include "screenshot"	2018-04-13 17:30:02 +09:00
smoogipoo	ebe36f0612	Instantly hide cursor for required frames while taking screenshot	2018-04-13 17:27:10 +09:00
Dean Herbert	06efddd4b4	Merge pull request #2394 from UselessToucan/beatmap_set_overlay_difficulties_ordering ... Fix incorrect ordering of difficulties retrieved from API	2018-04-13 17:09:48 +09:00
Dean Herbert	f7c50dee65	Merge branch 'master' into beatmap_set_overlay_difficulties_ordering	2018-04-13 16:48:43 +09:00
Dan Balasescu	0871c16075	Merge pull request #2390 from Joehuu/lowercase-back-button ... Lowercase back button	2018-04-13 14:25:23 +09:00
Dan Balasescu	2699ad8c89	Merge branch 'master' into lowercase-back-button	2018-04-13 14:14:18 +09:00
Dean Herbert	68d865bbd1	Merge pull request #2396 from Joehuu/remove-composer-from-player-loader ... Remove composer from player loader	2018-04-13 13:08:13 +09:00
Joehu	128446e51d	Remove composer from player loader	2018-04-12 16:46:46 -07:00
TocoToucan	9acea6eab0	Order beatmap difficulty icons correctly	2018-04-12 19:33:30 +03:00
Joehu	61d6f52a53	Lowercase back button	2018-04-12 08:26:25 -07:00
Joehu	463b189d2f	Remove unused using directives	2018-04-12 08:13:24 -07:00
Joehu	df4b64effc	Rename rankStatus to searchCategory	2018-04-12 08:03:19 -07:00
Dean Herbert	ea24006a66	Merge pull request #2372 from smoogipoo/remove-gamefield-test ... Remove TestCaseGamefield	2018-04-12 23:50:16 +09:00
Joehu	f18594887b	Move enum to SearchBeatmapSetsRequest	2018-04-12 07:49:23 -07:00
TocoToucan	7c3441e2d0	ActiveInputHandlers -> IgnoredInputHandler	2018-04-12 17:06:35 +03:00
Dean Herbert	1e6244afe1	Merge branch 'master' into remove-gamefield-test	2018-04-12 21:37:04 +09:00
Dean Herbert	3de460f84c	Merge pull request #2356 from smoogipoo/editor-clock ... Move seeking logic into a custom editor clock	2018-04-12 21:36:50 +09:00
Dean Herbert	127f0d7b01	Fix smoogipoo's comments	2018-04-12 21:17:17 +09:00
Dean Herbert	0ca703beaa	Add some missing xmldoc	2018-04-12 21:04:45 +09:00
Dean Herbert	b50bad0072	Merge branch 'master' into editor-clock	2018-04-12 19:29:58 +09:00