4625 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
EVAST9919	1f34cec5ce	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-11 22:22:57 +03:00
Dean Herbert	ffa59c6cb3	Support read-only channels, post to correct channel. ... Also cache drawable channels better.	2017-05-11 23:51:26 +09:00
Dean Herbert	a77049213d	Add basic hard-coded inefficient multi-channel support.	2017-05-11 23:10:48 +09:00
Dean Herbert	f044b95ce8	Allow OsuTabControl to handle non-enum types.	2017-05-11 23:10:19 +09:00
smoogipooo	0597a95db0	Resharper is too smart.	2017-05-11 22:17:10 +09:00
Dan Balasescu	f5399f7f2b	Merge branch 'master' into mania-timing-sections	2017-05-11 22:02:58 +09:00
Dan Balasescu	f11ffb99ac	Merge pull request #737 from peppy/general-fixes ... Update framework	2017-05-11 22:02:00 +09:00
smoogipooo	d57bb7e5fd	General cleanups.	2017-05-11 22:01:37 +09:00
smoogipooo	7b49ed1419	Fix up todo.	2017-05-11 21:57:28 +09:00
smoogipooo	9477024e7b	Merge remote-tracking branch 'origin/master' into mania-timing-sections	2017-05-11 21:48:20 +09:00
Dan Balasescu	02532e1dc8	Merge branch 'master' into general-fixes	2017-05-11 21:28:54 +09:00
Dan Balasescu	98e5b64d3f	Merge pull request #736 from peppy/oauth-fixes ... OAuth fixes	2017-05-11 21:26:28 +09:00
Dean Herbert	9a1c662d1f	Update framework	2017-05-11 21:25:43 +09:00
Dan Balasescu	08f5cbca51	Merge branch 'master' into oauth-fixes	2017-05-11 21:07:13 +09:00
Dean Herbert	ca32caf9e4	Merge branch 'master' into new-option-search	2017-05-11 21:04:37 +09:00
Dan Balasescu	c5f6a1ec93	Merge pull request #735 from peppy/general-fixes ... Fix broken test cases, remove some recursive lookup methods.	2017-05-11 21:03:27 +09:00
smoogipooo	f764ed8903	Remove unused class.	2017-05-11 20:05:11 +09:00
smoogipooo	0739a76497	Make the playfield work in TestCaseGamefield.	2017-05-11 20:04:45 +09:00
smoogipooo	ee219c18db	Make the playfield mask for now.	2017-05-11 20:04:28 +09:00
smoogipooo	6a79c8b66c	Make notes scroll with beat length.	2017-05-11 19:57:24 +09:00
Dean Herbert	c3d2cdd2f2	Fix typo	2017-05-11 19:49:28 +09:00
Dean Herbert	4e881644f6	Add thread-safety on access token validation logic.	2017-05-11 19:39:01 +09:00
Dean Herbert	7d221802a2	Fix refresh tokens not working correctly ... Turns out there's plenty of slashes in refresh tokens.	2017-05-11 19:38:57 +09:00
Dean Herbert	b258109a9e	Fix chat input box not always keeping focus as expected	2017-05-11 19:38:36 +09:00
Dean Herbert	a2f6d8a3e6	Fix broken test cases, remove some recursive lookup methods.	2017-05-11 19:38:28 +09:00
Dean Herbert	18b7c8e783	Merge pull request #730 from smoogipooo/mania-notes ... Mania notes	2017-05-11 18:16:33 +09:00
smoogipooo	5dd83067ee	Fix line endings.	2017-05-11 17:41:00 +09:00
smoogipooo	6cc54773e8	Fix taiko right background not scaling with the playfield as intended.	2017-05-11 17:18:22 +09:00
Dean Herbert	6fd95e0c52	Fix post-merge breakage	2017-05-11 17:16:01 +09:00
Dean Herbert	bc54b3c85f	Merge branch 'master' into mania-notes	2017-05-11 17:13:29 +09:00
Dean Herbert	b0e522345c	Combine DrawableHitObject classes into one	2017-05-11 17:07:46 +09:00
smoogipooo	5f30a89f76	General refactoring + renaming of TimingSectionContainer.	2017-05-11 16:09:48 +09:00
smoogipooo	c0c33c09ab	Fix merge error.	2017-05-11 16:08:54 +09:00
Dean Herbert	ec67b617ae	Add OptionsHeader class ... Makes search textbox anchor correctly. Also improves visual styling.	2017-05-11 16:06:18 +09:00
Dean Herbert	057d0cd523	Merge pull request #733 from smoogipooo/hitrenderer-improvements ... Hitrenderer improvements	2017-05-11 15:16:45 +09:00
smoogipooo	5365dff698	Merge branch 'hitrenderer-improvements' into mania-timing-sections	2017-05-11 15:05:26 +09:00
smoogipooo	3118dad52b	Subtract out playfield/hitrenderer/drawablehitobject changes.	2017-05-11 15:05:21 +09:00
smoogipooo	a762f820c6	Fix possible nullrefs.	2017-05-11 14:50:18 +09:00
smoogipooo	2d2d1beddd	More concrete method to determine if all hit objects have been judged. ... Covers the case where nested hit objects are involved.	2017-05-11 14:48:08 +09:00
smoogipooo	6445bea864	Make Playfield.HitObjects internal to playfields. ... Because not all playfields will be using this.	2017-05-11 14:44:11 +09:00
smoogipooo	da4be2f9d6	Move notes above judgement area but below keys.	2017-05-11 14:32:31 +09:00
smoogipooo	623912b40a	Fix playfield position.	2017-05-11 14:32:13 +09:00
smoogipooo	f6677125af	Merge branch 'mania-notes' into mania-timing-sections	2017-05-11 14:11:58 +09:00
smoogipooo	a6b71f8ccb	Resharper fixes.	2017-05-11 14:11:52 +09:00
Dean Herbert	df48204403	Fix OptionsOverlay stealing focus itself.	2017-05-11 13:56:21 +09:00
smoogipooo	cdf827df8e	CI fixes.	2017-05-11 13:55:52 +09:00
Dean Herbert	7d8af5f1da	Use SearchTextBox ... Correctly handle focus.	2017-05-11 13:23:31 +09:00
smoogipooo	94585672b6	Merge remote-tracking branch 'origin/master' into mania-notes	2017-05-11 13:01:00 +09:00
Dean Herbert	6c5490e31c	Merge remote-tracking branch 'upstream/master' into new-option-search	2017-05-11 12:59:19 +09:00
Dean Herbert	ab58acad81	Merge pull request #732 from peppy/general-fixes ... Update framework	2017-05-11 12:57:12 +09:00