2485 Commits

Author	SHA1	Message	Date
smoogipooo	0a1376c2db	Remove PlayMode game-wide.	2017-04-15 05:22:41 +09:00
smoogipooo	a89af273be	Make BeatmapInfo expose Ruleset instead of PlayMode.	2017-04-15 05:01:36 +09:00
smoogipooo	59bfc7abad	Move statics to RulesetCollection to avoid conflicts later on.	2017-04-15 04:53:37 +09:00
Dan Balasescu	31ce66bfdc	Trim whitespace.	2017-04-15 01:31:42 +09:00
Dan Balasescu	3de3b94978	Merge branch 'master' into song-progress-graph	2017-04-15 01:29:02 +09:00
Dean Herbert	52ddc414d5	Fix errors.	2017-04-14 20:17:17 +09:00
Dean Herbert	ed3956eca5	Make comma separators optional.	2017-04-14 20:09:01 +09:00
Dean Herbert	ac3b435f00	Merge remote-tracking branch 'upstream/master' into hud-improvements ... # Conflicts: # osu.Game.Modes.Osu/Scoring/OsuScoreProcessor.cs	2017-04-14 19:29:59 +09:00
Dean Herbert	9d753a7798	Merge branch 'master' into song-progress-graph	2017-04-14 19:24:13 +09:00
Dean Herbert	98544a8077	Fix unsynchronised tweening.	2017-04-14 19:20:07 +09:00
Dean Herbert	ea0631ede8	Encapsulate progress update logic better.	2017-04-14 18:23:34 +09:00
Dean Herbert	acd7a5b254	Hook up beatmap object density to progress display.	2017-04-14 17:58:37 +09:00
Dean Herbert	6421f040dd	Fix SongProgress handling escape.	2017-04-14 15:27:24 +09:00
Dean Herbert	8c41707ac7	Fix incorrect default state. Handle input better.	2017-04-14 14:40:52 +09:00
Dean Herbert	09195a03a2	Merge remote-tracking branch 'upstream/master' into song-progress-graph ... # Conflicts: # osu.Game/Overlays/DragBar.cs	2017-04-14 11:25:00 +09:00
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
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	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
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
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	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
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
Jorolf	d4e5f55091	the power of linq	2017-04-11 18:43:48 +02:00
Dan Balasescu	3b60ca3c1c	Merge branch 'master' into leaderboard-api	2017-04-12 00:14:24 +09:00
Dan Balasescu	bc98e53aff	I helped.	2017-04-12 00:09:45 +09:00
Jorolf	9026880495	fix	2017-04-11 14:40:12 +02:00
Jorolf	9dd8920c2c	🤔 I hope this works	2017-04-11 14:22:13 +02:00
Jorolf	bfebba3a20	null reference fixes	2017-04-11 14:12:23 +02:00
Jorolf	fb5952186c	changes and fixes	2017-04-11 14:02:56 +02:00
Dean Herbert	1a1607aaaa	Improve the look of the transition on hotkey retry (and retry in general).	2017-04-11 19:58:57 +09:00
Dean Herbert	2bb50ff082	Add commas to score counter.	2017-04-11 19:21:05 +09:00
Dean Herbert	c615762da6	wip	2017-04-11 18:56:25 +09:00
Dean Herbert	7d7bea7198	Fix crash on restart after update. ... Also make update process more graceful.	2017-04-11 18:40:39 +09:00
Dean Herbert	9732110bd9	Update TransformTo methods in line with framework changes.	2017-04-11 17:25:56 +09:00
Dean Herbert	001836f535	Rename variables and make public for now.	2017-04-11 16:48:11 +09:00
Dean Herbert	7ca0d6d117	Adjust cursor popin/out to make it less ugly.	2017-04-11 16:44:12 +09:00
Dean Herbert	f8c6ce15c3	Fix weird RollingCounter behaviour.	2017-04-11 16:37:36 +09:00
Dean Herbert	dc3a2d45fe	Move API lookup from BeatmapDetailArea to Leaderboard.	2017-04-11 16:36:50 +09:00
Dean Herbert	ecfe68d6fb	Hide deprecated API storage variables and populate Score.User automatically.	2017-04-11 16:36:47 +09:00
Dean Herbert	24fea2809b	Map beatmap md5 from online response to BeatmapInfo.	2017-04-11 13:44:55 +09:00
Jorolf	ad41fd5c1a	more unnecessary stuff	2017-04-10 16:49:48 +02:00
Jorolf	412d6a14ca	removed something unnecessary	2017-04-10 16:45:34 +02:00
Jorolf	a597149b7f	Merge branch 'details' of github.com:Jorolf/osu into details	2017-04-10 16:42:42 +02:00
Jorolf	24b4b3ad7d	update to everything	2017-04-10 16:42:23 +02:00
Dean Herbert	c6a24bb549	Merge branch 'master' into details	2017-04-10 20:07:13 +09:00
Dan Balasescu	ba4d654a21	Merge branch 'master' into has-bindable-value	2017-04-10 19:40:37 +09:00
Dean Herbert	b9ce98efd6	Add AspectAdjust to HitRenderer to allow playfield to consume ful HitRenderer size when needed.	2017-04-10 19:22:27 +09:00
Dean Herbert	960ea27684	Make all Playfields completely relative.	2017-04-10 19:22:27 +09:00
Dean Herbert	43a4657540	Remove unnecessary AlwaysPresent.	2017-04-10 17:26:05 +09:00
Dean Herbert	3a01cfccee	Adjust fade length and easing.	2017-04-10 17:25:56 +09:00
Dean Herbert	15c1013f5b	Don't schedule event, it's unreliable and doesn't match the fade.	2017-04-10 17:25:46 +09:00
Dean Herbert	5af4259ab4	Add back explicit binds.	2017-04-10 17:10:15 +09:00
Dean Herbert	ba03a98992	Add missing config set.	2017-04-10 16:39:10 +09:00
Dean Herbert	f12b5a8954	Unify disable logic.	2017-04-10 16:22:36 +09:00
Dean Herbert	b7cfdff8d1	Update SliderBar to use IHasCurrentValue.	2017-04-10 15:30:17 +09:00
Andrey Zavadskiy	7366640b95	Merge remote-tracking branch 'refs/remotes/ppy/master' into key_retry	2017-04-10 09:10:20 +03:00
Dean Herbert	bb4a909de5	Update UI control access in line with framework changes.	2017-04-10 14:54:23 +09:00
Andrey Zavadskiy	1879a05c7b	Removed using	2017-04-10 06:10:12 +03:00
Andrey Zavadskiy	e73f543c4f	Applied suggestions	2017-04-10 06:06:10 +03:00
Andrey Zavadskiy	c793878ae2	Merge remote-tracking branch 'refs/remotes/ppy/master' into key_retry	2017-04-10 05:50:28 +03:00
Dean Herbert	1fe6b84dfc	Update with new input changes from framework.	2017-04-10 01:24:50 +09:00
Andrey Zavadskiy	a7264aa84c	Warning fix	2017-04-09 17:53:16 +03:00
Andrey Zavadskiy	425e96c45c	Moved logic to it's own class	2017-04-09 17:44:19 +03:00
Andrey Zavadskiy	4ab4f65c83	Retry on Tilde key	2017-04-09 16:26:31 +03:00
Jorolf	bcef1ce2b6	replace space in text with Spacing in FillFlowContainer	2017-04-08 13:59:22 +02:00
Jorolf	f7a9a11ae5	Bar uses AccentColour aswell	2017-04-08 13:53:11 +02:00
Dean Herbert	adc16b0727	Merge pull request #608 from Tom94/music-controller-button-animation ... Music controller button animation	2017-04-08 20:48:39 +09:00
Jorolf	5e56e84c4a	change SRGBColour to Color4 and use IHasAccentColour in some places	2017-04-08 13:31:55 +02:00
Dean Herbert	b5431c496b	Fix osu! logo handling drags for no reason.	2017-04-08 19:34:04 +09:00
Dean Herbert	e1e9772d46	Flash buttons on click.	2017-04-08 19:28:29 +09:00
Dean Herbert	e40ad69a3b	Adjust icon scale of play button.	2017-04-08 19:25:40 +09:00
Thomas Müller	b99cbe6962	Add back nice scaling of music controller buttons	2017-04-08 19:17:20 +09:00
Thomas Müller	166a78a15a	Fix up comment in audio device options	2017-04-08 11:01:41 +02:00
Jorolf	c60a55285c	updated TestCase and some null checks	2017-04-07 20:32:09 +02:00
Jorolf	6a87fd6112	retries and fails hide if they're not present	2017-04-07 20:19:03 +02:00
Jorolf	899e559b5c	ratings hide now + remove unnessary stuff	2017-04-07 19:58:49 +02:00
Jorolf	65d9f4fc45	hide MetadataSegments without content and remove fail/retry initialisations	2017-04-07 19:27:14 +02:00
Dean Herbert	b6ece111a4	Merge pull request #606 from Tom94/fix-audio-crash ... Fix crash caused by multiple identical audio device names	2017-04-08 01:31:54 +09:00
Jorolf	9881889f88	removed some unused stuff	2017-04-07 18:24:36 +02:00
Jorolf	187a0e3613	Merge branch 'details' of github.com:Jorolf/osu into details	2017-04-07 18:14:14 +02:00
Jorolf	eb4b3772e9	put Bar into its own file and let it only add a background if BackgroundColour is changed	2017-04-07 18:13:55 +02:00
Thomas Müller	ac073e22c9	Fix crash caused by multiple identical audio device names ... The option dropdown for audio device selection lists all audio device names. Dropdowns, however, may not have multiple identical keys. This commit adds removal of duplicate audio device names from the dropdown. BASS does not give us a simple mechanism to select specific audio devices in such a case anyways. This functionality would require OS-specific and involved code.	2017-04-07 17:00:34 +02:00
Dean Herbert	06a655af5d	Move initial position of KeyCounter upwards.	2017-04-07 20:51:37 +09:00
Dean Herbert	0d4f457265	Improve transitions when exiting play mode.	2017-04-07 20:46:35 +09:00
Dean Herbert	54d1afb655	Fade in HitRenderer post entering animation.	2017-04-07 20:38:57 +09:00
Dean Herbert	39175905e4	Fix crashes on completing a taiko map (where a strong his is the last hit in the map).	2017-04-07 16:56:09 +09:00
Dean Herbert	7e99fc47e2	wip	2017-04-07 16:54:54 +09:00
smoogipooo	a9d938e7ed	Fix brace style.	2017-04-07 15:57:00 +09:00
Dean Herbert	06776443eb	Merge branch 'music-controller-improvements' into song-progress-graph ... # Conflicts: # osu.Game/Overlays/DragBar.cs	2017-04-07 15:49:14 +09:00
Dean Herbert	2c2a4169c6	Better structure for button layout.	2017-04-07 15:28:18 +09:00
Dean Herbert	7d2af9310b	Expose DragBar's seeking property.	2017-04-07 15:23:03 +09:00
Dean Herbert	3dbf4879c7	Merge branch 'music-controller-improvements' into song-progress-graph ... # Conflicts: # osu.Game/Overlays/DragBar.cs	2017-04-07 15:18:58 +09:00
Dean Herbert	361e187949	Temporarily disable button scaling.	2017-04-07 14:33:58 +09:00
Dean Herbert	fa28e7bdc3	Improve clickability and visuals of MusicController buttons.	2017-04-07 14:09:26 +09:00
Dean Herbert	7c9f30c288	MusicController regression fixes.	2017-04-07 13:15:57 +09:00
Dean Herbert	bc4e0bfa8b	Make DragBar animate seeks.	2017-04-07 13:14:41 +09:00
Dan Balasescu	579c351cfd	Merge branch 'master' into details	2017-04-07 12:54:01 +09:00
Dean Herbert	1842d80e28	Update test case.	2017-04-07 09:43:08 +09:00
Dean Herbert	fba72b9a9e	Snaking out on by default.	2017-04-07 09:28:13 +09:00
Dean Herbert	12d2102a88	Merge remote-tracking branch 'upstream/master' into song-progress-graph ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Modes/UI/HudOverlay.cs # osu.Game/Screens/Play/PauseOverlay.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj	2017-04-07 09:22:18 +09:00
Jorolf	e59c0a770f	Merge branch 'master' into details	2017-04-06 15:42:00 +02:00
Jorolf	28193cbaaa	hide BeatmapDetails on entering the Select screen	2017-04-06 15:39:23 +02:00
Huo Yaoyuan	411988f038	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
Huo Yaoyuan	9b1e010dcc	Fix filename mismatch.	2017-04-06 16:05:41 +08:00
smoogipooo	0107772737	Fix using.	2017-04-06 16:25:46 +09:00
Dan Balasescu	6fc1384927	Merge branch 'master' into taiko-fixes	2017-04-06 16:23:22 +09:00
Dean Herbert	1942ef9e8f	Fix merge fail.	2017-04-06 16:06:02 +09:00
Dean Herbert	4783d17d94	Merge branch 'master' into better-hitsounds	2017-04-06 16:00:56 +09:00
smoogipooo	cec8bca78a	Implement IJsonSerializable, BeatmapInfo IJsonSerializable.	2017-04-06 15:54:50 +09:00
Dean Herbert	942699218a	Merge branch 'master' into details	2017-04-06 15:44:43 +09:00
Dean Herbert	7c63c8394b	Remove unnecessary depth setting.	2017-04-06 15:36:03 +09:00
Dean Herbert	a18367454d	InGameOverlay -> MenuOverlay.	2017-04-06 15:34:52 +09:00
Dean Herbert	856696b17e	Fix incorrect verbatim strings.	2017-04-06 15:31:21 +09:00
Dean Herbert	6285f3eea8	Merge branch 'master' into pause_buttons_refactor	2017-04-06 15:00:48 +09:00
smoogipooo	37129bf03d	Make combo be changed by the base ScoreProcessor.	2017-04-06 14:37:21 +09:00
Dean Herbert	2bb99eac72	fix typo	2017-04-06 14:27:23 +09:00
Dean Herbert	efe82ef88c	Merge branch 'master' into hud_visibility	2017-04-06 13:40:10 +09:00
Dean Herbert	18ff8efd46	Mark TODO for BeatmapVersion.	2017-04-06 13:15:33 +09:00
Dean Herbert	f193af2a2a	Add better defaults for BaseDifficulty.	2017-04-06 13:15:21 +09:00