3882 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	9bf861d0a4	Merge remote-tracking branch 'upstream/master' into peppy/pause-clean-up ... # Conflicts: # osu.Game/Screens/Play/FailOverlay.cs # osu.Game/Screens/Play/PauseOverlay.cs	2017-04-14 01:07:34 +09:00
Dan Balasescu	9b44ff3b8e	Merge pull request #629 from peppy/general-fixes ... General fixes	2017-04-14 01:05:26 +09:00
Dean Herbert	e62922ba64	Update framework.	2017-04-14 00:57:57 +09:00
Dean Herbert	262a2c9f0e	Add exception for failing.	2017-04-13 19:13:09 +09:00
Dean Herbert	5f8baf874d	Use interpolatedSourceClock's IsRunning value for consistency.	2017-04-13 18:31:23 +09:00
Dean Herbert	13f057f900	Give CursorTrail its own clock for the time being.	2017-04-13 14:14:12 +09:00
Dean Herbert	1f4e0b0251	Fix MosueUp and HighResolution events not being handled by MenuOverlays.	2017-04-13 13:03:07 +09:00
Dean Herbert	359fea7e25	Improve "escape" pressing logic in pause/fail menus.	2017-04-13 12:40:00 +09:00
Dean Herbert	94bf1d65b6	Fix thread race conditions on pausing close to a fail.	2017-04-13 11:41:08 +09:00
smoogipooo	3054697f98	Expose AccentColour/GlowColour from hud elements, and set from HudOverlay.	2017-04-13 10:04:12 +09:00
ocboogie	7b240d84da	Merge branch 'master' into master	2017-04-12 15:04:27 -07:00
Dean Herbert	37d458e562	Merge pull request #574 from Jorolf/details ... Beatmap Details	2017-04-12 21:19:14 +09:00
Dean Herbert	2c3fa30386	Metric -> Metrics.	2017-04-12 21:09:39 +09:00
Dean Herbert	00cd2c8372	Better comments.	2017-04-12 21:08:28 +09:00
ocboogie	32b87d12b5	Removed unneeded using	2017-04-12 04:54:24 -07:00
smoogipooo	2987a57588	Use formatter to add zeroes.	2017-04-12 20:28:04 +09:00
Dean Herbert	157ad17606	Merge branch 'master' into details	2017-04-12 20:25:51 +09:00
Dean Herbert	cfacfe8294	Merge pull request #622 from peppy/sliderbar-improvements ... Add special SliderBar sound behaviour when at extents.	2017-04-12 20:24:53 +09:00
Dan Balasescu	5bf71aae9c	Remove unused using.	2017-04-12 20:14:12 +09:00
Dean Herbert	1d1b291efc	Merge branch 'master' into sliderbar-improvements	2017-04-12 20:04:36 +09:00
Dan Balasescu	c20f8f5e8e	Merge pull request #625 from peppy/dependency-updates ... Update nuget packages.	2017-04-12 20:04:00 +09:00
ocboogie	6c6ef946bd	Some more clean up	2017-04-12 04:01:52 -07:00
Dan Balasescu	ce269eaebb	Merge branch 'master' into dependency-updates	2017-04-12 19:56:18 +09:00
Dean Herbert	ec6267c5b2	switch -> if.	2017-04-12 19:41:11 +09:00
Dean Herbert	c0338a82e7	Update nuget packages. ... Includes fix in OpenTK for focus issues.	2017-04-12 19:35:16 +09:00
ocboogie	d250dde537	Fixed repeat keys working for retrying	2017-04-12 02:50:03 -07:00
ocboogie	348dd71406	Fixed repeat keys working for resuming	2017-04-12 02:43:42 -07:00
Jorolf	98ce9e0724	remove ??	2017-04-12 11:25:32 +02:00
Jorolf	e285d33f8c	fails, retries and size not enforced	2017-04-12 11:05:10 +02:00
Jorolf	d2affe6867	requested changes	2017-04-12 10:52:24 +02:00
ocboogie	8cad09370d	Fixed pause and fail screen overlap	2017-04-12 00:20:41 -07:00
Dean Herbert	5676541173	Merge pull request #623 from smoogipooo/general-fixes ... General fixes	2017-04-12 15:19:21 +09:00
Dan Balasescu	6ab274abc0	Trim whitespace	2017-04-12 15:06:46 +09:00
smoogipooo	f8076ec792	Better comment.	2017-04-12 15:04:11 +09:00
smoogipooo	50a598dd05	Revert another masking container.	2017-04-12 15:01:54 +09:00
smoogipooo	32c3e34eb7	Revert "Better masking." ... This reverts commit 5d5040ee73.	2017-04-12 15:00:26 +09:00
smoogipooo	7a24e5f509	Revert "Implement proper masking support for taiko hit objects." ... This reverts commit 4e2ae72126.	2017-04-12 15:00:18 +09:00
smoogipooo	5d5040ee73	Better masking.	2017-04-12 14:34:49 +09:00
smoogipooo	04baa9eb72	Reset stage to normal height after tests.	2017-04-12 12:45:07 +09:00
smoogipooo	0c90ef79fa	Make TestCaseTaikoPlayfield work again.	2017-04-12 12:37:02 +09:00
Dean Herbert	9eb4802e83	Merge pull request #621 from ColdVolcano/better-beatmap-search ... Match stable search parameters when searching beatmaps	2017-04-12 12:12:04 +09:00
Dean Herbert	2964c04c14	Add special SliderBar sound behaviour when at extents.	2017-04-12 12:07:29 +09:00
Dean Herbert	d6fa51dc5c	Update SliderBar to use OnUserChange method.	2017-04-12 12:07:27 +09:00
smoogipooo	a922e67754	Because Ruleset only exposes HitRenderer, we need to have AspectAdjust in the base class.	2017-04-12 12:06:56 +09:00
smoogipooo	4e2ae72126	Implement proper masking support for taiko hit objects.	2017-04-12 12:06:52 +09:00
Dean Herbert	ca1fb81ff5	Merge pull request #620 from Poliwrath/master ... Small fix to the chat overlay to prevent crashing on the test	2017-04-12 10:45:21 +09:00
Poliwrath	dffdb100ab	Small fix to the chat overlay to prevent crashing on the test	2017-04-11 21:35:49 -04:00
ColdVolcano	50cb9e0fe7	Match stable search parameters	2017-04-11 18:07:54 -05:00
Jorolf	ed2f5d210e	condensed some commits because they were small or already reversed	2017-04-11 22:48:53 +02:00
Jorolf	50b6bcd574	Merge branch 'master' into details	2017-04-11 19:06:58 +02:00