2953 Commits

Author	SHA1	Message	Date
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
smoogipooo	0739a76497	Make the playfield work in TestCaseGamefield.	2017-05-11 20:04:45 +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	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	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
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
Dean Herbert	df48204403	Fix OptionsOverlay stealing focus itself.	2017-05-11 13:56:21 +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	70ef503403	Merge branch 'master' into metadata	2017-05-11 12:23:00 +09:00
Dean Herbert	262b42efe3	Merge branch 'master' into new-option-search	2017-05-11 12:20:58 +09:00
EVAST9919	ea0add2354	Fixed update condition	2017-05-11 02:34:57 +03:00
EVAST9919	d55c97a08a	Stop progress as soon as we at 100%	2017-05-11 01:48:46 +03:00
EVAST9919	5b469eff69	Fixes	2017-05-10 10:33:02 +03:00
EVAST9919	d8f9e71b84	Applied suggested changes	2017-05-10 10:14:44 +03:00
EVAST9919	7b17e331c4	cleanups	2017-05-10 03:45:31 +03:00
EVAST9919	113df86304	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-10 03:23:51 +03:00
smoogipooo	e1ed785cbf	Update framework.	2017-05-09 21:00:40 +09:00
smoogipooo	89bfc0ff22	Fix exception.	2017-05-09 20:55:38 +09:00
smoogipooo	ea76eff1e1	Merge remote-tracking branch 'origin/master' into mania-notes	2017-05-09 19:31:35 +09:00
EVAST9919	315f1f1256	CI fixes	2017-05-09 06:23:03 +03:00
EVAST9919	2c92ee432b	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-09 06:05:46 +03:00
EVAST9919	2826c663fd	Apply suggested changes	2017-05-09 06:05:37 +03:00
Dean Herbert	ab1768ef80	Merge branch 'master' into tidy-up	2017-05-09 10:27:29 +09:00
EVAST9919	de2486b8e6	Moved timeLeft recalculation to property	2017-05-08 20:36:02 +03:00
EVAST9919	17d1ecb8f5	Use float type for progress value	2017-05-08 19:42:36 +03:00
Jorolf	9aaac4ab0c	Merge branch 'new-option-search' of github.com:Jorolf/osu into new-option-search	2017-05-08 18:30:33 +02:00
Jorolf	86f0173c6b	fix license header	2017-05-08 18:30:00 +02:00
EVAST9919	4b5e24cc36	Changed logic a bit	2017-05-08 19:14:19 +03:00
jorolf	3abf1b2a0b	Merge branch 'master' into new-option-search	2017-05-08 17:25:47 +02:00
EVAST9919	ae2186970c	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-08 18:16:16 +03:00
Huo Yaoyuan	cb21e98ae1	MatchCreate.ValidForResume = false.	2017-05-08 19:55:04 +08:00
Huo Yaoyuan	01616cc27c	Avoid extra MemoryStream in ArchiveReader.	2017-05-08 19:41:22 +08:00
Huo Yaoyuan	ced2332d20	Handle overlay in ToolbarOverlayToggleButton.	2017-05-08 19:37:41 +08:00
Huo Yaoyuan	e466380ee2	Generic infer for IJsonSerializable.DeepClone.	2017-05-08 19:33:37 +08:00
Huo Yaoyuan	345f80b775	Simplify constructor of SampleInfoList.	2017-05-08 19:30:55 +08:00
Huo Yaoyuan	dff05bec79	Use readonly fields.	2017-05-08 18:56:04 +08:00
Huo Yaoyuan	4c26a02e99	Remove unnecessary arguments in WorkingBeatmap's constructor.	2017-05-08 16:42:53 +08:00
Dean Herbert	9f1f926634	Add non-null assurance.	2017-05-08 12:45:55 +09:00