805 Commits

Author	SHA1	Message	Date
Dean Herbert	330dd458bd	Trim whitespace.	2017-05-03 20:49:52 +09:00
Dean Herbert	489f586887	Add FPS display toggling. ... Kinda temporary but better than nothing.	2017-05-03 20:34:53 +09:00
EVAST9919	5f2f1d2763	CI fixes	2017-05-03 14:01:43 +03:00
EVAST9919	e7a8619f01	ModIcon refactor	2017-05-03 09:48:10 +03:00
Dean Herbert	691742b828	Remove most options which have not yet been implemented.	2017-05-02 19:40:30 +09:00
Dean Herbert	f9de733128	Formatting.	2017-05-02 18:53:33 +09:00
Dean Herbert	d4045ee2c0	We only have one release stream, so let's unlock it.	2017-05-02 18:40:30 +09:00
Dean Herbert	57c2dd1f49	Fix options dropdown labels never being displayed.	2017-05-02 18:35:23 +09:00
Dean Herbert	1b0f353af3	Add support for framework-level mouse confining.	2017-05-02 17:45:42 +09:00
Dean Herbert	bef15fe637	Improve organisation of some options and config code.	2017-05-02 17:45:22 +09:00
Dean Herbert	116e92a542	Remove silly platform specific logic.	2017-05-02 17:00:30 +09:00
Dean Herbert	46ae8bc86b	Use value because we need to.	2017-05-02 16:49:27 +09:00
Dean Herbert	f1d0b77d10	Base the music controller transform direction on relative indices in playlist.	2017-05-02 16:40:29 +09:00
Dean Herbert	beb98c14b6	Fix layout not being invalidated when re-filtering playlist display.	2017-05-02 16:26:11 +09:00
Dean Herbert	6074cb5979	Make playlist filtering work. ... Also standardises searchable terms in beatmap metadata.	2017-05-02 10:45:55 +09:00
Dean Herbert	737ad78056	Set a sane default transform direction.	2017-05-01 20:10:19 +09:00
Dean Herbert	2437c416b1	Use less usings.	2017-05-01 19:56:01 +09:00
Dean Herbert	3943e4ae95	Fix comma.	2017-05-01 19:32:31 +09:00
Dean Herbert	c59589eba7	Only retrieve colour once.	2017-05-01 19:32:00 +09:00
Dean Herbert	0f4ef16910	Remove custom word splitting logic, add localisation support.	2017-05-01 17:14:59 +09:00
Dean Herbert	2cfb83436d	Add placeholder logic for filtering.	2017-05-01 15:27:41 +09:00
Dean Herbert	a1f341a64f	Fix textbox focus issues (and inability to use escape).	2017-05-01 15:23:01 +09:00
Dean Herbert	c1d0aea217	Refactoring part 5.	2017-05-01 15:09:14 +09:00
Dean Herbert	580cf93147	Refactoring part 4.	2017-05-01 15:03:11 +09:00
Dean Herbert	97a7f16ab7	Refactoring part 3.	2017-05-01 13:41:22 +09:00
Dean Herbert	7c2e193db1	Refactoring part 2.	2017-05-01 13:25:32 +09:00
Dean Herbert	37944bb04e	Initial refactoring.	2017-05-01 13:01:08 +09:00
DrabWeb	9bdf462dd1	Possible null reference exception	2017-04-29 06:36:06 -03:00
DrabWeb	067b572245	Formatting	2017-04-29 06:28:57 -03:00
DrabWeb	ef811f3cf3	More formatting	2017-04-29 06:17:50 -03:00
DrabWeb	3f73799975	Formatting	2017-04-29 06:10:12 -03:00
DrabWeb	c193a90a16	Merge https://github.com/ppy/osu into playlist	2017-04-29 05:39:52 -03:00
Huo Yaoyuan	061c3cacbd	CI fixes.	2017-04-26 20:04:32 +08:00
Huo Yaoyuan	4cb18361c1	Use localisation engine for unicode text.	2017-04-26 19:50:38 +08:00
Huo Yaoyuan	cf3e83ca62	Save ShowUnicode in framework config.	2017-04-26 19:48:46 +08:00
Dean Herbert	30e2e7bfe4	Merge branch 'master' into slider-stuff	2017-04-25 19:42:46 +09:00
Jorolf	a6ea6738e5	add some spaces after commas	2017-04-24 17:10:00 +02:00
Jorolf	7ef90e6597	Merge branch 'master' of git://github.com/ppy/osu into slider-stuff	2017-04-24 17:05:32 +02:00
Dean Herbert	3c98170330	Use method group for MusicController fault.	2017-04-24 20:22:21 +09:00
ColdVolcano	6a05440e6c	Only schedule when faulted	2017-04-23 00:53:21 -05:00
ColdVolcano	1d254f4a56	Take MusicController back to life	2017-04-23 00:13:58 -05:00
Jorolf	60bb45358c	remove more casts and usings	2017-04-22 18:36:37 +02:00
Jorolf	b151c71c0e	remove casts	2017-04-22 18:36:36 +02:00
Jorolf	e53c4be356	I guess this works...	2017-04-22 18:36:36 +02:00
Jorolf	02249dcd67	add a function to OsuSliderBar to manually set the tooltip text	2017-04-22 18:34:57 +02:00
Jorolf	1d2f19b5a2	change background dim from integer to double	2017-04-22 18:34:03 +02:00
smoogipooo	2d91400239	Fix nullref due to framework change.	2017-04-22 16:56:17 +09:00
Dean Herbert	d94035e9da	Merge branch 'master' into general-fixes	2017-04-21 20:42:46 +09:00
Dean Herbert	5fdc9819cf	Add basic UO support (now called Audio Offset).	2017-04-21 16:20:05 +09:00
Dean Herbert	25a7d99a8e	Remove unused reference.	2017-04-21 16:11:24 +09:00
Dean Herbert	5aa90df819	Allow OsuScreens to decide whether ruleset switching should be allowed. ... Tidies up ToolbarModeSelector a lot by using DI.	2017-04-21 16:03:59 +09:00
Dean Herbert	ef7bc0f92e	Update UI controls to understand DisabledChanged.	2017-04-21 14:02:04 +09:00
Dean Herbert	093abd6872	Add chat toggle button.	2017-04-19 19:54:03 +09:00
Dean Herbert	c7246fd2ac	Reorganise ChatOverlay to not suck.	2017-04-19 19:15:21 +09:00
Dean Herbert	dda3fb85ee	Add user colour support.	2017-04-19 19:07:38 +09:00
Dean Herbert	3129708ccb	Add chat sending support.	2017-04-19 18:46:52 +09:00
Dean Herbert	87f6dc9e5a	Change default channel to #lazer.	2017-04-19 18:46:50 +09:00
Dean Herbert	325af333b9	Update API responses for chat.	2017-04-19 18:46:48 +09:00
Dean Herbert	64a8992153	Merge branch 'master' into general-fixes	2017-04-18 16:19:52 +09:00
Dean Herbert	fbd26a1d5e	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
Dean Herbert	727086c0b2	Updates in-line with framework.	2017-04-18 15:34:53 +09:00
Dean Herbert	af13f97435	Fix regressions and test cases.	2017-04-17 19:44:03 +09:00
Dean Herbert	a4e2f34ee7	Make a RulesetDatabase.	2017-04-17 17:43:48 +09:00
smoogipooo	4a149c4ab8	Better default values + don't set Mode from outside.	2017-04-15 06:14:31 +09:00
smoogipooo	0333e1a050	Remove unused usings.	2017-04-15 05:57:18 +09:00
smoogipooo	0a1376c2db	Remove PlayMode game-wide.	2017-04-15 05:22:41 +09:00
smoogipooo	59bfc7abad	Move statics to RulesetCollection to avoid conflicts later on.	2017-04-15 04:53:37 +09:00
Dean Herbert	98544a8077	Fix unsynchronised tweening.	2017-04-14 19:20:07 +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
Poliwrath	dffdb100ab	Small fix to the chat overlay to prevent crashing on the test	2017-04-11 21:35:49 -04:00
Dean Herbert	9732110bd9	Update TransformTo methods in line with framework changes.	2017-04-11 17:25:56 +09:00
Dean Herbert	5af4259ab4	Add back explicit binds.	2017-04-10 17:10:15 +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
Dean Herbert	bb4a909de5	Update UI control access in line with framework changes.	2017-04-10 14:54:23 +09:00
DrabWeb	fc7eef091f	current_colour -> currentColour, fix masked away playlist items not fading colours	2017-04-09 09:08:11 -03:00
DrabWeb	70756a069e	Unused usings	2017-04-09 07:52:26 -03:00
DrabWeb	241895c85b	Proper playlist item text wrapping	2017-04-09 07:36:41 -03:00
DrabWeb	67f1167172	Comments, play first song if current is nil and user presses play	2017-04-09 07:04:41 -03:00
DrabWeb	7f2feab9e7	Proper search field focusing and exit on escape	2017-04-09 06:26:17 -03:00
DrabWeb	a88c82705b	Use playlist queue	2017-04-09 06:11:53 -03:00
DrabWeb	fe17cb924d	Cleanup	2017-04-09 04:50:35 -03:00
DrabWeb	7b5f8800bd	Reimplement with MusicController	2017-04-09 04:26:21 -03:00
DrabWeb	2d6a2f41aa	Reset MusicController	2017-04-09 04:12:30 -03:00
DrabWeb	963cd09bd0	Merge https://github.com/ppy/osu into playlist	2017-04-09 04:04:13 -03:00
DrabWeb	f65eaa6566	Show scroll dragger, change behaviour when selecting playing song	2017-04-09 03:52:48 -03: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
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	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
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
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
Dean Herbert	efe82ef88c	Merge branch 'master' into hud_visibility	2017-04-06 13:40:10 +09:00
Dean Herbert	863dc44c4d	Some minor improvements.	2017-04-06 09:57:34 +09:00
Andrey Zavadskiy	009909dd4b	Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility	2017-04-04 17:39:53 +03:00
Dean Herbert	7c74951454	Update bindables. ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCaseResults.cs # osu.Game/Screens/Ranking/ResultModeButton.cs # osu.Game/Screens/Ranking/Results.cs	2017-04-04 11:34:13 +09:00
Dean Herbert	83322dc5cb	Merge branch 'master' into hud_visibility	2017-04-03 11:51:11 +09:00
Dean Herbert	bfa2e68bfb	Container->Wrapper.	2017-04-02 16:17:13 +09:00
Dean Herbert	6f1fff4ee7	Update async load usage to new style.	2017-04-02 15:56:12 +09:00
Andrey Zavadskiy	d7c39a00b4	Hud Visibility	2017-03-31 16:43:31 +03:00
Dean Herbert	fa7fd6efe3	Fix mode selector not invoking a re-filter.	2017-03-29 19:48:13 +09:00
Dean Herbert	f7dc7e9bb9	Update references.	2017-03-28 21:26:20 +09:00
Dean Herbert	4042b94e01	Use DelayedLoadContainer in more places.	2017-03-28 15:28:58 +09:00
Dean Herbert	768b3c4b4b	Add better focus handling in the login form.	2017-03-28 00:08:27 +09:00
Dean Herbert	13272e6995	Make Avatar accept a user. ... Add UpdateableAvatar to handle the toolbar use-case.	2017-03-28 00:08:26 +09:00
DrabWeb	215b016f32	Initial implementation	2017-03-24 05:59:26 -03:00
Dean Herbert	4d61424abd	Merge branch 'master' into song-progress-graph	2017-03-23 17:44:22 +09:00
Dean Herbert	54e1b24fe9	Enforce readonly private members where possible.	2017-03-23 13:50:08 +09:00
Huo Yaoyuan	0dbc232ebf	Rename all DropDown -> Dropdown.	2017-03-22 22:32:32 +08:00
Huo Yaoyuan	6a4ca08578	Merge branch 'master' into controls	2017-03-22 22:28:19 +08:00
DrabWeb	29c54d4d8b	Merge https://github.com/ppy/osu into song-progress-graph	2017-03-22 08:50:17 -03:00
Dean Herbert	fbe08436d2	Fix usages of CircularContainer in line with framework changes.	2017-03-22 19:35:03 +09:00
Huo Yaoyuan	e217c67bcf	Merge branch 'master' into controls	2017-03-22 08:54:03 +08:00
Huo Yaoyuan	b46ded7794	Use Bindable for DropDown.	2017-03-22 07:49:21 +08:00
Dean Herbert	8983bbcaad	Merge branch 'master' into leaderboards	2017-03-22 08:24:49 +09:00
Huo Yaoyuan	f0edf5d3d3	Update to DropDown and Menu.	2017-03-22 07:18:53 +08:00
Dean Herbert	b00f86d809	Merge branch 'master' into seperateCursorSize	2017-03-22 08:11:45 +09:00
Jorolf	82d6129063	renamed CursorSize to MenuCursorSize	2017-03-21 17:16:23 +01:00
Andrey Zavadskiy	943bd737c4	Hide letterbox position sliders	2017-03-21 18:24:19 +03:00
smoogipooo	d27f37beb5	Hard-code text size in cases it wasn't set.	2017-03-20 13:48:06 +09:00
Dean Herbert	5d0adc6454	Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards	2017-03-19 18:51:53 +09:00
Jorolf	80de15d935	fixed typo	2017-03-18 15:22:03 +01:00
Thomas Müller	9af0104e3e	Fix NaN when dragging music controller ... When dragging music controller we divide by the dragged distance. When dragging to the origin of the drag this resulted in NaN. Now, we check for this and use 0 in this case.	2017-03-18 12:46:12 +01:00
Seth	4aea06be22	Merge branch 'master' into leaderboards	2017-03-17 18:23:01 -03:00
Jorolf	8568e1536c	Separated menu and gameplay cursor size	2017-03-17 18:40:03 +01:00
Dean Herbert	ab8a5afdb9	AlwaysReceiveInput and InternalContains.	2017-03-16 17:38:36 +09:00
Dean Herbert	1ae4c2dfbb	Remove a lot of customisation from Avatar (and add it in individual usages).	2017-03-15 15:22:28 +09:00
DrabWeb	650fc7563d	ScoreRank, Avatar to own files, +DrawableRank	2017-03-14 10:58:28 -03:00
Seth	21a9996225	Merge branch 'master' into leaderboards	2017-03-14 10:07:33 -03:00
Dan Balasescu	879a78156d	Merge branch 'master' into mod_application	2017-03-14 12:38:55 +09:00
Huo Yaoyuan	3913a0a9ee	Fix removal of the last one beatmap.	2017-03-14 05:35:58 +08:00
DrabWeb	74eddc768a	Random diff	2017-03-13 13:02:56 -03:00
DrabWeb	8e90e05f23	Changed animation to match the one in Comp3 6c(will probably clean later), changed avatar sprite to a toolbar avatar(doesn't load in visual test since there's no OsuGame), removed random test case data, now static	2017-03-13 12:31:46 -03:00
DrabWeb	dbc8d513f9	Merge https://github.com/ppy/osu into leaderboards	2017-03-13 09:36:16 -03:00
smoogipooo	c0e29652a6	Initial attempt at making mods apply better.	2017-03-12 22:13:43 +09:00
Dean Herbert	e6f4fe9e61	Merge pull request #458 from Lahvuun/master ... Options sidebar flickering fix.	2017-03-10 13:20:07 +09:00
Jorolf	9dd835e256	didn't see this was unnecessary after my changes	2017-03-09 21:43:11 +01:00