12297 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	3de3bb31f8	Merge remote-tracking branch 'upstream/master' into aQaTL-mapping-del	2018-04-25 18:10:28 +09:00
Dean Herbert	306f05b7bd	Merge pull request #2432 from UselessToucan/ignore_beatmap_skin ... Add toggles for beatmap skins and hitsounds	2018-04-25 16:43:09 +09:00
Dean Herbert	6e6586909b	User pattern matching	2018-04-25 16:32:06 +09:00
Dean Herbert	4f53185d43	Invert logic to match existing toggles	2018-04-25 16:18:55 +09:00
Dean Herbert	c517b73375	Merge branch 'master' into ignore_beatmap_skin	2018-04-25 15:57:39 +09:00
Dean Herbert	fe0e73ef6a	Merge pull request #2405 from swoolcock/switchable-tabs ... Disable tab switching for add channel button	2018-04-25 15:57:13 +09:00
Dean Herbert	0c22e2d998	Merge branch 'master' into switchable-tabs	2018-04-25 15:41:52 +09:00
Dean Herbert	5b8793c390	Merge pull request #2446 from peppy/more-test-fixes ... Fix some occasionally failing tests	2018-04-25 15:34:05 +09:00
Dean Herbert	7388984d5f	Update framework	2018-04-25 14:57:08 +09:00
tgi74000	f41006def7	Set game ruleset to the score ruleset	2018-04-24 21:17:04 +02:00
Shane Woolcock	84bda7d23f	Update framework and ensure the add channel button is not switchable	2018-04-24 20:46:44 +09:30
Dean Herbert	45810e6220	Merge branch 'master' into ignore_beatmap_skin	2018-04-24 17:15:39 +09:00
Dean Herbert	57219ae9c6	Fix clashing variable name	2018-04-24 02:07:16 +09:00
Dean Herbert	3886e75959	Fix potentially missing group headers in beatmap carousel	2018-04-24 01:52:25 +09:00
Dean Herbert	f4c2d6b1a3	Fix wedge load test again ... Initial load was not being waited on for long enough.	2018-04-24 00:51:33 +09:00
Dean Herbert	a6da1b49e7	Merge pull request #2426 from peppy/net471 ... Update to .NET 4.7.1	2018-04-23 22:35:15 +09:00
Dean Herbert	93b77d9cfe	Remove annotation	2018-04-23 22:22:31 +09:00
Dean Herbert	843385af0d	Merge remote-tracking branch 'upstream/master' into net471	2018-04-23 22:00:11 +09:00
Dean Herbert	a9ddb46ade	Merge pull request #2334 from peppy/async-screens ... Make screens always load async (fixes stutter when entering editor)	2018-04-23 21:58:04 +09:00
Dean Herbert	9551b6914b	Fix UserProfile test failing when not logged in	2018-04-23 21:41:51 +09:00
Dean Herbert	1de9a63ac6	Merge branch 'master' into async-screens	2018-04-23 20:50:43 +09:00
Dean Herbert	7d09a39262	Fix remaining broken test	2018-04-23 20:50:16 +09:00
Dean Herbert	2952ba2433	Merge pull request #2427 from peppy/fix-badge-container ... Fix BadgeContainer being unable to handle null badges	2018-04-23 19:38:17 +09:00
Dean Herbert	eb7fe0b9e2	Merge branch 'master' into fix-badge-container	2018-04-23 19:13:34 +09:00
UselessToucan	254e9929be	Merge branch 'master' into ignore_beatmap_skin	2018-04-23 13:06:24 +03:00
Dean Herbert	2d1cef79d6	Fix instability in carousel item sorting	2018-04-23 19:01:01 +09:00
Dean Herbert	8b1b605c09	Update framework	2018-04-23 18:32:32 +09:00
Dean Herbert	ff3d3379f0	Merge remote-tracking branch 'upstream/master' into async-screens	2018-04-23 18:29:37 +09:00
Dean Herbert	2bd2facc90	Merge pull request #2444 from peppy/misc-fixes ... Fix new detections in rider 2018.1	2018-04-23 18:10:09 +09:00
Dean Herbert	194992936d	Use exceptions	2018-04-23 17:57:47 +09:00
Dean Herbert	0709a0926b	Merge branch 'master' into misc-fixes	2018-04-23 17:46:58 +09:00
Dan Balasescu	f0071eab4e	Merge pull request #2438 from peppy/fix-intro-race-condition ... Fix intro setting beatmap in background thread causing race conditions	2018-04-23 17:44:03 +09:00
Dean Herbert	2d82c0b5cd	Fix logical regression	2018-04-23 16:41:15 +09:00
Dean Herbert	1f73ad0da5	Merge branch 'master' into fix-intro-race-condition	2018-04-23 15:17:44 +09:00
Dean Herbert	6e16f2a3c3	Add assert to appease rider/r#	2018-04-23 15:03:41 +09:00
Dean Herbert	36a671e306	Fix new detections in rider 2018.1	2018-04-23 14:56:45 +09:00
Dean Herbert	0e57f685f8	Merge pull request #2429 from peppy/fix-skin-parse-errors ... Add error handling on a per-line level in LegacyDecoder	2018-04-22 10:53:43 +09:00
Dean Herbert	547b960c29	Update framework	2018-04-22 10:52:28 +09:00
Dean Herbert	64ddee5646	Change load order to ensure runner is loaded before blocking op	2018-04-22 04:26:27 +09:00
Dean Herbert	44a9aa529a	Test CI run with new changes	2018-04-22 03:51:17 +09:00
Dean Herbert	2c9b2aa0e7	Fix intro setting beatmap in background thread causing race conditions	2018-04-22 02:46:20 +09:00
TocoToucan	630980255e	Convert HoldToQuit.text to local variable	2018-04-21 20:35:24 +03:00
TocoToucan	e6d7136a92	Fix HoldToQuit appearance and set HoldToQuitButton.ExitAction	2018-04-21 20:21:09 +03:00
TocoToucan	21454d1f10	Revert "Add 'End replay' button" ... This reverts commit c34ef42f00.	2018-04-21 19:27:17 +03:00
TocoToucan	3b621db460	Implement CircularProgress filling	2018-04-21 19:25:21 +03:00
TocoToucan	633c775306	Initial HoldToQuit commit	2018-04-21 18:24:31 +03:00
TocoToucan	1ce38c7fc6	Visual settings: Ignore beatmap hitsounds	2018-04-20 18:30:41 +03:00
TocoToucan	606e088713	Visual settings: Ignore beatmap skin	2018-04-20 18:17:57 +03:00
Dean Herbert	7dd07503b2	Fix wrong targets on ruleset test configuration	2018-04-20 21:08:41 +09:00
Dean Herbert	e076107a19	Merge remote-tracking branch 'upstream/master' into peppy-net471	2018-04-20 21:07:11 +09:00