17314 Commits

Author	SHA1	Message	Date
Dean Herbert	9e5000d448	Remove (soon-to-be) redundant labels.	2017-01-31 18:40:18 +09:00
Dean Herbert	687b634fb3	Adjust button font size.	2017-01-31 18:40:04 +09:00
Dean Herbert	6ca974bf0c	Re-namespace options, adjust font sizes + more.	2017-01-31 18:37:11 +09:00
Dean Herbert	20ee1872b4	Broaden invalidation.	2017-01-31 17:15:46 +09:00
Dean Herbert	64f4098791	Move MusicController beneath Toolbar.	2017-01-31 17:05:54 +09:00
Dean Herbert	6cd9f93fb5	Adjust transitions slightly.	2017-01-31 17:05:42 +09:00
Dean Herbert	62c5ad907a	Merge remote-tracking branch 'upstream/master' into login-updates ... # Conflicts: # osu.Game/Overlays/Options/General/LoginOptions.cs	2017-01-31 17:05:33 +09:00
Dean Herbert	22ef576c64	Make LoginOverlay mask better.	2017-01-31 16:59:38 +09:00
Dean Herbert	3476abc38b	Add proper masking support to the login overlay.	2017-01-31 16:42:46 +09:00
Drew DeVault	acdf64e1f7	Remove code to check for other focused controls	2017-01-30 23:08:24 -05:00
Drew DeVault	5852657205	Refactor out Hidden ... Also fixes a bug I didn't think about before	2017-01-30 22:35:09 -05:00
DrabWeb	fe09bab78f	Removed empty ctor in PauseProgressGraph	2017-01-30 16:18:34 -04:00
DrabWeb	9d4a14074f	Woops forgot to add PauseButton	2017-01-30 16:18:11 -04:00
Drew DeVault	8d294a4eca	Only grab focus if nothing else has it	2017-01-30 14:03:05 -05:00
Drew DeVault	144a87a247	Fix focus interactions with search text box	2017-01-30 13:56:33 -05:00
Drew DeVault	09680196c9	SearchTextBox: Don't handle Key.{Enter,Left,Right}	2017-01-30 10:16:55 -05:00
Drew DeVault	b32cbdbec2	Relocate enums	2017-01-30 10:07:11 -05:00
Drew DeVault	fb431fd44e	&&=, unnecessary null check	2017-01-30 09:49:58 -05:00
Drew DeVault	9a2cba8520	Use null coalesce operator where appropriate	2017-01-30 09:48:21 -05:00
Drew DeVault	7f3cb381a9	Refactor FilterControl.Search	2017-01-30 09:48:12 -05:00
Drew DeVault	42a2285ef3	Make BeatmapGroup.Hidden more intelligent	2017-01-30 09:47:04 -05:00
Drew DeVault	0a81fdbd10	Update null background handling	2017-01-30 09:44:02 -05:00
Drew DeVault	c00a558cb7	Merge remote-tracking branch 'upstream/master' into song-select-filtering	2017-01-30 09:35:14 -05:00
Dean Herbert	4cf2993db1	Fix lack of visibility check causing weird hover regions.	2017-01-30 23:25:37 +09:00
Dean Herbert	2aa924c104	Fix global hover regression.	2017-01-30 23:24:30 +09:00
Dean Herbert	74366c620b	Move login screen to toolbar and update design (still not fully implemented). ... # Conflicts: # osu.Game/Overlays/Options/General/LoginOptions.cs # osu.Game/Overlays/Toolbar/Toolbar.cs	2017-01-30 22:55:35 +09:00
Dean Herbert	b2ec3508d5	Add shadow to opaque toolbar elements.	2017-01-30 22:54:36 +09:00
Dean Herbert	cbd6fe3f36	Move definition of MusicController's position out of itself.	2017-01-30 22:54:33 +09:00
DrabWeb	2f2f0ed9a3	Fixed an issue with PauseButton's glow not fading in	2017-01-30 09:26:24 -04:00
DrabWeb	740f6e5595	Moved delaying resuming to Player	2017-01-30 09:06:26 -04:00
Dean Herbert	bdbe8501d3	Merge branch 'master' into add-flash-effects ... # Conflicts: # osu.Game/Overlays/Options/General/LoginOptions.cs	2017-01-30 21:47:05 +09:00
DrabWeb	af8294f02c	Renamed/removed various private constants	2017-01-30 08:45:10 -04:00
DrabWeb	dbb9078e30	Fixed glow on PauseButton not updating	2017-01-30 08:19:44 -04:00
DrabWeb	ed3ed8251f	Made styling PauseButtons public, Resume/Retry/Quit buttons changed to subclasses	2017-01-30 08:04:39 -04:00
Dean Herbert	26e9533ff0	Add custom implementation of TextBox.	2017-01-30 20:29:04 +09:00
DrabWeb	dcb02eff65	Cleared out PauseProgressGraph	2017-01-30 07:19:14 -04:00
DrabWeb	ad33ae9431	Removed unnecessary change	2017-01-30 06:24:44 -04:00
DrabWeb	015832f242	Changed PauseOverlay to layout with FlowContainers and not positioning, made the retry counter in PauseOverlay have the number bolded, made it so if the player presses escape before the clock is started in Player then Exit is called instead of Pause	2017-01-30 06:14:28 -04:00
Dean Herbert	b4c01f104b	Make buttons look closer to the design.	2017-01-30 18:10:30 +09:00
DrabWeb	62282076c7	Changes on PauseButton to match design closer	2017-01-30 05:04:57 -04:00
DrabWeb	f8cbc35f8e	Small cleanups	2017-01-30 04:43:06 -04:00
DrabWeb	d70cbd37dd	Made the pause progress graph it's own class, to be implemented, made it so the user couldn't double click the pause buttons and made it so the action wasn't called a second time when the mouse button was released, made PopIn and PopOut in PauseOverlay one line each, made Player.IsPaused a public getter with a private getter/setter, implemented restarting in Player	2017-01-30 04:08:14 -04:00
Dean Herbert	2ad9377b37	Adjust carousel radius slightly (flyte wanted it).	2017-01-30 16:55:47 +09:00
Dean Herbert	f0d30cc873	Make triangles opaque.	2017-01-30 16:53:12 +09:00
Dean Herbert	578b33dc64	Merge pull request #300 from peppy/more-beatmap-info ... Beatmap details	2017-01-30 16:23:30 +09:00
Dean Herbert	a315db68ab	Remove unused field.	2017-01-30 16:08:31 +09:00
Dean Herbert	9f90b57543	Move BPM calculations to Beatmap.	2017-01-30 16:03:45 +09:00
Dean Herbert	8f1e7ef19a	Fix non-matching shear angles.	2017-01-30 15:28:47 +09:00
Dean Herbert	0272c4b559	Add StarDifficulty property and correct colouring of difficulty icons.	2017-01-30 15:26:28 +09:00
Dean Herbert	1f2f2fa144	Fix visualtests.	2017-01-30 15:15:56 +09:00
Dean Herbert	2ed5cf7c91	Hook up icons better.	2017-01-30 13:35:40 +09:00
Dean Herbert	0c2152f3d0	Use beatmap's play mode.	2017-01-30 13:14:02 +09:00
Dean Herbert	e93f60396f	Add the ability for individual game modes to report statistics for display at song select.	2017-01-30 13:12:30 +09:00
DrabWeb	28967cf77a	Renamed Player.isPaused to IsPaused, did a small patch suggested for how the player can click through the pause menu onto the Playfield(only partially works, upstream changes need to be made for full functionality), made Retry default to Resume until retrying is implemented, minor cleanups	2017-01-29 05:04:48 -04:00
Dean Herbert	3286713d11	avg -> mostly	2017-01-29 15:16:38 +09:00
Dean Herbert	6027cc7afa	Formatting fixes.	2017-01-29 15:15:04 +09:00
Dean Herbert	2e76874384	Simplify the lookup conditions for hitcircles/sliders (uses duration to discern).	2017-01-29 15:09:42 +09:00
Dean Herbert	3125fa89ee	Fix method which should be class.	2017-01-29 15:06:44 +09:00
Dean Herbert	77558abf58	Merge branch 'master' into more-beatmap-info ... # Conflicts: # osu.Game/Screens/Select/BeatmapInfoWedge.cs	2017-01-29 14:47:42 +09:00
DrabWeb	c75b234b1a	Adjusted the fade time of the pause overlay, put a fill behind the colour of PauseButton to fix an issue where the background gray is visible when the pause overlay is fading out	2017-01-28 21:50:06 -04:00
DrabWeb	d0a22bfdd4	Added PauseOverlay.SetRetries for updating the retry indicator	2017-01-28 20:56:23 -04:00
DrabWeb	d4216eb539	Made resume not call until double the time of the fade animation	2017-01-28 20:45:10 -04:00
DrabWeb	6b57456681	Removed depth setting from PauseOverlay, removed shadow offset on PauseButton color(why was that even there?), fixed the triangles on PauseButton not masking to the sheared container, made PauseButton call it's action on MouseUp instead of MouseDown to match stable	2017-01-28 20:30:37 -04:00
DrabWeb	582599a8de	Made PauseButton more visually responsive, added force option to Player.Pause, added very basic implementation of the progress bar	2017-01-28 16:55:42 -04:00
Andrey Zavadskiy	72bc7f8786	Simplify checking	2017-01-28 17:01:11 +03:00
Andrey Zavadskiy	e25b8bb298	Removed explicit methods	2017-01-28 16:56:05 +03:00
Andrey Zavadskiy	f12a8ace3f	Moved Config logic to OsuConfigManager	2017-01-28 13:10:05 +03:00
EVAST9919	ac7feafe9a	Merge branch 'master' into login_fix	2017-01-28 11:24:08 +02:00
Drew DeVault	10897486ba	Merge remote-tracking branch 'upstream/master' into song-select-filtering	2017-01-27 15:41:46 -05:00
DrabWeb	feba3f35ba	Changed the roles of PauseOverlay and player in pausing, PauseOverlay is now only the UI portion and doesn't do things like actually pause the game, and only calls actions and hides itself, whereas Player actually pauses the game and brings up the pause overlay in the first place	2017-01-27 15:28:39 -04:00
DrabWeb	601a5ed39c	Reverted Player to upstream	2017-01-27 14:29:51 -04:00
DrabWeb	490feac030	Working on design	2017-01-27 14:18:57 -04:00
Dean Herbert	3e7503e860	Make skip button work.	2017-01-27 21:57:22 +09:00
DrabWeb	e115120543	Renamed pauseDisableTime to pauseCooldown	2017-01-27 08:13:39 -04:00
Dean Herbert	420e61fa97	TwoLayerButton	2017-01-27 21:08:36 +09:00
DrabWeb	8c6d9bdf2e	Added commas to the end of UI creation to match how the rest of the project does, moved PauseButton audio loading to PauseOverlay, much more reliable(still using placeholder assets), made it so the player can't spam pause, cools down to one second	2017-01-27 08:03:32 -04:00
DrabWeb	3ed88ea043	Added PauseOverlay.TogglePaused, renamed OnPlay and similar to OnResume, made Pause and Play public, added proper testing for the visual test(pause button instead of auto-pause, logging actions), made PauseOverlay's fade duration a constant instead of statically typed	2017-01-27 07:11:22 -04:00
DrabWeb	81de5a2097	Made the pause overlay be at -1 depth so it renders on top of everything(used to allow circles to draw on top)	2017-01-27 06:36:43 -04:00
DrabWeb	f35974021a	Set actions for retry/quit, moved setting paused to PopIn and PopOut, added null propogation for the sound samples for PauseButton(sometimes in the visual tests the audio doesn't load for whatever reason), added a gradient to the background of the PauseOverlay visual test(same as the one in the menu button system test), wired up the retry and quit actions in Player, made the quit action quit the map, retry still does nothing	2017-01-27 06:19:52 -04:00
Dean Herbert	5787b43586	wip	2017-01-27 19:14:44 +09:00
DrabWeb	dedd6a4bcf	Small cleanups	2017-01-27 05:39:15 -04:00
DrabWeb	fe265c01cb	Added current work on pause overlay	2017-01-27 05:24:49 -04:00
Dean Herbert	6d44c5c8f1	Move logo colour definitions local to their usage.	2017-01-27 17:57:52 +09:00
Dean Herbert	9b2669e1ae	Add flash when activating the osu! logo.	2017-01-27 17:23:53 +09:00
Dean Herbert	50e4c39e32	Add flash when activating a menu button.	2017-01-27 17:23:53 +09:00
Dean Herbert	a238637990	Move osu! logo colour declarations to palette.	2017-01-27 17:23:53 +09:00
Dean Herbert	f3e9da609e	Merge pull request #295 from peppy/songselect-footer ... Initial implementation of song select footer area.	2017-01-27 16:13:43 +09:00
Dean Herbert	8987a09741	Merge pull request #293 from peppy/general-fixes ... Fix some nullrefs when running visualtests with no maps loaded.	2017-01-27 16:12:46 +09:00
Drew DeVault	f3c5c1f0b8	Fixes following recent updates upstream	2017-01-26 21:31:28 -05:00
Drew DeVault	417933b7ec	Merge remote-tracking branch 'upstream/master' into song-select-filtering	2017-01-26 13:57:55 -05:00
Dean Herbert	629605c6b4	Make HasFailed's set private.	2017-01-27 00:41:34 +09:00
Dean Herbert	4efedd942d	Use null propagation.	2017-01-27 00:41:34 +09:00
Dean Herbert	f07b9591cd	Add null check when popping backgrounds from the mode stack.	2017-01-27 00:41:34 +09:00
Dean Herbert	139cac5e57	Add fail dialog and flow.	2017-01-27 00:41:34 +09:00
Dean Herbert	c3699c1395	Remove unused prevCount variable.	2017-01-27 00:39:00 +09:00
Dean Herbert	c01863dfa2	Add min/max constraints to HealthDisplay.	2017-01-27 00:39:00 +09:00
Dean Herbert	cd149f04fc	Use bindable for HealthDisplay.	2017-01-27 00:38:21 +09:00
Dean Herbert	8c7bb4990c	Add support for failing.	2017-01-27 00:38:21 +09:00
Dean Herbert	70271fee35	Move PlayerInputManager to own file.	2017-01-27 00:38:21 +09:00
Dean Herbert	4a7b3cf391	Initial implementation of song select footer area.	2017-01-27 00:36:12 +09:00
Dean Herbert	a2501cc81d	Fix TestCaseHitObjects not working at all due to state being set before load is complete.	2017-01-27 00:16:02 +09:00
Dean Herbert	7ee6a50404	Fix checkbox design regressions.	2017-01-27 00:16:02 +09:00
Dean Herbert	162e183b36	Fix some nullrefs when running visualtests with no maps loaded.	2017-01-27 00:16:02 +09:00
Dean Herbert	25da8a53dc	Fix incorrect configuration retrievals.	2017-01-26 23:08:39 +09:00
Dean Herbert	1853bbdda8	Move window/volume configuration to framework level.	2017-01-25 18:44:51 +09:00
Dean Herbert	23938a810b	Merge pull request #292 from peppy/general-fixes ... Reset the beatmap database when it can't be read, rather than hard failing.	2017-01-23 21:43:52 +09:00
Dean Herbert	3a27178bb1	Merge pull request #289 from UselessToucan/JudgementsCapacity ... Specify ScoreProcessor.Judgements.Capacity	2017-01-23 21:40:00 +09:00
Dean Herbert	373d2a0f35	Merge branch 'master' into general-fixes	2017-01-23 21:39:05 +09:00
Dean Herbert	56fe69852d	Change beatmap database reset logic to only run a maximum of once.	2017-01-23 18:13:06 +09:00
Dean Herbert	ef8347fe53	Reset the beatmap database when it can't be read, rather than hard failing.	2017-01-23 13:02:03 +09:00
Dean Herbert	ae464fcace	Move Intro logic to OnEntering in line with framework changes.	2017-01-20 16:30:24 +08:00
TocoToucan	badc8def9a	hitObjectsNumber -> hitObjectCount	2017-01-18 18:51:38 +03:00
Dean Herbert	2025e8ef71	Merge pull request #288 from peppy/hpdisplay ... Simple HP display implementation.	2017-01-18 11:18:45 +08:00
Dean Herbert	cd8c9393f3	HP -> Health	2017-01-18 11:08:16 +08:00
Drew DeVault	678f0aaa16	Implement filtering with strings	2017-01-17 19:18:15 -05:00
Drew DeVault	75de03bd88	Use OsuColour for green text	2017-01-17 18:26:43 -05:00
Drew DeVault	46e7bcef8c	Improve beatmap import	2017-01-17 17:05:06 -05:00
Drew DeVault	7559fc593a	Use default background on empty song select screen	2017-01-17 16:43:53 -05:00
Drew DeVault	5eb1cda77b	Rename FilterSongSelect, use OsuColour	2017-01-17 16:43:40 -05:00
Drew DeVault	63031fbc3d	Move filter container z depth and add hover fx	2017-01-17 15:41:50 -05:00
Drew DeVault	73e46ee8c0	Initial layout of song select filtering UI	2017-01-17 15:41:50 -05:00
TocoToucan	259c0964fd	Specify ScoreProcessor.Judgements.Capacity in order to avoid List<T> internal auto reallocations	2017-01-16 23:14:35 +03:00
Dean Herbert	ee0b6be84b	Merge pull request #266 from kizayoi/master ... Add support for old beatmaps	2017-01-16 16:02:22 +08:00
Dean Herbert	a3770adbc5	Merge branch 'master' into hpdisplay	2017-01-16 11:23:54 +08:00
Dean Herbert	4030413291	Merge branch 'refs/heads/SirCmpwn/colors'	2017-01-14 06:52:30 +08:00
Drew DeVault	e81073695f	Implement disable mouse buttons	2017-01-13 17:17:04 -05:00
Drew DeVault	f5f545df62	Refactor OsuColour into injected instance class ... Which should allow you to change the color palette in the future for skinning purposes.	2017-01-12 23:49:05 -05:00
Drew DeVault	fa007e632d	Refactor colors to palette based design	2017-01-12 16:38:27 -05:00
Andrey Zavadskiy	63fcfdbbde	Fixed checkboxes state and better code	2017-01-11 10:28:24 +03:00
Drew DeVault	c222be05c0	Add Color4.Opacity and OsuColor.Gray	2017-01-10 13:44:40 -05:00
Dean Herbert	1392cdfb9a	Hook up naively.	2017-01-10 18:35:27 +08:00
Dean Herbert	7eab50b989	Add basic HP display support.	2017-01-10 16:08:01 +08:00
Drew DeVault	70ecf48ca7	Add central color class ... I didn't move _every_ color here, but most of them. The ones I left behind are mostly just shades of gray. Closes #126	2017-01-09 17:20:31 -05:00
柯十六夜	acfbf2e32e	Add prefix Online to BeatmapID and BeatmapSetID	2017-01-09 21:05:01 +08:00
Andrey Zavadskiy	c0980437a6	Removed unnecessary api reference	2017-01-07 00:55:04 +03:00
Drew DeVault	4899d88d19	Update framework	2017-01-05 02:10:05 -05:00
Drew DeVault	b27139c2bd	Simplify layout of dropdown menu item	2017-01-05 00:57:19 -05:00
Drew DeVault	af4aeeab09	Update following framework changes	2017-01-04 01:14:25 -05:00
Drew DeVault	a1f8c0df64	Style dropdown to match osu!stable	2017-01-03 23:00:28 -05:00
Huo Yaoyuan	6690d1bd72	Move logic into updateDisplay.	2017-01-04 02:12:18 +08:00
Huo Yaoyuan	794e4663d8	Fix PreferUnicode changing when nothing to play.	2017-01-04 01:00:08 +08:00
Andrey Zavadskiy	acc50e3473	fixed wrong parameter for token	2016-12-24 10:16:22 +03:00
Andrey Zavadskiy	eabfa11614	Minor fix	2016-12-24 10:04:43 +03:00
Andrey Zavadskiy	5fbc0e408b	Remove unnesessary Username field check	2016-12-24 09:16:17 +03:00
Andrey Zavadskiy	ba1d0b3a84	Added Events for checkboxes	2016-12-24 09:09:01 +03:00
Andrey Zavadskiy	9f202ecba8	fix	2016-12-23 23:49:42 +03:00
Andrey Zavadskiy	70c8250021	Revert "Dependent checkboxes" ... This reverts commit 70dc3bae4a.	2016-12-23 23:05:44 +03:00
Andrey Zavadskiy	70dc3bae4a	Dependent checkboxes	2016-12-23 20:24:28 +03:00
Andrey Zavadskiy	cd3ab33d08	Remove the password field from game.ini	2016-12-23 00:43:43 +03:00
Andrey Zavadskiy	7c96102229	When we have empty login, api.Token becames empty ... So we can't sign in having Token without login	2016-12-22 16:09:42 +03:00
Andrey Zavadskiy	4817d4bf10	Stop using password field in .ini at all	2016-12-22 15:41:06 +03:00
Andrey Zavadskiy	b066a7d905	Stop saving password	2016-12-22 15:26:31 +03:00
柯十六夜	e578e50721	Add support for old beatmaps	2016-12-21 16:29:57 +08:00
柯十六夜	ef11c3f389	Add default Beatmap ID	2016-12-21 14:47:56 +08:00
Andrey Zavadskiy	1c79ebff9f	Fix loggining on start even after logout and exit	2016-12-21 01:51:01 +03:00
Andrey Zavadskiy	bba4c46ae3	TODO comment and deleted repeating lines	2016-12-21 01:05:10 +03:00
Andrey Zavadskiy	c7de449713	Token fix ... If "Save Password" is checked, Token will be saved	2016-12-21 00:37:54 +03:00
柯十六夜	02f6e46105	Add support for v9 beatmaps	2016-12-20 23:56:49 +08:00
Andrey Zavadskiy	d519e28dda	PasswordTextBox fix	2016-12-20 17:52:16 +03:00
Andrey Zavadskiy	21c6c23189	Login improvements	2016-12-20 17:28:27 +03:00
Dean Herbert	561b0928bb	Merge pull request #263 from EVAST9919/fixes ... Remove unnecessary items from OptionsOverlay	2016-12-20 01:18:51 +09:00
Andrey Zavadskiy	e23a1b8e92	Remove unnecessary items from OptionsOverlay	2016-12-19 19:17:04 +03:00
n4b3l	aebe87fefc	better implementation	2016-12-19 16:09:29 +01:00
n4b3l	09f9f86b06	check if dimLevel is null on exit	2016-12-19 14:03:10 +01:00
n4b3l	c614d61b1a	getbpm takes Beatmap instead of WorkingBeatmap	2016-12-18 19:34:20 +01:00
n4b3l	ded6588d3b	minor style fixed	2016-12-18 17:21:05 +01:00
n4b3l	5f893d46c7	style fixes	2016-12-18 16:53:52 +01:00
Thomas Müller	db21fe062e	Merge pull request #252 from n4b3l/background-dim ... basic background dim	2016-12-18 16:04:10 +01:00
Thomas Müller	66435a515c	Don't async/await song selection since audio operations are now on a separate thread.	2016-12-18 15:19:41 +01:00
Dean Herbert	1d5dc77c4d	Keep reference to reader to avoid early disposal.	2016-12-18 20:47:00 +09:00
n4b3l	df305989d0	use config bindable directly	2016-12-18 10:48:59 +01:00
Dean Herbert	f14a9e7d6b	Remove unused beatmap reference in BeatmapGroup.	2016-12-18 17:06:56 +09:00
Dean Herbert	5ac9402d5f	Adjust fade out transform of difficulty panels to avoid overlap.	2016-12-18 17:06:03 +09:00
Dean Herbert	6e10a9bb29	Allow starting maps by clicking an active panel a second time.	2016-12-18 16:59:13 +09:00
Dean Herbert	2cbc528971	Remove janky beatmap info wedge animation, restore pixel snapping.	2016-12-18 16:50:39 +09:00
n4b3l	492581fa50	fixed length.seconds display	2016-12-18 04:03:11 +01:00
n4b3l	f551133b0e	..	2016-12-18 03:56:27 +01:00
n4b3l	3d64bee069	proper round + std bpm	2016-12-18 03:53:26 +01:00
n4b3l	63dd8893d9	bpm as ints	2016-12-18 02:53:43 +01:00
n4b3l	0fbd2d8bc8	removed random enter	2016-12-17 21:03:14 +01:00
n4b3l	224e6a877a	responsive to dim changes	2016-12-17 20:59:41 +01:00
n4b3l	36049cc493	smoother transition	2016-12-17 20:29:20 +01:00
n4b3l	73532b9172	small code improvements	2016-12-17 19:57:58 +01:00
n4b3l	2f708a704d	bpm range added + changed spacing	2016-12-17 19:31:34 +01:00
n4b3l	a04a0a7d2c	fix allignment...	2016-12-17 15:58:51 +01:00
n4b3l	d812a7cb4e	func for icons	2016-12-17 15:53:26 +01:00
n4b3l	c73fbe6e42	Remove unnecessary casts	2016-12-17 15:06:56 +01:00
n4b3l	9e6161b862	better scaling	2016-12-17 12:18:55 +01:00
n4b3l	e31e19f1b8	removed unnecessary padding	2016-12-17 12:04:42 +01:00
n4b3l	376b3df2f8	icons with TextAwesome	2016-12-17 11:57:52 +01:00
n4b3l	590db66b37	remove icons from resource	2016-12-17 11:30:30 +01:00
Dean Herbert	3e42fa4f90	Merge pull request #247 from peppy/song-select-async-player ... Load player async	2016-12-17 16:05:50 +09:00
n4b3l	b78b40a629	implement icons	2016-12-17 01:58:39 +01:00
n4b3l	ba81222af6	basic background dim	2016-12-16 17:13:24 +01:00
n4b3l	881d58574e	Design improvements	2016-12-16 14:21:12 +01:00
Drew DeVault	67d748f677	Adjust padding on sliders	2016-12-16 01:27:57 -05:00
Drew DeVault	796858f86f	Fix transparency issues	2016-12-16 00:37:37 -05:00
Drew DeVault	96a6e30a21	Drop complicated type constraints	2016-12-16 00:27:06 -05:00
Drew DeVault	80574423cb	Drop SliderBarEventSource	2016-12-16 00:27:06 -05:00
Drew DeVault	abc6db18b3	Add license header	2016-12-16 00:27:06 -05:00
Drew DeVault	a751cfcba3	Update SliderOption implementation ... Per @Tom94's suggestion, the bars track the nub in Update instead of animating seperately. Also only animates when the event source is the keyboard.	2016-12-16 00:27:06 -05:00
Drew DeVault	10cc6f7885	Move where clause to next line	2016-12-16 00:27:06 -05:00
Drew DeVault	9e75ecab4f	Fix up slider bugs	2016-12-16 00:27:06 -05:00
Drew DeVault	22c2a4757c	Play slider sample as the value changes in 1/10ths	2016-12-16 00:27:06 -05:00
Drew DeVault	c642f6c34f	Add sliderbar L+F	2016-12-16 00:27:06 -05:00
n4b3l	991ad298d9	more beatùa	2016-12-16 04:25:28 +01:00
BuildTools	d37ff8f153	Deleted unnecesary things (I guess)	2016-12-15 17:35:14 -06:00
BuildTools	b788878c95	Unnecesary things were removed (I guess)	2016-12-15 17:28:22 -06:00
BuildTools	a845a897b3	Add Base Preview Time	2016-12-15 17:11:48 -06:00
Dean Herbert	20260b43d1	Improve star animation.	2016-12-15 22:58:34 +09:00
Dean Herbert	8ce18e8986	Improve song select startup time via better database querying. Also fix difficulty displays.	2016-12-15 22:58:32 +09:00
Dean Herbert	cf8283582b	Don't update LifetimeStart on HitObject state change.	2016-12-15 22:58:23 +09:00
Dean Herbert	d8e40d4fb1	Add naive lifetime calculation for drawable HitObjects.	2016-12-15 22:58:22 +09:00
Dean Herbert	0a9e3ce1b0	Don't handle input in triangle particle effect containers.	2016-12-15 22:58:19 +09:00
Dean Herbert	08ef8ed8ea	Add comment about future implementation.	2016-12-15 22:58:18 +09:00
Dean Herbert	8d800dac99	Make Player load async.	2016-12-15 22:58:00 +09:00
Dean Herbert	9557821776	Start a map using enter key.	2016-12-15 22:57:28 +09:00
Dean Herbert	21f993d149	Add ability to navigate song select carousel using arrow keys.	2016-12-15 22:57:14 +09:00
Dean Herbert	c420c55291	Merge branch 'master' into hit-samples ... # Conflicts: # osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs	2016-12-13 17:57:24 +09:00
Dean Herbert	658f203c4e	Merge pull request #236 from Tom94/fix-carousel-panel-x ... Fix panels that are moving off-screen having an incorrect X coordinat…	2016-12-11 19:47:09 +09:00
Thomas Müller	882d5edf7d	Fix dropped input outside of playfield.	2016-12-11 10:09:58 +01:00
Thomas Müller	9c4c713aa0	Fix panels that are moving off-screen having an incorrect X coordinate applied.	2016-12-10 11:30:22 +01:00
Dean Herbert	f8395c4d3f	Fix slider ball not tracking when mouse hasn't been moved since slider appeared.	2016-12-08 21:07:20 +09:00
Dean Herbert	6cfb174f02	Fix exiting results screen returning to player.	2016-12-08 20:03:18 +09:00
Dean Herbert	c53743ca7d	Fix unit test regression.	2016-12-08 20:00:24 +09:00
Dean Herbert	391767e01d	Add very basic hitsound support.	2016-12-08 19:54:22 +09:00
Dean Herbert	63da7e5ea4	Merge pull request #225 from peppy/hitobject-improvements ... Slider & other hit object improvements.	2016-12-08 16:11:50 +09:00
Dean Herbert	0538681f3b	Merge branch 'refs/heads/master' into general-fixes	2016-12-08 13:29:59 +09:00
Drew DeVault	bf7ec397dd	Wire dropdowns back to bindables	2016-12-07 09:42:53 -05:00
Drew DeVault	bf33bded24	Update star min/max type, just use sliders for now	2016-12-07 09:42:53 -05:00
Drew DeVault	9db8e63f83	Make star display min/max a double	2016-12-07 09:42:53 -05:00
Drew DeVault	b06f412ffb	Use styled dropdown	2016-12-07 09:42:53 -05:00
Drew DeVault	0e07ce26bc	Remove Height from dropdown	2016-12-07 09:42:53 -05:00
Drew DeVault	cf60c52f00	Switch to System.ComponentModel.Description	2016-12-07 09:42:53 -05:00
Drew DeVault	5456e0102c	s/OptionsDropdown/DropdownOption/g	2016-12-07 09:42:52 -05:00
Drew DeVault	4757a1c433	Wire up enum-backed dropdowns	2016-12-07 09:42:52 -05:00
Drew DeVault	0378de8346	Add DisplayName	2016-12-07 09:42:37 -05:00
Drew DeVault	9daf524120	Add OptionsDropdown<T> and wire up one example	2016-12-07 09:42:37 -05:00
Drew DeVault	ff7ec88e66	s/OptionsSlider/SliderOption/g	2016-12-07 09:42:37 -05:00
Drew DeVault	b97902d006	Add missing sliders	2016-12-07 09:42:37 -05:00
Drew DeVault	92cf841589	Add and wire up all sliderbar-based options	2016-12-07 09:42:37 -05:00
Drew DeVault	3aefa4d6a5	Wire up remaining sliders, except for ints	2016-12-07 09:42:37 -05:00
Drew DeVault	a350e95e40	Add OptionsSlider and wire up volume sliders	2016-12-07 09:41:28 -05:00
Dean Herbert	08f8eb649c	Make counters closer to what they should be looking like.	2016-12-07 21:05:29 +09:00
Dean Herbert	bbc11c77ca	Add (temporary) transitions to songselect and player.	2016-12-07 20:47:28 +09:00
Dean Herbert	bc6c57c619	Make toolbar icons the same width as options icons.	2016-12-07 19:14:05 +09:00
Dean Herbert	87ad44b901	Fix HitObject test case not displaying properly.	2016-12-07 18:46:47 +09:00
Dean Herbert	ae72f91975	Reshuffle hit explosions to be on their own layer. ... Style misses better.	2016-12-06 21:14:38 +09:00
Dean Herbert	f356640cb7	Add missing licence headers.	2016-12-06 19:07:15 +09:00
Dean Herbert	421dd19aaf	Move initial state updates to DrawableHitObject.	2016-12-06 18:35:08 +09:00
Dean Herbert	ef8793ff24	Merge branch 'refs/heads/master' into more-sound-effects	2016-12-06 00:08:45 +09:00
Dean Herbert	e33aaa95a8	Merge pull request #222 from peppy/better-exit-process ... Move the actual outro sequence into Intro rather than MainMenu.	2016-12-06 00:06:42 +09:00
Dean Herbert	3cb9cb647d	Tidy up BackButton and adjust transitions a bit.	2016-12-05 21:36:42 +09:00
Dean Herbert	7bd9a87bda	Add menu button sound effects.	2016-12-05 21:09:41 +09:00
Dean Herbert	3056bbda5d	Add temporary workaround for crash.	2016-12-05 21:09:17 +09:00
Dean Herbert	8fc8ca3998	Add song select panel sound effects.	2016-12-05 20:09:56 +09:00
Dean Herbert	590ca3108c	Add checkbox sound effects.	2016-12-05 19:45:54 +09:00
Dean Herbert	ff85ccca6d	Move the actual outro sequence into Intro rather than MainMenu.	2016-12-05 19:34:52 +09:00
Dean Herbert	4d27101aca	Add ability to adjust game clock's speed (pgup/pgdn). ... A bit hacky, probably need to expose rate better.	2016-12-05 19:33:38 +09:00
Thomas Müller	a0131b8b25	Fix slider velocity not being applied.	2016-12-03 14:52:51 +01:00
Thomas Müller	773d64cd5e	Update judgement after children have been updated.	2016-12-03 14:40:15 +01:00
Thomas Müller	b81bf7085f	Add missing licence headers and fixup using statements.	2016-12-03 13:56:35 +01:00
Thomas Müller	c43b47da2a	Add option toggles and configuration for snaking in and out sliders.	2016-12-03 13:56:19 +01:00
Huo Yaoyuan	2eefc320fd	Make KeyCounterCollection generic.	2016-12-03 15:58:27 +08:00
Dean Herbert	a80c28ca37	ToolbarOverlayToggleButton	2016-12-02 21:57:01 +09:00
Dean Herbert	9bf36418a0	Make toolbar buttons more independent logic-wise. ... Also adds visual toggle state for toggleable buttons.	2016-12-02 18:43:01 +09:00
Thomas Müller	1e8dc780ab	Use new framework-level triangles.	2016-12-01 19:12:35 +01:00
Thomas Müller	20947623d5	Merge pull request #210 from peppy/online-improvements ... Add login support, better API state change handling.	2016-12-01 18:50:54 +01:00
Dean Herbert	22905d2033	Align logo correctly between intro and main menu. ... Kinda hacky but will do for now.	2016-12-01 21:59:32 +09:00
Dean Herbert	413138abe5	Delay movement of ParallaxContainers slightly.	2016-12-01 21:45:40 +09:00
Dean Herbert	2342a17dbc	Move BufferedContainer usage to allow ripple to blend correctly with the background layer.	2016-12-01 21:29:14 +09:00
Dean Herbert	511dab32ef	Remove masking from Triangles to simplify OsuLogo masking hierarchy.	2016-12-01 21:12:37 +09:00
Dean Herbert	4b74ea7586	Separate logo hover and bounce into separate containers to fix consecutive actions.	2016-12-01 20:52:26 +09:00
Dean Herbert	6909dbf60c	Increase cursor trail density a bit.	2016-12-01 20:44:17 +09:00
Dean Herbert	1f370fe29c	Add animated osu! logo.	2016-12-01 20:21:14 +09:00
Dean Herbert	858a79c402	Merge pull request #211 from huoyaoyuan/enhancement ... Minor enhancements	2016-12-01 20:01:39 +09:00
Dean Herbert	918a3bc74f	Add glow and bling to game mode selector.	2016-12-01 19:15:34 +09:00
Dean Herbert	3a5c41b970	Restore additive blending for toolbar button backgrounds.	2016-12-01 18:54:32 +09:00
Dean Herbert	11f958030f	Make Triangles more flexible and more random.	2016-12-01 18:53:13 +09:00
Dean Herbert	6554a4ea58	Fix shadow not displaying around avatar.	2016-12-01 17:45:32 +09:00
Dean Herbert	25d3818e7a	Fix game mode selector line regression.	2016-12-01 17:45:21 +09:00
Dean Herbert	6ccce88a0e	Add proper user data retrieval on connect.	2016-12-01 16:44:24 +09:00
Dean Herbert	d7ab74363d	Simplify toolbar width/padding calculations. Add avatar display (incorrect user id).	2016-12-01 16:05:54 +09:00
Dean Herbert	0b0fe2a857	Remove incorrect verbatim string specifications.	2016-12-01 16:04:58 +09:00
Dean Herbert	167b559a95	Move toolbar to own namespace.	2016-12-01 14:22:29 +09:00
Dean Herbert	13d26d0601	Tidy up options login section code; fix incorrect flow logic for online state.	2016-12-01 13:07:19 +09:00
Dean Herbert	9d05c132e8	Make Toolbar an IOnlineComponent to tidy up state change logic.	2016-12-01 13:03:40 +09:00
Dean Herbert	c6b7e90739	Merge branch 'refs/heads/master' into online-improvements	2016-12-01 12:51:45 +09:00
Huo Yaoyuan	3a4fb2ffed	IsEnabled property for drag bar of music controller.	2016-12-01 08:20:24 +08:00
Thomas Müller	579b8328dc	Revert "Fix options sidebar being transparent when moving in from the side, showing a view of the broken region left of the gamemode stack." ... This reverts commit 27a13eec97.	2016-11-30 20:50:41 +01:00
Thomas Müller	27a13eec97	Fix options sidebar being transparent when moving in from the side, showing a view of the broken region left of the gamemode stack.	2016-11-30 20:22:23 +01:00
Dean Herbert	ed879f33df	Add logout button and check for inputs before allowing login.	2016-11-30 19:43:03 +09:00
Dean Herbert	01dc7cb5c2	Thread safety, username saving correctly etc.	2016-11-30 19:22:36 +09:00
Dean Herbert	3fa80d2376	Update client id/secret and bring API endpoints up-to-date.	2016-11-30 18:30:24 +09:00
Dean Herbert	a980671c54	Add basic ChatOverlay state handling.	2016-11-30 18:30:19 +09:00
Dean Herbert	11f726ad45	Add basic login flow.	2016-11-30 18:30:15 +09:00
Dean Herbert	88748499fa	Register chat overlay with API.	2016-11-30 18:30:10 +09:00
Dean Herbert	18509e6a60	ChatConsole -> ChatOverlay. Namespace tidying.	2016-11-30 18:30:06 +09:00
Dean Herbert	34e91c8474	Add the concept of IOnlineComponents, registered tot he API for handling state changes.	2016-11-30 18:30:01 +09:00
Dean Herbert	481b9d3208	Make opening options shift the rest of the screen as per design.	2016-11-30 18:28:18 +09:00
Dean Herbert	6809e2ce0a	Use DI to get api for ChatConsole.	2016-11-30 17:07:36 +09:00
Dean Herbert	c26587ec3a	Update depth comparer name.	2016-11-30 15:50:48 +09:00
Dean Herbert	5101297f53	Add drop shadows to main menu buttons.	2016-11-30 15:02:53 +09:00
Dean Herbert	d65a275e32	Improve transition of toolbar when hovering.	2016-11-30 13:50:30 +09:00
Dean Herbert	476168eec2	Add shadow to main menu button/icon text.	2016-11-30 13:15:34 +09:00
Dean Herbert	1e037b3eaa	Merge remote-tracking branch 'refs/remotes/upstream/master' into fix-depth	2016-11-30 12:21:12 +09:00
Dean Herbert	e49f312f3f	Merge pull request #207 from Tom94/fix-back-button-hover ... Fix being able to hover the back button from outside of its shape.	2016-11-30 12:20:34 +09:00
Thomas Müller	a456eb6f1b	Fix being able to hover the back button from outside of its shape. ... Could alternatively done by shearing the entire button, but then you would need a positional x-offset depending on whether the anchor is top or bottom.	2016-11-29 21:12:49 +01:00
Thomas Müller	d0065d2d20	Merge pull request #205 from peppy/scoring ... Wire up basic scoring.	2016-11-29 20:56:53 +01:00
Thomas Müller	b12b82fdd3	Fix depth values.	2016-11-29 20:50:12 +01:00
Dean Herbert	53df2932ad	Merge pull request #199 from stanriders/back-button ... Add stable-alike BackButton	2016-11-30 03:20:03 +09:00
stanriders	988a9bbaad	Switch to relative sizes	2016-11-29 20:27:59 +03:00
Dean Herbert	74e3a87f78	Add *very* basic ranking screen.	2016-11-29 23:59:56 +09:00
Dean Herbert	ca0bea7534	Rename MaximumCombo to HighestCombo.	2016-11-29 22:05:21 +09:00
Dean Herbert	d71b284642	Make ScoreProcessor abstract and avoid making AddJudgement virtual.	2016-11-29 22:02:37 +09:00
Dean Herbert	eb70ae788c	Store max combo in ScoreProcessor.	2016-11-29 21:57:53 +09:00
Dean Herbert	18d331f869	Add combo info to JudgementInfo.	2016-11-29 21:46:30 +09:00
Dean Herbert	f8c1f4dd58	Add basic slider judgement handling.	2016-11-29 21:40:24 +09:00
Dean Herbert	2947121e48	Hook up ScoreProcessor to Scoreoverlay etc.	2016-11-29 21:28:43 +09:00
Dean Herbert	9d2a69f1e2	Add concept of ScoreProcessor.	2016-11-29 20:30:16 +09:00
Dean Herbert	fbf35c904d	Fix Config regression with DI.	2016-11-29 18:49:03 +09:00
Dean Herbert	fa80cc84f8	Fix volume control fill being incorrect on first display.	2016-11-29 18:35:59 +09:00
Dean Herbert	139fe873f3	Remove silly weld weld weld.	2016-11-29 18:35:40 +09:00
Dean Herbert	9871960112	Basic score flow.	2016-11-29 17:34:16 +09:00
Dean Herbert	a47507fff3	Remove redundant property assignments.	2016-11-29 16:54:54 +09:00
Dean Herbert	3526c299ec	Reformat code.	2016-11-29 16:24:37 +09:00
stanriders	2ecf72d0d7	More consts, less crap (probably)	2016-11-29 05:36:48 +03:00
Dean Herbert	a506e91b7c	Fix compile issues.	2016-11-28 23:05:05 +09:00
Dean Herbert	49470318f2	Remove silly static using statement.	2016-11-28 22:48:28 +09:00
Dean Herbert	187a8bbfa7	Don't store beatmap reference in hitobjects.	2016-11-28 18:45:50 +09:00
Dean Herbert	bf63be0602	Add better slider duration calculation using bpm and difficulty information.	2016-11-28 15:31:54 +09:00
Dean Herbert	a5651427f6	Add basic ControlPoint parsing.	2016-11-28 15:12:11 +09:00
stanriders	775e8ac5d6	Hardcoded button size, fixed input handling, fixed flash not being visible	2016-11-27 18:56:05 +03:00
Thomas Müller	bd872f6ab8	Explicitly make various member variabled of CursorTrail private.	2016-11-27 15:04:56 +01:00
Thomas Müller	724f849543	Fix incorrect BeatmapPanel border caused by triangles.	2016-11-27 11:49:51 +01:00
stanriders	fb3d5a3b79	One more	2016-11-27 07:18:56 +03:00
stanriders	a3ceef48a6	More backbutton	2016-11-27 07:06:50 +03:00
stanriders	88ead18929	Backbutton improvements	2016-11-27 06:50:36 +03:00
stanriders	ba18c9a309	Merged ExtendableButton and BackButton	2016-11-27 05:48:31 +03:00
stanriders	af57984d5c	Moved ExtendableButton out of framework	2016-11-27 04:41:17 +03:00
stanriders	e9343fe53d	Add stable-alike BackButton	2016-11-27 04:21:12 +03:00
Thomas Müller	069a19a916	Make CursorTrail efficient and add colouring and transparency support.	2016-11-26 18:01:24 +01:00
Thomas Müller	23d0e52d4f	Optimize draw portion of cursor trail.	2016-11-26 14:08:43 +01:00
Dean Herbert	be0cc7badc	Code tidying.	2016-11-26 19:25:58 +09:00
Dean Herbert	c978a4c091	Tidy up code. Make trail smooth.	2016-11-26 19:22:56 +09:00
Dean Herbert	af18d25357	Move some styling inside BeatmapInfoWedge and fix initial transition happening too early.	2016-11-26 17:31:35 +09:00
Dean Herbert	5764bf8093	Improve IsAlive logic.	2016-11-26 17:22:58 +09:00
Dean Herbert	a1c3d15e6c	Add triangles to difficulty panels.	2016-11-26 17:10:13 +09:00
Dean Herbert	ebab9d66bf	Merge remote-tracking branch 'refs/remotes/upstream/master' into carousel-fixes	2016-11-26 17:08:40 +09:00
Dean Herbert	82a708d2c0	Merge pull request #189 from SirCmpwn/general-fixes ... General fixes	2016-11-26 16:56:07 +09:00
Dean Herbert	396ca9fe91	Remove HitJudgementResolver; reimplement in DrawableHitObject.	2016-11-26 16:51:51 +09:00
Dean Herbert	e36a51acf0	Custom LifetimeList (experimental).	2016-11-25 18:30:13 +09:00
Dean Herbert	f9f72f25a2	Add basic flow for hitobject judgement.	2016-11-25 16:26:50 +09:00
Drew DeVault	89effca12e	Remove need for PlaySongSelect ctor to take a db	2016-11-25 00:44:46 -05:00
Drew DeVault	69cb9cf4de	Fix up volume encapsulation	2016-11-25 00:21:42 -05:00
Drew DeVault	a3db259071	Fix VolumeMeter.Bindable	2016-11-25 00:21:42 -05:00
Dean Herbert	4184dd2329	Change the way we set our initial y position on first display.	2016-11-25 12:50:18 +09:00
Dean Herbert	f540bf3765	Ensure set headers are above difficulties.	2016-11-25 12:48:59 +09:00
Dean Herbert	35a02aa972	Fade in headers but not difficulties by default.	2016-11-25 12:48:41 +09:00
Dean Herbert	12c74b1b0b	Don't set hidden; make it based on alpha value.	2016-11-25 12:47:58 +09:00
Tom94	97b0da1d6b	Merge branch 'master' of github.com:ppy/osu into general-fixes	2016-11-24 20:26:44 +01:00
Tom94	495cb926f7	Move beatmap panels back to an X of 0 when they are unselected.	2016-11-24 20:25:29 +01:00
Dean Herbert	6c69bd2ba3	Fix regression causing crash on using z/x in player mode.	2016-11-24 21:27:12 +09:00
Dean Herbert	3dff72ac6c	Bypass masking checks for input on playfields.	2016-11-24 18:59:09 +09:00
Dean Herbert	c48acd4c3d	Fix coordinates being in wrong space.	2016-11-24 16:17:40 +09:00
Dean Herbert	9938084343	Make parallax container work with global mouse state (so it ignores bounds checks).	2016-11-24 16:04:16 +09:00
Dean Herbert	ece3bc0e01	Refactor BeatmapInfoWedge to be async.	2016-11-24 13:48:48 +09:00
Dean Herbert	1eb04ff11e	Don't use the overlay suffix for beatmapInfo wedge.	2016-11-24 13:35:25 +09:00
Dean Herbert	311b5c623c	Adjust difficulty panel offsets slightly.	2016-11-24 13:33:32 +09:00
Tom94	718f2b13a8	Do not change depth value of drawables currently contained within a container.	2016-11-24 13:23:05 +09:00
Tom94	3e4ff27865	Simplify Y position computations and do not scroll to selected beatmap whenever Y positions are recomputed.	2016-11-23 17:42:21 +01:00
Dean Herbert	20ae8df2bd	Refactor volume control to load asynchronously.	2016-11-23 16:12:21 +09:00
Dean Herbert	0c841cffdd	Change GetChildren recursive default to false (should be more common).	2016-11-23 15:34:32 +09:00
Dean Herbert	1e0b7dffc0	Move WedgeBackground to its own class and improve display a bit.	2016-11-23 14:29:20 +09:00
Dean Herbert	622b127180	One missing carousel rename.	2016-11-23 13:28:49 +09:00
Dean Herbert	60d939f323	Use FillMode in more cases.	2016-11-23 13:18:22 +09:00
Dean Herbert	2e05ec0296	Fix scaling of BeatmapInfoOverlay wedge.	2016-11-23 13:07:35 +09:00
Dean Herbert	611619fd9c	Fix some namespaces.	2016-11-23 12:00:17 +09:00
Dean Herbert	b3b7fb90c5	Add shadows to toolbar tooltips.	2016-11-23 11:35:52 +09:00
Thomas Müller	030a20a3f2	Fix minor issues with alpha fading at edges.	2016-11-22 21:58:46 +01:00
Thomas Müller	5cf5e8c80c	Move BeatmapInfoOverlay into its own class. ... No loading async optimizations yet.	2016-11-22 21:51:42 +01:00
Thomas Müller	9bf23bc4ad	Only handle beatmap panels that are visible in song select.	2016-11-22 21:41:48 +01:00
Thomas Müller	ba1d3ab20e	Carousell -> Carousel	2016-11-22 20:10:25 +01:00
Thomas Müller	2596e71494	Improve smooth movement in beatmap carousel.	2016-11-22 20:10:04 +01:00
Thomas Müller	20be2f4628	Terminate loop through beatmap groups when having found a selection.	2016-11-22 19:00:42 +01:00
Thomas Müller	b22762d0e1	Merge branch 'master' of github.com:ppy/osu into better-song-select	2016-11-22 18:55:13 +01:00
Dean Herbert	d71550d22a	Don't do a recursive fill by default, we don't need it.	2016-11-22 22:07:28 +09:00
Dean Herbert	4cf2dd90d6	Standardise and simplify the amount of beatmap information passed around song select.	2016-11-22 22:07:15 +09:00
Dean Herbert	ccb00aeb94	Add comment about wedgedBeatmapInfo performance issues.	2016-11-22 21:43:35 +09:00
Dean Herbert	b73cdba08c	Change the structure of BeatmapSetHeader to allow for bufferedcontainer invalidation.	2016-11-22 21:38:46 +09:00
Dean Herbert	a3234a5269	Avoid synchronous queries in BackgroundModeBeatmap.	2016-11-22 21:22:12 +09:00
Dean Herbert	3bc38268a0	Make MusicController more async.	2016-11-22 20:47:28 +09:00
Dean Herbert	f576b4bf82	Don't use texture atlases for beatmap backgrounds.	2016-11-22 20:14:58 +09:00
Dean Herbert	0109c79cae	Async load of panel backgrounds (failing for on-screen panels).	2016-11-22 19:48:51 +09:00
Dean Herbert	2ba365657e	Tidy up some linq.	2016-11-22 17:21:42 +09:00
Dean Herbert	a251db804c	Stop adding beatmaps to song select when disposed.	2016-11-22 16:13:38 +09:00
Dean Herbert	7df8324957	Explicit disposal via using() to WorkingBeatmap.	2016-11-22 14:57:53 +09:00
Dean Herbert	070c7dc621	Merge remote-tracking branch 'refs/remotes/upstream/master' into input-handler-improvements	2016-11-22 12:37:57 +09:00
Dean Herbert	3e9c398652	Update input handler logic to match framework changes.	2016-11-21 21:36:11 +09:00
Dean Herbert	41a84ba00c	Add finalizer logic for WorkingBeatmap for now.	2016-11-21 21:35:10 +09:00
Thomas Müller	d32f11b5e2	Smoother movement within song select.	2016-11-21 07:59:46 +01:00
Thomas Müller	318fe2f9d6	Fix broken VisualTests SongSelect.	2016-11-20 20:43:43 +01:00
Thomas Müller	c6d688898f	Initial implementation of a beatmap carousell and various minor improvements to song select. ... No big optimizations yet, but groundwork is laid out.	2016-11-20 20:34:16 +01:00
Thomas Müller	40805ad32c	Adjust size of wedged background overlay.	2016-11-20 12:29:38 +01:00
Thomas Müller	57e7c7097d	Update framework and add rudimentary fading to song select screen.	2016-11-20 12:16:54 +01:00
Thomas Müller	0fdd505807	Add wedged background overlay to song select.	2016-11-20 10:02:20 +01:00
Thomas Müller	f8788bb24b	Update the background according to the currently selected beatmap and blur it within song select.	2016-11-19 17:39:43 +01:00
Dean Herbert	3ac89216bd	Standardise some naming and make hitcircles feel better.	2016-11-19 19:07:57 +09:00
Dean Herbert	acb85d0140	Fix regressions in combo counters and tidy up naming of SpriteTexts.	2016-11-19 16:19:54 +09:00
Dean Herbert	1242ae3f2a	Add the concept of a HitJudgementResolver.	2016-11-19 16:19:26 +09:00
Dean Herbert	4db2a1e693	Split ApproachCircle out into its own class.	2016-11-18 17:47:47 +09:00
Dean Herbert	885df47864	Add simple implementation of HitExplosions.	2016-11-16 19:24:48 +09:00
Dean Herbert	b61521a93c	Tidy up Player.cs.	2016-11-16 15:48:35 +09:00
Dean Herbert	42d2d39ade	Merge pull request #171 from huoyaoyuan/improvements ... Various improvements	2016-11-16 12:00:55 +09:00
Huo Yaoyuan	53deaf2a00	Merge branch 'master'	2016-11-16 10:51:39 +08:00
Dean Herbert	89bb87a6f3	Merge pull request #176 from Tom94/simpler-gradient ... Use gradient helper function to create toolbar tooltip gradient.	2016-11-16 11:18:31 +09:00
Thomas Müller	e049f8582a	Fix option checkbox losing its glow incorrectly in certain cases.	2016-11-15 19:11:36 +01:00
Thomas Müller	746c28246f	Use gradient helper function to create toolbar tooltip gradient.	2016-11-15 19:09:30 +01:00
Thomas Müller	696d21f762	Merge pull request #174 from peppy/general-fixes ... General fixes	2016-11-15 18:20:48 +01:00
Dean Herbert	d846246ef2	ShowToolbar -> ShowOverlays; include MusicController.	2016-11-15 20:55:57 +09:00
Dean Herbert	2af839cdbd	Render musicController above toolbar.	2016-11-15 20:55:55 +09:00
Dean Herbert	0b8c307549	Toolbar should block Hover events.	2016-11-15 20:55:53 +09:00
Dean Herbert	a2d505af78	ToolbarButtons should still handle MouseDown events.	2016-11-15 20:55:52 +09:00
Dean Herbert	f415e5820f	Add an implementation of the new design of checkboxes.	2016-11-15 19:35:01 +09:00
Dean Herbert	5b1711f797	Update some colour palette discrepancies in options.	2016-11-15 19:34:58 +09:00
Dean Herbert	1f73bb4cf0	Set drag bar to correct orange.	2016-11-15 19:34:55 +09:00
Dean Herbert	a92404413c	Adjust padding and fonts of options.	2016-11-15 19:34:53 +09:00
Dean Herbert	2cbe2b34fd	Change default font weight to Medium.	2016-11-15 19:34:50 +09:00
Dean Herbert	566e09083f	Add gradient overlay when hovering toolbar to make tooltips more visible. ... Also adjusts opacity of toolbar.	2016-11-15 16:25:41 +09:00
Dean Herbert	4b6c139c3e	Toolbar buttons should handle on click, not mouse down.	2016-11-15 15:31:48 +09:00
Dean Herbert	867797a089	Change volume control mouse wheel behaviour to not gain full-screen focus.	2016-11-15 15:22:14 +09:00
Dean Herbert	51235343fd	Fix ChatConsole regression.	2016-11-15 14:46:57 +09:00
Dean Herbert	abdfe42388	Merge branch 'refs/heads/master' into better-anchors ... # Conflicts: # osu.Game.Mode.Osu/UI/OsuComboCounter.cs # osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs	2016-11-15 14:33:13 +09:00
Thomas Müller	997bc16d63	Fix incorrect positioning of ButtonSystem.	2016-11-14 19:18:16 +01:00
Huo Yaoyuan	dcd3ba0915	Make Player.Autoplay can be set.	2016-11-15 01:49:06 +08:00
Huo Yaoyuan	f2f6fe8e00	Set option object to members.	2016-11-15 01:49:06 +08:00
Huo Yaoyuan	c8d23408d7	Fix ChatLine for now.	2016-11-15 01:49:05 +08:00
Huo Yaoyuan	1cddc4eb5b	Use EqualityComparer<T> to avoid boxing and casting when comparing.	2016-11-15 01:49:05 +08:00
Tom94	c860eb25f9	Migrate to new anchor system without x/y reversal.	2016-11-14 17:22:20 +01:00
Dean Herbert	08bf7c6d39	Make abstract ruleset no play mode.	2016-11-15 01:06:53 +09:00
Dean Herbert	e01057df3d	Add thread safety somewhere it will never be required.	2016-11-14 23:13:47 +09:00
Dean Herbert	9a8003f6fa	Merge remote-tracking branch 'refs/remotes/upstream/master' into project-restructure ... # Conflicts: # osu.Game/Beatmaps/Objects/Osu/OsuBaseHit.cs	2016-11-14 22:08:30 +09:00
Dean Herbert	d3f810f72f	Introduce concept of HitObjectParsers, fix tests and stop using reflection (unreliable due to lazy loading).	2016-11-14 22:03:39 +09:00
Dean Herbert	0011d7f720	Simplify linq.	2016-11-14 20:24:44 +09:00
Dean Herbert	5dd4e31011	Move DrawableHitObject.	2016-11-14 19:49:29 +09:00
Dean Herbert	07fee61989	Use reflection to load Rulesets.	2016-11-14 19:20:27 +09:00
Dean Herbert	4590be552f	Move play modes to their own projects.	2016-11-14 18:54:24 +09:00
Dean Herbert	06f4f93918	Move play modes to Modes namespace.	2016-11-14 18:03:20 +09:00
Dean Herbert	0f4538f69f	Rename GameModes namespace to Screens.	2016-11-14 17:23:33 +09:00
Dean Herbert	0b203a7bf4	Move enum to end of file.	2016-11-14 16:50:17 +09:00
Dean Herbert	dde3a68c8f	Account for anchor when dragging MusicController (fixes VisualTest).	2016-11-14 16:40:13 +09:00
Dean Herbert	1d51e6af2a	Merge pull request #168 from huoyaoyuan/fixes ... Fixes for music controller	2016-11-14 16:11:31 +09:00
Dean Herbert	eb32d842cc	Use switch instead of if-else.	2016-11-14 16:10:07 +09:00
Dean Herbert	57c4314cae	Merge remote-tracking branch 'refs/remotes/upstream/master' into options-improvements	2016-11-14 16:00:06 +09:00
Dean Herbert	c37afd7a81	Merge pull request #166 from Tom94/various-improvements ... Various improvements	2016-11-14 15:59:17 +09:00
Huo Yaoyuan	86a6c7641d	Make TransformDirection more clear.	2016-11-14 04:59:41 +08:00
Huo Yaoyuan	7c8ef2a82b	Select and unselect BeatmapPanel when selecting BeatmapGroup.	2016-11-14 04:22:06 +08:00
Huo Yaoyuan	33a35ca711	Do not set WorkingBeatmap explicitly in mode stack.	2016-11-14 04:01:48 +08:00
Huo Yaoyuan	afab938794	Strongly typed TransformDirection for music controller.	2016-11-14 03:21:07 +08:00
Thomas Müller	ac99e2d488	Avoid using load to construct the drawable hierarchy whereever possible.	2016-11-12 18:34:36 +01:00
Thomas Müller	16dc74df5b	Avoid stack overflow when trying to push a not-yet async loaded background.	2016-11-12 18:33:47 +01:00
Dean Herbert	75be78752b	Merge remote-tracking branch 'refs/remotes/upstream/master' into options-sidebar-tracking ... # Conflicts: # osu.Game/osu.Game.csproj	2016-11-12 22:30:15 +09:00
Thomas Müller	6355c8bd45	Hide scrolldragger in options.	2016-11-12 13:10:53 +01:00
Thomas Müller	1c47773e0d	Make sidebar behaviour feel a bit nicer.	2016-11-12 13:08:34 +01:00
Thomas Müller	e923da1998	Fix lastKnownScroll never being written to.	2016-11-12 12:30:12 +01:00
Thomas Müller	98b69bc6c6	Merge branch 'master' of github.com:ppy/osu into SirCmpwn/options-sidebar-tracking ... # Conflicts: # osu.Game/osu.Game.csproj	2016-11-12 12:24:02 +01:00
Dean Herbert	cc0f61f545	Merge branch 'refs/heads/master' into dependency-injection ... # Conflicts: # osu-framework # osu.Game/GameModes/OsuGameMode.cs # osu.Game/GameModes/Play/Player.cs # osu.Game/OsuGame.cs # osu.Game/Overlays/MusicController.cs # osu.Game/Overlays/Options/EditorSection.cs # osu.Game/Overlays/Options/Input/MouseOptions.cs # osu.Game/Overlays/Options/Online/InGameChatOptions.cs # osu.Game/Overlays/Options/SkinSection.cs	2016-11-12 20:18:26 +09:00
Dean Herbert	646fe5c5f4	Merge pull request #155 from peppy/player-improvements ... Introduce back the concept of Rulesets.	2016-11-12 18:34:32 +09:00
Dean Herbert	80f146e4bd	Fix a locally set beatmap getting overridden by the game-global one.	2016-11-12 18:26:27 +09:00
Dean Herbert	099b309645	Introduce back the concept of Rulesets.	2016-11-12 18:26:21 +09:00
Dean Herbert	16a0be44df	Add local InputManager to Player; handle Z and X.	2016-11-12 18:26:14 +09:00
Dean Herbert	18c0e431c1	Fix some nullrefs.	2016-11-12 18:25:58 +09:00
Dean Herbert	3b99a8fd06	Add a shadow and bit of elasticity to MusicController.	2016-11-12 17:09:58 +09:00
Dean Herbert	b65eb33774	Fix weird artifacting when the MusicController fades in and out by using a buffered container.	2016-11-12 16:44:31 +09:00
Dean Herbert	8d56a881d0	Merge pull request #157 from SirCmpwn/string-options ... Add TextBoxOption and wire it up	2016-11-12 16:11:09 +09:00
Dean Herbert	12bc259071	Merge pull request #158 from SirCmpwn/implement-options ... Implement ShowUnicode option behavior	2016-11-12 16:10:27 +09:00
Dean Herbert	a39d28efe2	Merge pull request #159 from SirCmpwn/platform-options ... Remove certain options when not running on Windows	2016-11-12 16:05:47 +09:00
Drew DeVault	00cc4278da	Split off SidebarButton	2016-11-12 01:53:20 -05:00
Drew DeVault	a8bba445db	Move scroll logic into Update	2016-11-12 01:44:26 -05:00
Drew DeVault	32196c57af	Track the visible section in options	2016-11-12 01:44:11 -05:00
Dean Herbert	ff67b77c5b	Merge pull request #154 from peppy/sidebar-toolbar-coexistence ... Make options overlay coexist with toolbar.	2016-11-11 13:34:08 +09:00
Dean Herbert	27542d9747	Merge pull request #151 from SirCmpwn/options-sidebar ... Expand the options sidebar on hover	2016-11-11 13:33:10 +09:00
Dean Herbert	a0e1513df6	Merge branch 'refs/heads/master' into sidebar-toolbar-coexistence ... # Conflicts: # osu.Game/OsuGame.cs	2016-11-11 13:30:57 +09:00
Drew DeVault	d36c8e9203	Remove certain options when not running on Windows	2016-11-10 21:54:01 -05:00
Drew DeVault	d49b418449	Implement ShowUnicode option behavior	2016-11-10 21:35:58 -05:00
Drew DeVault	e2365cfad2	s/internalText/InternalText/g	2016-11-10 18:25:20 -05:00
Drew DeVault	a81f099d40	Add TextBoxOption and wire it up	2016-11-10 18:17:15 -05:00
Drew DeVault	0d4560a054	Update to latest DI stuff	2016-11-10 17:40:42 -05:00
Drew DeVault	7327db307b	Fix player loading from song select	2016-11-10 16:43:04 -05:00
Drew DeVault	2362665b8a	Re-cache the new FontStore when overwritten ... Fixes issues with font loading	2016-11-10 16:43:04 -05:00
Drew DeVault	fe9034323b	Get the game running, though not perfectly	2016-11-10 16:42:29 -05:00
Drew DeVault	ee24cd310c	Convert everything to DI pattern	2016-11-10 16:41:18 -05:00
Drew DeVault	dc03f36793	Use DI for Player	2016-11-10 16:38:44 -05:00
Drew DeVault	19fd6fe249	Introduce dependency injection	2016-11-10 16:38:25 -05:00
Dean Herbert	788c11de10	Merge pull request #103 from huoyaoyuan/music-controller ... Music controller	2016-11-10 12:54:56 +09:00
Dean Herbert	904d258dc3	Fix checkbox not updating correctly.	2016-11-09 20:13:13 +09:00
Dean Herbert	a5dcae859c	Give OptionsOverlay an offset to make up for toolbar possibly being present.	2016-11-09 15:24:27 +09:00
Dean Herbert	d9bd3717d0	Re-organise overlay-level elements in OsuGame.	2016-11-09 15:24:24 +09:00
Dean Herbert	fdb83bed79	Make OsuGameModes self-aware of if they want a toolbar or not.	2016-11-09 15:24:22 +09:00
Dean Herbert	9d1d5a5cea	Modify toolbar tooltips to be closer to design.	2016-11-09 15:24:19 +09:00
Drew DeVault	676cdc44b2	Add expanding options sidebar	2016-11-08 23:36:06 -05:00
Drew DeVault	3ad633f363	Wire up all of the boolean options	2016-11-08 23:17:08 -05:00
Dean Herbert	04fa1f897e	Use margin instead of padding so mouseDown events on the sidebar buttons don't interrupt scrolling.	2016-11-09 12:32:38 +09:00
Dean Herbert	d41d7b8e9a	Don't derive ScrollContainer unnecessarily.	2016-11-09 12:10:22 +09:00
Dean Herbert	d70e8806b4	Merge remote-tracking branch 'refs/remotes/upstream/master' into options-fixes	2016-11-09 11:41:36 +09:00
Dean Herbert	28a94e2df1	Remove unused constant.	2016-11-08 20:35:21 +09:00
Dean Herbert	3ef26a6bf0	Fix paddings, transitions, const variable names.	2016-11-08 20:23:18 +09:00
Dean Herbert	97f3023cd9	Ctrl+O for options.	2016-11-08 19:27:37 +09:00
Dean Herbert	4426a683ed	Move OptionsOverlay to OsuGame.	2016-11-08 19:26:12 +09:00
Dean Herbert	89b11ed099	Handle sidebar buttons onClick not onMouseDown.	2016-11-08 19:18:31 +09:00
Dean Herbert	8c68f9ba93	OptionsSideNav -> OptionsSidebar.	2016-11-08 19:17:09 +09:00
Dean Herbert	3b0114671e	Max sidebar draggable.	2016-11-08 19:16:39 +09:00
Dean Herbert	30323876a8	Use preload for options (fix icons).	2016-11-08 18:49:20 +09:00
Dean Herbert	a851d7b44f	Updates.	2016-11-08 18:33:31 +09:00
Dean Herbert	c36b54b35a	Merge remote-tracking branch 'refs/remotes/upstream/master' into generic-container	2016-11-08 18:29:21 +09:00
Drew DeVault	743c1bde58	Wire up alternative chat font	2016-11-07 22:37:21 -05:00
Drew DeVault	1bca78f4b6	Wire up one of the settings to the config ... One step at a time, right	2016-11-07 22:36:24 -05:00
Drew DeVault	fbbd05e606	Remove unnecessary TODO	2016-11-07 22:28:02 -05:00
Drew DeVault	a6593505b3	Say NO to RelativeSizeAxes = Both	2016-11-07 22:19:02 -05:00
Drew DeVault	4d04eb6fb1	Rearrange some options a bit, update framework	2016-11-07 22:15:48 -05:00
Drew DeVault	cbbac0565f	Remove unused using statements	2016-11-07 21:28:06 -05:00
Drew DeVault	1ce6a7285a	Rearrange options namespaces	2016-11-07 21:24:41 -05:00
Drew DeVault	b2bbdfa284	Refactor how the sidebar buttons are created/used	2016-11-07 18:04:49 -05:00
Drew DeVault	e6c3fc1091	Implement scrolling to each section	2016-11-07 17:07:55 -05:00
Huo Yaoyuan	ef5968e243	More robust metadata handling.	2016-11-07 23:12:49 +08:00
Huo Yaoyuan	fd977cacb3	Fix corner case when shuffling.	2016-11-07 23:06:14 +08:00
Huo Yaoyuan	02b903f1ea	Shuffle playlist.	2016-11-07 22:12:58 +08:00
Huo Yaoyuan	dc347a74f5	Don't play transition if audio equals.	2016-11-07 21:58:30 +08:00
Huo Yaoyuan	c59cad2478	AudioEquals method for BeatmapInfo.	2016-11-07 21:52:23 +08:00
Huo Yaoyuan	d1f64cfbfc	Make external changes into history.	2016-11-07 21:30:25 +08:00
Huo Yaoyuan	ad1dccf6ce	Use play history for back and forward.	2016-11-07 21:25:37 +08:00
Huo Yaoyuan	644e337cf6	Add a list for play history.	2016-11-07 20:57:33 +08:00
Dean Herbert	d57d5daac9	Support generic FlowContainer.	2016-11-07 21:17:29 +09:00
Dean Herbert	a61fb5ef5d	Initial updates to make generic containers work.	2016-11-07 21:13:56 +09:00
Huo Yaoyuan	c272041f37	Block click and drag at MusicController level.	2016-11-07 20:07:45 +08:00
Huo Yaoyuan	736079a60d	Update FontAwesome usage.	2016-11-07 19:00:20 +08:00
Huo Yaoyuan	8037f1233f	Merge branch 'master'	2016-11-07 18:58:35 +08:00
Dean Herbert	f14a35d480	Update FontAwesome definitions.	2016-11-07 17:59:00 +09:00
Thomas Müller	90c889a7ce	Smoothen wedged buttons in main menu and the wedges on song select background.	2016-11-06 19:34:44 +01:00
Thomas Müller	103176826f	Ensure transformations are never used prior to being added to the Drawable tree.	2016-11-06 11:13:52 +01:00
Thomas Müller	32ee20b843	Merge branch 'master' of github.com:ppy/osu into better-clocks ... # Conflicts: # osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs	2016-11-06 10:08:24 +01:00
Thomas Müller	5f2bf165a2	Remove now obsolete clock usages.	2016-11-06 10:06:09 +01:00
Huo Yaoyuan	c8a7bd2ece	Minor implementation changes.	2016-11-06 16:47:37 +08:00
Huo Yaoyuan	000c2218b8	Make background update happens in update thread, and thread-safer.	2016-11-06 16:34:47 +08:00
Thomas Müller	8894e5f73a	Fade the options overlay to prevent unnecessary updates to its content.	2016-11-06 08:54:36 +01:00
Thomas Müller	a6c0fd29f2	Make use of new timing system in Drawables and Transforms.	2016-11-06 08:25:21 +01:00
Maciej	bcc1d7c669	Background scaling different approach	2016-11-06 04:37:41 +01:00
Maciej	c4132339a6	Working beatmap background scaling fix ... Add a check for the working beatmap background width and assign a proper scaling value to cover the whole box	2016-11-06 04:12:35 +01:00
Huo Yaoyuan	d63e3b6724	Add fallback texture of beatmap when getting null;	2016-11-06 05:37:55 +08:00
Huo Yaoyuan	0c6825bb20	Adjust visual behavior.	2016-11-06 05:35:35 +08:00
Huo Yaoyuan	c53298a3b1	Update font size (*1.25) to follow the design image.	2016-11-06 01:53:10 +08:00
Huo Yaoyuan	74000f77ad	Set font in music controller.	2016-11-06 01:50:38 +08:00
Huo Yaoyuan	a19bb1270d	Async workflow on music controller.	2016-11-06 00:46:09 +08:00
Huo Yaoyuan	859a59a8ab	Set children in constructor.	2016-11-06 00:24:03 +08:00
Huo Yaoyuan	5eed07db57	Update access of WorkingBeatmap.	2016-11-06 00:13:45 +08:00
Huo Yaoyuan	c470140d64	Merge branch 'master'	2016-11-06 00:11:30 +08:00
Dean Herbert	3c8f94dd0f	Merge pull request #136 from Tom94/general-fixes ... Fix wrong initial state of beatmap panels.	2016-11-05 23:04:37 +09:00
Thomas Müller	7c7e2160ec	Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2	2016-11-05 14:05:42 +01:00
Thomas Müller	619d97c642	Fix indentation and typo.	2016-11-05 13:51:52 +01:00
Thomas Müller	07e74068e7	Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2 ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs # osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs	2016-11-05 13:35:15 +01:00
Huo Yaoyuan	e69dac7745	Fix lock object.	2016-11-05 20:21:08 +08:00
Huo Yaoyuan	f2b37e1fe7	Add lock on each property of WorkingBeatmap.	2016-11-05 20:01:46 +08:00
Thomas Müller	ba39a9df8e	Fix wrong initial state of beatmap panels.	2016-11-05 12:24:15 +01:00
Dean Herbert	a11d534067	Add beatmap backgrounds.	2016-11-05 20:00:14 +09:00
Dean Herbert	7cc19d74c6	Add full Exo font set and bring song select panels closer to final design.	2016-11-05 18:22:09 +09:00
Dean Herbert	8fe63689a4	Fix thread safety issue when accessing files in beatmap (zip) files.	2016-11-05 18:19:01 +09:00
Dean Herbert	2ee5e2efb7	Bring framework up-to-date. ... # Conflicts: # osu-framework	2016-11-05 18:18:52 +09:00
Huo Yaoyuan	2d86cb1e81	Merge branch 'master'	2016-11-05 16:21:59 +08:00
Dean Herbert	10f2ed4387	Add explicit privates.	2016-11-04 16:12:35 +09:00
Dean Herbert	b17d219ace	Share Triangles logic.	2016-11-04 16:11:22 +09:00
Dean Herbert	108b7092c9	Fix regression in hitcircle appearance.	2016-11-04 16:08:04 +09:00
Dean Herbert	9df43c6d33	Fix draw order of hitobjects.	2016-11-04 15:43:53 +09:00
Dean Herbert	da18e2d4f6	Fix off-by-one colour retrieval.	2016-11-04 15:43:53 +09:00
Dean Herbert	b72e9221fd	Only add valid hitobjects.	2016-11-04 15:43:53 +09:00
Dean Herbert	74c655ebfc	Fix input not working.	2016-11-04 15:43:53 +09:00
Dean Herbert	b40ccccbe4	Add HitObject colours back in the mix.	2016-11-04 15:43:53 +09:00
Dean Herbert	92b85b251e	Fix scale more.	2016-11-04 15:43:53 +09:00
Dean Herbert	e939746159	Fix scale ratio of gamefield.	2016-11-04 15:43:53 +09:00
Dean Herbert	788cba6f4d	Add autoplay toggle (const).	2016-11-04 15:43:53 +09:00
Dean Herbert	f5f5aa9eac	Fix some incorrect default values.	2016-11-04 15:43:53 +09:00
Dean Herbert	a4e2f25065	Flush recursively, more transform tidying.	2016-11-04 15:43:53 +09:00
Dean Herbert	1854160321	Add hit time and the ability for an external operator to block hits.	2016-11-04 15:43:53 +09:00
Dean Herbert	fbaae94ba4	Limit state changes to apply only once.	2016-11-04 15:43:53 +09:00
Dean Herbert	8d4e7038b3	Part -> Layer.	2016-11-04 15:43:53 +09:00
Dean Herbert	bc53642cab	Fix some warnings.	2016-11-04 15:40:05 +09:00
Dean Herbert	10e5472624	Block mouse events from hitting things behind options.	2016-11-04 12:29:05 +09:00
Dean Herbert	2135b93791	Make options semi-transparent.	2016-11-04 12:28:00 +09:00
Dean Herbert	f3d461e318	Fix some events not firing correctly.	2016-11-04 12:27:43 +09:00
Drew DeVault	408173319b	Refactor options header and layout stuff	2016-11-03 23:01:11 -04:00
Drew DeVault	cb40b7079f	Rework how references are passed about	2016-11-03 22:43:00 -04:00
Drew DeVault	af8e4415c3	Split out [Sub]sections into seperate files	2016-11-03 19:06:22 -04:00
Drew DeVault	1d8c6db0a7	Add remaining options	2016-11-03 19:06:22 -04:00
Drew DeVault	c7fa0a5ab0	Add more options	2016-11-03 19:06:22 -04:00
Drew DeVault	7e77efcfdc	Add Graphics options	2016-11-03 19:06:22 -04:00
Drew DeVault	6c0cef894e	Add OsuButton with sane defaults	2016-11-03 19:06:22 -04:00
Drew DeVault	2aa85a4b18	Split up options into subclasses	2016-11-03 19:06:22 -04:00
Drew DeVault	2f990b884e	Tweak style to more closely match osu!next	2016-11-03 19:06:22 -04:00
Drew DeVault	40e667b2d8	Add default values from old osu	2016-11-03 19:06:22 -04:00
Drew DeVault	89d3f4c2be	Import enum from old osu	2016-11-03 19:06:22 -04:00
Drew DeVault	dd0cb5da01	Add options from old osu	2016-11-03 19:06:22 -04:00
Drew DeVault	9f78f8607b	Implement General options section	2016-11-03 19:06:22 -04:00
Drew DeVault	2aaff01675	Implement config persistence through BasicStorage	2016-11-03 19:06:22 -04:00
Huo Yaoyuan	9e0fbed748	Use PreLoad on music controller.	2016-11-03 22:38:10 +08:00
Huo Yaoyuan	f2a8cc0c29	Merge branch 'master'	2016-11-03 20:38:34 +08:00
Dean Herbert	439204b4fa	Merge remote-tracking branch 'refs/remotes/upstream/master' into async-workflow	2016-11-03 16:44:49 +09:00
Dean Herbert	54dbb0a355	Merge remote-tracking branch 'refs/remotes/upstream/master' into better-glow ... # Conflicts: # osu.Game/Beatmaps/Drawable/Panel.cs	2016-11-02 16:43:35 +09:00
Dean Herbert	617a3f5c4f	Adjust glow colour slightly.	2016-11-02 10:22:46 +09:00
Dean Herbert	2811d55e13	Merge pull request #120 from Tom94/fix-beatmap-panel-border-alpha ... Fix beatmap panel border alpha being way too large.	2016-11-02 09:57:32 +09:00
Thomas Müller	50de8528a5	Use better glow in beatmap selection.	2016-11-01 22:57:11 +01:00
Thomas Müller	128ec8f767	Fix beatmap panel border alpha being way too large.	2016-11-01 22:21:09 +01:00
Dean Herbert	3d611dd57b	Improve coodination of startup sequence.	2016-11-02 01:02:48 +09:00
Dean Herbert	c78e3efc66	Schedule some illegal calls.	2016-11-02 01:02:34 +09:00
Dean Herbert	774b47c1fe	Don't cache drawable for no reason.	2016-11-02 00:53:13 +09:00
Drew DeVault	0edfeaaff9	Move wedgeContainer transition to OnEntering	2016-11-01 09:22:49 -06:00
Dean Herbert	b86f308af6	Add async workflow.	2016-11-01 23:24:14 +09:00
Drew DeVault	e5f948dccc	Fade song select wedges in	2016-10-31 16:16:11 -06:00
Adonais Romero González	fd0900eb3c	I knew I forgot something >:(	2016-10-29 18:42:40 -05:00
Adonais Romero González	ef9d2b5b3c	Minor improvements to combo counters	2016-10-29 18:26:12 -05:00
Dean Herbert	d8ca11bf0d	Use Any instead of First to avoid potential throw.	2016-10-29 04:29:43 +09:00
Dean Herbert	a2f995ebe0	Remove forgotten parens.	2016-10-29 03:44:27 +09:00
Dean Herbert	d47924ff7b	Fix selection not collapsing when clicking set headers exclusively.	2016-10-29 03:43:52 +09:00
Dean Herbert	c969e0b4f0	Remove forced disposal of WorkingBeatmap.	2016-10-29 03:31:40 +09:00
Dean Herbert	eb30882b09	More comments.	2016-10-28 23:40:12 +09:00
Dean Herbert	f0e4a252a5	Add some warning comments.	2016-10-28 23:35:49 +09:00
Dean Herbert	42ad96778e	Tidy shit up; reduce number of unnecssesary events being fired.	2016-10-28 23:29:21 +09:00
Huo Yaoyuan	f1837b4822	Fix changed event and no longer auto play on load.	2016-10-28 21:57:23 +08:00
Huo Yaoyuan	7543d491ae	Add music controller into game.	2016-10-28 21:21:47 +08:00
Huo Yaoyuan	6aba03e1ca	OsuGameMode<-WorkingBeatMap->OsuGameBase.	2016-10-28 21:03:59 +08:00
Huo Yaoyuan	3858c77817	No longer holds OsuGame reference.	2016-10-28 20:47:27 +08:00
Huo Yaoyuan	9b76110605	Interaction with external changes.	2016-10-28 20:44:59 +08:00
Huo Yaoyuan	36cefcb956	Fix to work individually.	2016-10-28 20:34:22 +08:00
Huo Yaoyuan	aa107de162	Store a local copy of WorkingBeatmap.	2016-10-28 20:27:44 +08:00
Dean Herbert	5dc495e41d	Avoid accessing the beatmap too early.	2016-10-28 21:08:32 +09:00
Huo Yaoyuan	7d14e6e6cf	Make prev and next work again.	2016-10-28 20:08:27 +08:00
Huo Yaoyuan	b7ada4866e	Merge remote-tracking branch 'peppy/lets-play' into music-controller	2016-10-28 19:47:35 +08:00
Huo Yaoyuan	7d6e4a8ad2	Make music controller uses WorkingBeatmap.	2016-10-28 19:39:02 +08:00
Dean Herbert	10ef34b805	Lazy parse beatmap; Don't reload audio track if it hasn't changed.	2016-10-28 20:24:14 +09:00
Huo Yaoyuan	7e2350cb13	Merge remote-tracking branch 'refs/remotes/peppy/lets-play'	2016-10-28 19:07:29 +08:00
Dean Herbert	74f1a9622f	Add initial game-wide beatmap flow.	2016-10-28 19:55:48 +09:00
Dean Herbert	0f5614ffa2	Only allow osu! mode maps to be played for now.	2016-10-28 18:07:42 +09:00
Dean Herbert	209f09df91	Don't exception on inability to read audio track.	2016-10-28 18:03:26 +09:00
Dean Herbert	13b5fb0578	Update transforms to not accept clock.	2016-10-28 17:42:00 +09:00
Dean Herbert	0e39c5cc9c	Move Results to own namespace.	2016-10-28 16:10:10 +09:00
Dean Herbert	856e056515	Remove unnecessary finaliser.	2016-10-28 14:18:00 +09:00
Dean Herbert	feccb7286c	Add the concept of a "WorkingBeatmap" and make player load beatmaps and audio from SongSelect.	2016-10-28 14:14:45 +09:00
Dean Herbert	2cdda98b47	Add the ability to retrieve (fallback) metadata from a beatmap.	2016-10-28 14:13:52 +09:00
Dean Herbert	012c29addb	Minor fixes to player flow.	2016-10-27 22:27:45 +09:00
Huo Yaoyuan	eab8caaa0c	Ensure track is playing after seek.	2016-10-27 19:51:38 +08:00
Dean Herbert	d6ed055682	Don't hard-crash on failing to load a beatmap.	2016-10-27 20:37:01 +09:00
Dean Herbert	d9dfc324c1	Rewrite a lot of Song Select to share logic between panels and consolidate logic inside classes where possible.	2016-10-27 19:52:48 +09:00
Huo Yaoyuan	73d1eeb272	Update MusicController using DragBar.	2016-10-27 18:15:43 +08:00
Huo Yaoyuan	35b1d0ae50	Seperated DragBar class.	2016-10-27 18:14:50 +08:00
Huo Yaoyuan	9c2d3990ce	Add spacing in code.	2016-10-27 17:04:41 +08:00
Huo Yaoyuan	3e30935d10	Allow to set database of music controller.	2016-10-27 16:58:40 +08:00
Dean Herbert	c828b1bc7b	Add comment about optional database parameter.	2016-10-27 17:53:47 +09:00
Dean Herbert	9074bc3396	Allow Player to load from BeatmapInfo.	2016-10-27 17:53:37 +09:00
Dean Herbert	a764a97602	Use memory database again, local to TestCasePlaySongSelect.	2016-10-27 17:35:00 +09:00
Dean Herbert	33ef55df88	Allow BeatmapDatabase to be constructed without a host.	2016-10-27 17:34:50 +09:00
Dean Herbert	f16cc430f8	Stop using memory database. Load sample data local to TestCase. ... Also makes the connection private.	2016-10-27 17:08:53 +09:00
Huo Yaoyuan	6482184a09	Dispose ArchiveReader.	2016-10-27 13:34:54 +08:00
Huo Yaoyuan	fead1d4c6f	Seek by clicking and dragging on progress bar.	2016-10-27 13:34:53 +08:00
Huo Yaoyuan	d9fc04748e	Remove redundant class.	2016-10-27 13:34:52 +08:00
Huo Yaoyuan	0da78c19a2	TestCase reset.	2016-10-27 13:34:51 +08:00
Huo Yaoyuan	b671a33911	Transition fixes and clock for VisualTest.	2016-10-27 13:34:51 +08:00
Huo Yaoyuan	8e766a1f47	Show playing progress.	2016-10-27 13:34:50 +08:00
Huo Yaoyuan	1a3a5c544d	Button behavior fixes.	2016-10-27 13:34:49 +08:00
Huo Yaoyuan	a32f9eed51	Play control.	2016-10-27 13:34:48 +08:00
Huo Yaoyuan	d2495e34fb	Query from beatmap database.	2016-10-27 13:34:47 +08:00
Huo Yaoyuan	303bd41765	Background scale.	2016-10-27 13:34:46 +08:00
Huo Yaoyuan	b0d72c5f84	Button and text.	2016-10-27 13:34:45 +08:00
Huo Yaoyuan	0f2b5e8370	Layers.	2016-10-27 13:34:44 +08:00
Huo Yaoyuan	e1f6ab1a42	Create MusicController UI class and visual test.	2016-10-27 13:34:43 +08:00
Dean Herbert	debea59bab	Merge pull request #61 from SirCmpwn/song-select ... Song select	2016-10-27 13:54:34 +09:00
Dean Herbert	456169f182	Move BeatmapGroupState to outside class definition.	2016-10-27 13:42:37 +09:00
Dean Herbert	abfad501b6	beatmapSet can be private.	2016-10-27 13:41:30 +09:00
Dean Herbert	ce73ae792f	Change panel selection logic to avoid looping.	2016-10-27 13:36:04 +09:00
Dean Herbert	ba5b2f2d73	Remove difficulty width offsets and tidy up flow of information.	2016-10-27 12:31:45 +09:00
Dean Herbert	f846505a92	Tidy namespaces.	2016-10-27 12:01:13 +09:00
Dean Herbert	104cedba19	Merge pull request #109 from peppy/volume-control-input-fix ... Fix volume control input handling.	2016-10-27 11:45:09 +09:00
Drew DeVault	9c27c33e18	Use IStateful and improve collapse logic	2016-10-26 12:49:16 -04:00
Drew DeVault	55e5ec6fae	General cleanup per PR feedback	2016-10-26 10:52:40 -04:00
Drew DeVault	157512b45f	Merge branch 'master' into song-select	2016-10-26 10:37:18 -04:00
Dean Herbert	3f23900347	Framework & OpenTK updates.	2016-10-26 23:13:44 +09:00
Dean Herbert	ee8b678989	Fix volume controls handling mouse wheel at a higher level than anything else game-wide.	2016-10-26 18:45:48 +09:00
Drew DeVault	5e9495d21d	Fix performance issues with song select	2016-10-25 16:49:10 -04:00
Drew DeVault	063fdd9a2d	Add test data to db for VisualTests ... Also fixes the broken IPC condition	2016-10-24 14:57:00 -04:00
Drew DeVault	a1019f91ba	Fix auto size on BeatmapSetBox difficulties	2016-10-24 11:39:53 -04:00
Drew DeVault	b0898a3ce0	Fix sizing of setList flow container	2016-10-24 11:39:53 -04:00
Drew DeVault	86bbe8688b	Fix issues with invisible beatmaps	2016-10-24 11:39:53 -04:00
Drew DeVault	ff1a5187cd	Implement fixes related to auto size changes	2016-10-24 11:39:53 -04:00
Drew DeVault	e5168f8da8	Implement handoff to Player	2016-10-24 11:39:53 -04:00
Drew DeVault	cfc920c9c1	Implement Play button, drop textures	2016-10-24 11:39:53 -04:00
Dean Herbert	d3a857edb9	Make importing work properly. ... Moves import code to BeatmapDatabase.	2016-10-24 11:39:53 -04:00
Dean Herbert	0c9e26e546	Return the populated item when calling GetChildren to write more elegant code.	2016-10-24 11:39:18 -04:00
Dean Herbert	6f80efdb29	Add a database reset method.	2016-10-24 11:39:18 -04:00
Dean Herbert	7650bb1707	Don't insert to database until we're completely finished importing a beatmap.	2016-10-24 11:39:18 -04:00
Dean Herbert	ee6c810df5	Fix cascading inserts.	2016-10-24 11:39:18 -04:00
Drew DeVault	42f8d19c73	Sort by difficulty and fix relationship	2016-10-24 11:39:18 -04:00
Drew DeVault	8d6431b35e	Add star counter to difficulty select	2016-10-24 11:39:18 -04:00
Drew DeVault	910a079bda	Add animation, selection indicator to difficulties	2016-10-24 11:39:18 -04:00
Drew DeVault	4b6a1486a6	Increase spacing to match mockups	2016-10-24 11:39:18 -04:00
Drew DeVault	61a7ccaece	Remove dependency on DeferredSprite	2016-10-24 11:39:18 -04:00
Drew DeVault	33fc60716d	Fix assertion failures	2016-10-24 11:39:18 -04:00
Drew DeVault	cfa637b763	Select first difficulty by default	2016-10-24 11:39:18 -04:00
Drew DeVault	51791bba7f	Tweak play button	2016-10-24 11:39:18 -04:00
Drew DeVault	4dcdc8638e	Add beatmap difficulty selection logic	2016-10-24 11:39:18 -04:00
Drew DeVault	941687e091	Add glow to beatmap groups	2016-10-24 11:39:18 -04:00
Drew DeVault	bc959f74a5	Add background textures to beatmap sets ... Needs osu-framework#189	2016-10-24 11:39:18 -04:00
Drew DeVault	6da092ab30	Fix additional bugs, tweak L+F	2016-10-24 11:39:18 -04:00
Drew DeVault	8d4a211419	Fix initialization of BeatmapInfo	2016-10-24 11:39:18 -04:00
Drew DeVault	3ee0bf2b80	Fix cascade insert	2016-10-24 11:39:18 -04:00
Drew DeVault	641855c790	Fix issues with beatmap import file contention	2016-10-24 11:39:18 -04:00
Drew DeVault	c41b3d92c6	Fix up wrt upstream development	2016-10-24 11:39:18 -04:00
Drew DeVault	8e31965fb4	Refactor beatmap import secondary process ... Doesn't launch a new game window and now supports several files at once.	2016-10-24 11:39:18 -04:00
Drew DeVault	9426629853	Don't crash if you leave and return to song select ... During visual tests	2016-10-24 11:39:18 -04:00
Dean Herbert	9a66d766e9	Don't bail on no beatmaps in database.	2016-10-24 11:39:18 -04:00
Drew DeVault	9b88798274	Fix up padding on song select ... @peppy btw scrolling beyond the ends of the ScrollContainer behaves weirdly for this container	2016-10-24 11:39:18 -04:00
Drew DeVault	05d803483f	Fix width of beatmaps	2016-10-24 11:39:18 -04:00
Drew DeVault	07e44560be	Use beatmap author in listing	2016-10-24 11:39:18 -04:00
Drew DeVault	7a22c60c7c	Get some more of the design's layout in place	2016-10-24 11:39:18 -04:00
Drew DeVault	e13374ed23	Tweak layout of beatmap groups	2016-10-24 11:39:18 -04:00
Drew DeVault	3d53af155f	Add background to song select	2016-10-24 11:39:18 -04:00
Drew DeVault	71f58285fc	Add selection interactions	2016-10-24 11:39:18 -04:00
Drew DeVault	bc6e705e2b	Add test case for song selection	2016-10-24 11:39:18 -04:00
Drew DeVault	d21b7f0050	Fix up song select based on upstream changes	2016-10-24 11:39:18 -04:00
Drew DeVault	22fdb3e49a	Adjust PlaySongSelect to match UI standards	2016-10-24 11:39:11 -04:00
Drew DeVault	674f624bfc	Improve song selection layout, database loading ... Also adds event that notifes the song select when a beatmap is added.	2016-10-24 11:39:11 -04:00
Drew DeVault	a14edc06c8	Pull beatmap list from db and render simple list	2016-10-24 11:39:11 -04:00
Dean Herbert	1ce16afa23	Update nuget package versions.	2016-10-24 22:46:44 +09:00
Dean Herbert	bd1a1644fd	Fix window size saving to config incorrectly.	2016-10-23 01:35:11 +09:00
Dean Herbert	e4c74f9c77	Merge remote-tracking branch 'upstream/master' into general-fixes	2016-10-22 23:54:12 +09:00
Dean Herbert	baf68ba593	Merge pull request #99 from Tom94/general-improvements ... Fix secondary volume meters showing an incorrect volume until changed.	2016-10-22 23:51:14 +09:00
Thomas Müller	7ced6046d7	Fix secondary volume meters showing an incorrect volume until changed.	2016-10-22 14:33:43 +02:00
Dean Herbert	3ce93608fb	Fix one remaining FlowContainer.	2016-10-22 19:37:27 +09:00
Dean Herbert	808d5c75fb	Fix unused field warning.	2016-10-22 19:08:40 +09:00
Dean Herbert	9021042d93	Fix CircularContainer usage.	2016-10-22 18:40:04 +09:00
Dean Herbert	28a41dcca6	Fix FlowContainers.	2016-10-22 18:05:46 +09:00
Dean Herbert	cdef75c98b	Fix AutoSize references.	2016-10-22 17:50:42 +09:00
Dean Herbert	43f0409893	Start to structure flow of information in Player. ... - Allow basic clicking of hitobjects. - Break non-osu! game modes temporarily. - Fix some issues with RollingCounters. - Add the ability to increment counters.	2016-10-19 19:44:03 +09:00
Dean Herbert	e78e0d37b4	Make playfield dark, not light. No masking either.	2016-10-19 18:15:49 +09:00
Dean Herbert	a1d961dc87	Make the Player class more friendly and add a test case.	2016-10-19 18:00:35 +09:00
Dean Herbert	94968a8b7c	Add initial implementation of osu! HitCircle.	2016-10-19 16:19:01 +09:00
Dean Herbert	ee463dc65c	Merge pull request #77 from NeoAdonis/counters-a ... Rolling counters	2016-10-19 15:06:00 +09:00
Dean Herbert	c81c4cbbcd	Fix missing Metadata initialisation.	2016-10-19 12:28:48 +09:00
Dean Herbert	6705902710	Merge remote-tracking branch 'refs/remotes/Tom94/general-improvements' into general-fixes	2016-10-19 12:22:16 +09:00
Drew DeVault	7bdf1fe1bf	Drop BeatmapSet, only BeatmapSetInfo is necessary	2016-10-18 15:48:24 -04:00
Drew DeVault	768dd38fa0	s/AddBeatmap/ImportBeatmap/g	2016-10-18 15:42:07 -04:00
Drew DeVault	105bba6178	Rework duplicate detection in AddBeatmap	2016-10-18 15:41:46 -04:00
Drew DeVault	ad14462369	Add lifecycle management to BeatmapDatabase	2016-10-18 15:38:59 -04:00
Drew DeVault	8ca4a2067e	$(SolutionDir)	2016-10-18 13:58:24 -04:00
Drew DeVault	449f04c07b	Refactor the database code	2016-10-18 13:38:27 -04:00
Thomas Müller	68476eafb9	Use DrawSize instead of Size whereever Size was previously read due to framework changes. ... Note, that this was just stupid replacement. Many components will likely want to actually read Size and not DrawSize. We may want to do a pass over this at some point, but for now everything is working like this. (Old behavior.)	2016-10-18 18:53:31 +02:00
Adonais Romero González	eeacd85073	Protect RollingCounter props	2016-10-17 21:40:50 -05:00
Dean Herbert	cce2094392	Framework update.	2016-10-18 11:20:16 +09:00
Adonais Romero González	5abc3ba898	Merge remote-tracking branch 'upstream/master' into counters-a	2016-10-17 20:36:04 -05:00
Dean Herbert	bfbc26738c	Merged branch master into round_masking	2016-10-17 12:08:31 +09:00
Lunar Dust	8e47d72f93	Reorder ToolbarButton instantiation for consistency ... Might as start good standards now rather than later	2016-10-16 18:42:40 -05:00
Adonais Romero González	72c4dc344e	Misc. fixes and improvements	2016-10-16 18:30:25 -05:00
Adonais Romero González	a671765a4f	Modified ManiaComboCounter behavior ... This to match more with the current behavior in osu!mania.	2016-10-16 17:45:37 -05:00
Adonais Romero González	2c06764b79	Better safe than sorry	2016-10-16 17:10:08 -05:00
Thomas Müller	53076f6446	Modify osu! logo to use new CircularContainer.	2016-10-16 19:26:56 +02:00
Thomas Müller	fec127eb8c	Merge branch 'master' of github.com:ppy/osu into unified_shader ... # Conflicts: # osu-framework # osu.Game/Overlays/Options.cs	2016-10-16 15:17:24 +02:00
Dean Herbert	02dc8dc167	Change the way VolumeControl handles global input.	2016-10-16 21:57:15 +09:00
Thomas Müller	b3e531b98c	Remove implementation of WedgedBox and use Shear transformation instead.	2016-10-16 14:10:24 +02:00
Thomas Müller	7751a85e14	Update framework.	2016-10-16 14:10:06 +02:00
Dean Herbert	620c4e6ab7	Merge remote-tracking branch 'refs/remotes/upstream/master' into general-fixes	2016-10-16 18:24:10 +09:00
Huo Yaoyuan	f4c381f745	Use OverlayContainer in framework.	2016-10-16 17:14:17 +08:00
Dean Herbert	4edefb935c	Improve the initialisation logic of OsuGameBase.	2016-10-16 17:33:53 +09:00
Adonais Romero González	15c6a563be	Moved ComboResultCounter to right namespace	2016-10-15 22:24:03 -05:00
Adonais Romero González	862dc1d7c7	Tidying code and restricting methods	2016-10-15 19:07:07 -05:00
Adonais Romero González	84dcb63ad2	Changed ComboCounter format... ... ...to improve value management.	2016-10-15 18:06:31 -05:00
Adonais Romero González	10b47859c3	Delay order on StarCounter changed	2016-10-15 18:04:00 -05:00
Adonais Romero González	0ceb72ba42	More refactoring	2016-10-15 15:16:02 -05:00
Adonais Romero González	a15f4cda44	Tidying	2016-10-15 15:03:51 -05:00
Adonais Romero González	c268500f89	Minor variable change	2016-10-15 14:01:11 -05:00
Adonais Romero González	2625d06553	Why calling StopAnimation() on StarCounter's ctor()?	2016-10-15 13:53:39 -05:00
Adonais Romero González	9241287c79	Merge branch 'master' into counters-a	2016-10-15 13:45:55 -05:00
Dean Herbert	7a4bbb6921	Merge pull request #80 from autismpp/logger ... Replace Console.WriteLine with Logger.Log.	2016-10-15 23:02:24 +09:00
Thomas Müller	1d8ff5fe46	Use circular hover region for osu! logo.	2016-10-15 15:31:16 +02:00
autismpp	7276038ca7	Replace Console.WriteLine with Logger.Log.	2016-10-15 06:13:50 +03:00
Adonais Romero González	6bd3eaf37d	Changes according to review + Refactor	2016-10-14 18:23:27 -05:00
Dean Herbert	123d92f5b9	Merge pull request #71 from huoyaoyuan/tidy-up ... Strongly type specifications	2016-10-14 18:57:42 +09:00
Huo Yaoyuan	cb54d33c6e	Make converter instance per-convert.	2016-10-14 17:48:07 +08:00
Dean Herbert	c3b745bfef	Merge pull request #57 from UselessToucan/VolumeControl ... VolumeControl: add controls for Effects and Music	2016-10-14 15:50:45 +09:00
TocoToucan	ade925937a	Set text position using Origin property	2016-10-14 09:46:40 +03:00
Adonais Romero González	53cd698b3a	Merge branch 'master' into counters-a	2016-10-13 22:57:24 -05:00
Dean Herbert	6597b09a55	Merge pull request #79 from peppy/general-fixes ... Update framework version.	2016-10-14 12:54:52 +09:00
Adonais Romero González	edbbe8daef	Delete unnecessary class attributes	2016-10-13 22:54:02 -05:00
Dean Herbert	8c7ff58310	Fix regressions caused by overlay class.	2016-10-14 12:50:03 +09:00
John Leuenhagen	fedfb8a22a	Converted all .cs files to use CRLF line endings.	2016-10-13 23:33:58 -04:00
Dean Herbert	b425d14ea1	Merge pull request #73 from huoyaoyuan/overlay ... Overlay proposals	2016-10-14 10:49:13 +09:00
Adonais Romero González	9ccff6ec48	Tidying up	2016-10-13 19:50:06 -05:00
Adonais Romero González	0deb5b4e22	Removed unneeded vars	2016-10-13 18:07:06 -05:00
Adonais Romero González	69621eb6d3	Star animation delay micro fix	2016-10-13 18:00:36 -05:00
Adonais Romero González	f10a03dcef	Merge with master	2016-10-13 17:20:35 -05:00
Adonais Romero González	ce07a45456	Improved code	2016-10-13 17:13:20 -05:00
Huo Yaoyuan	254cc87578	Use name ToggleVisibility.	2016-10-14 05:02:13 +08:00
TocoToucan	8cca8861fa	Fix formatting	2016-10-13 19:11:51 +03:00
TocoToucan	7d27406131	Fix merge conflict in osu.Game/osu.Game.csproj	2016-10-13 18:23:50 +03:00
Huo Yaoyuan	1c97edaac2	Base class for overlays.	2016-10-13 23:04:57 +08:00
TocoToucan	d5cb331eb3	Unsubscribe from ValueChanged events	2016-10-13 17:52:49 +03:00
Drew DeVault	25d08c8e2c	Improve beatmap loading and hydration	2016-10-13 10:29:30 -04:00
Huo Yaoyuan	c93a440d3b	Make Options:IStateful.	2016-10-13 22:27:37 +08:00
Huo Yaoyuan	acd54d1ebc	Single Visibility enum type.	2016-10-13 22:22:27 +08:00
Drew DeVault	fd10e6e582	Copy imported beatmaps into beatmap storage	2016-10-13 10:15:08 -04:00
Huo Yaoyuan	ac66c08991	Make converter per-instance.	2016-10-13 21:55:49 +08:00
Huo Yaoyuan	aad5c6a44d	Use DateTimeOffset for message timestamp.	2016-10-13 21:42:51 +08:00
Huo Yaoyuan	45a9249306	Move implementation of HitRender.Converter to base class using an abstract Converter property.	2016-10-13 21:14:18 +08:00
Huo Yaoyuan	80d5fa7243	Specify HitObjectConvertException.	2016-10-13 20:53:42 +08:00
Dean Herbert	5e3e949fd6	Revert all counter commits. Requires much further review.	2016-10-13 14:45:41 +09:00
Dean Herbert	fde3ab420a	Merge branch 'master' ... Conflicts: osu.Game/osu.Game.csproj	2016-10-13 12:23:36 +09:00
Dean Herbert	edd8f3871e	Add TODO regarding parsing.	2016-10-13 12:19:20 +09:00
Drew DeVault	65e3e13aa2	Fix reference paths in osu.Game.csproj	2016-10-13 12:19:15 +09:00
Drew DeVault	deff5ad61e	Use @strings where appropriate	2016-10-13 12:19:10 +09:00
Drew DeVault	dd86e75ea7	Minor fixes	2016-10-13 12:19:06 +09:00
Drew DeVault	ddac0e8c8f	Update osu-framework	2016-10-13 12:18:23 +09:00
Drew DeVault	45c0bc5428	Import beatmaps into the database via IPC	2016-10-13 12:18:17 +09:00
Drew DeVault	3a163de0f7	Follow changes to osu-framework	2016-10-13 12:18:10 +09:00
Drew DeVault	94f2898f52	Implement beatmap sending/receiving over IPC	2016-10-13 12:18:04 +09:00
Drew DeVault	c7d12bc072	Remove unnecessary setters	2016-10-13 12:17:58 +09:00
Drew DeVault	880399f5a5	Fix casing on private properties	2016-10-13 12:17:52 +09:00
Drew DeVault	dc4bd48f29	Fix casing issues ... Cheers @RemieRichards	2016-10-13 12:17:46 +09:00
Drew DeVault	c39179d299	Add test for hit objects	2016-10-13 12:17:40 +09:00
Drew DeVault	7a4501323b	Decode beatmap colours	2016-10-13 12:17:35 +09:00
Drew DeVault	c0022f3515	Add more tests for legacy decoder	2016-10-13 12:17:31 +09:00
Drew DeVault	30f2eeda7c	Implement IDisposable in ArchiveReaders	2016-10-13 12:17:18 +09:00
Drew DeVault	0267eb7649	Fixup	2016-10-13 12:17:13 +09:00
Drew DeVault	4851f49ad5	Add basic osu! hit object parsing	2016-10-13 12:17:08 +09:00
Drew DeVault	9b4bc3e36d	Implement most of the legacy beatmap decoder ... Missing timing points, events, and hit object decoders remain to be written	2016-10-13 12:17:03 +09:00
Drew DeVault	32ab8f97bb	Add more decoding (including full BeatmapMetadata)	2016-10-13 12:16:58 +09:00
Drew DeVault	2a3f047895	Start implementing legacy decoder	2016-10-13 12:16:48 +09:00
Adonais Romero González	1d8d2fa9c9	Implicit base()	2016-10-12 21:46:51 -05:00
Adonais Romero González	8f0093f133	Comments in StarCounter	2016-10-12 21:36:52 -05:00
Adonais Romero González	55420d4356	Improvements in transformCount handling	2016-10-12 21:33:55 -05:00
Adonais Romero González	bf832ebe71	uint for ids	2016-10-12 21:03:41 -05:00
Adonais Romero González	71d7de5326	Leading zeroes now part of ScoreCounter ctor	2016-10-12 20:57:06 -05:00
Adonais Romero González	73e4359e9d	Adjusted StarCounter ctor	2016-10-12 20:51:50 -05:00
Dean Herbert	2566d6bfe0	Fix regressions with HitRenderers, while also cleaning them up.	2016-10-13 10:10:15 +09:00
Adonais Romero González	e9a38f0c4d	Fixed some animations	2016-10-12 17:24:06 -05:00
Adonais Romero González	fa67ab86ed	Adjusted Combo Counter animation	2016-10-12 15:28:24 -05:00
Adonais Romero González	11e0429fd3	Children creation off-load to ctors	2016-10-12 14:38:48 -05:00
Adonais Romero González	798e7241d8	Make counters work again	2016-10-12 14:33:04 -05:00
TocoToucan	059e2a3c5a	Improve appearing of the volume meters	2016-10-12 22:17:53 +03:00
Dean Herbert	8707c7f746	Fix regression causing multi-line (wrapped) chat messages to overlap.	2016-10-13 03:06:06 +09:00
TocoToucan	00db36fdbe	Update code in accordance with the code review	2016-10-12 20:45:42 +03:00
TocoToucan	ce391301fa	Merge VolumeControl.cs	2016-10-12 19:17:53 +03:00
Drew DeVault	c9a057b510	Update AddBeatmap accordingly	2016-10-12 11:32:40 -04:00
Drew DeVault	e9a45de51f	Refactor database to reuse existing types	2016-10-12 11:32:40 -04:00
Drew DeVault	23bc26ddac	Implement OszArchiveReader	2016-10-12 11:32:40 -04:00
Drew DeVault	bc69aa1455	Initial support code for beatmap loading	2016-10-12 11:32:40 -04:00
Drew DeVault	768c3bc31e	Use PlayMode instead of GameMode	2016-10-12 11:32:40 -04:00
Drew DeVault	005dc9e8cb	Drop GameMode	2016-10-12 11:32:40 -04:00
Drew DeVault	e8de245032	Use @strings	2016-10-12 11:32:40 -04:00
Drew DeVault	f6b6446a9c	MetadataID -> BeatmapMetadataID	2016-10-12 11:32:27 -04:00
Drew DeVault	72c4a26aea	Move control of databases into osu-framework	2016-10-12 11:32:27 -04:00
Drew DeVault	2d810f72fa	Add initial DB schema and support code	2016-10-12 11:32:07 -04:00
TocoToucan	06288d3f7c	Change "Master" volume if particular meter is not selected.	2016-10-12 17:36:42 +03:00
Dean Herbert	aa96d98822	Merge branch 'master' into limit-game-access ... Conflicts: osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs osu.Game/GameModes/Menu/ButtonSystem.cs osu.Game/Online/Chat/Display/ChatLine.cs osu.Game/OsuGame.cs osu.Game/Overlays/ToolbarButton.cs	2016-10-12 20:44:33 +09:00
Dean Herbert	29d223dc41	Update framework and simplify some references.	2016-10-12 19:52:49 +09:00
Dean Herbert	61d5c7c56d	Make stuff compile again (but StarCounter hits assertions).	2016-10-12 16:11:40 +09:00
Dean Herbert	e800649633	Merge remote-tracking branch 'upstream/master' into limit-game-access	2016-10-12 16:03:03 +09:00
Dean Herbert	b2c31d3047	Updates post-master-merge.	2016-10-12 16:01:23 +09:00
Dean Herbert	4052a665bf	Remove all non-load Game access.	2016-10-12 15:47:08 +09:00
Dean Herbert	af76dc09d3	Move direction declaration to usage.	2016-10-12 15:33:04 +09:00
Dean Herbert	f737090c6b	Make CentreTarget public.	2016-10-12 15:28:28 +09:00
Dean Herbert	1c0b769451	Centralise the maximum chat history variable.	2016-10-12 15:25:07 +09:00
Dean Herbert	24771a62cf	Remove upwards reference.	2016-10-12 15:23:22 +09:00
Dean Herbert	9276244d6a	getter on single line.	2016-10-12 15:22:03 +09:00
Dean Herbert	79b62d4373	Merge remote-tracking branch 'refs/remotes/upstream/master' ... Conflicts: osu-framework osu.Desktop.VisualTests/Program.cs	2016-10-12 15:20:23 +09:00
Dean Herbert	05031d18ef	Fix some display regressions in ChatConsole.	2016-10-12 13:35:21 +09:00
Dean Herbert	c0ea061bd4	Update framework; amend ToolbarButton to use padding and Children initialiser.	2016-10-12 12:24:07 +09:00
Drew DeVault	5306141f5f	Merge pull request #49 from NeoAdonis/counters ... Rolling counters (initial)	2016-10-11 15:04:46 -04:00
TocoToucan	f3c1c60ab7	Change volume in VolumeMeter	2016-10-10 17:19:05 +03:00
Adonais Romero González	2954c19345	Misc. fixes	2016-10-09 15:19:35 -05:00
Adonais Romero González	4d0c8ed441	StarAnimationEasing	2016-10-09 14:55:50 -05:00
Adonais Romero González	fd1cbfd8fa	Hide VisibleCount from transformStar	2016-10-09 14:53:06 -05:00
Adonais Romero González	01da3ca474	More line wrapping	2016-10-09 14:48:24 -05:00
Adonais Romero González	841707b61f	Not animate stars over MaxStars	2016-10-09 14:09:07 -05:00
Adonais Romero González	707effb591	Completed StarCounter ... More complex than the other counters, but hopefully functional. I subestimated you and your silly bouncing animations. >.>	2016-10-09 14:02:44 -05:00
TocoToucan	89d7de31ee	VolumeControl: add controls for Effects and Music	2016-10-09 20:45:34 +03:00
Thomas Müller	c62f29dcae	Merge branch 'master' of github.com:ppy/osu into general-improvements	2016-10-09 16:02:35 +02:00
Thomas Müller	9ed0748d73	No need to enforce scheduling of task anymore.	2016-10-09 15:40:32 +02:00
Dean Herbert	cb5e4287e2	Post-merge fixes.	2016-10-09 22:21:44 +09:00
Dean Herbert	25de055802	Merge branch 'master' into stateful-drawables ... Conflicts: osu.Game/GameModes/Menu/Intro.cs	2016-10-09 22:08:32 +09:00
Thomas Müller	934523e347	Update framework version.	2016-10-09 13:31:16 +02:00
Thomas Müller	dd04b33232	Use AddInternal instead of AddTopLevel.	2016-10-09 20:06:23 +09:00
Thomas Müller	bcb5a02221	Don't rely on return value of Container.Add.	2016-10-09 20:06:20 +09:00
Thomas Müller	d9486e790a	Use AddInternal instead of AddTopLevel.	2016-10-09 11:56:41 +02:00
Thomas Müller	99c8f618af	Don't rely on return value of Container.Add.	2016-10-09 11:55:52 +02:00
Dean Herbert	76f1653090	Merge pull request #53 from Tom94/use_drawable_scheduler ... Use drawable scheduler	2016-10-09 15:25:22 +09:00
Adonais Romero González	67d3d772f6	Minor fix with StarCounter width	2016-10-08 22:15:25 -05:00
Adonais Romero González	37115c8c9f	Merge branch 'master' into counters	2016-10-08 22:02:43 -05:00
Adonais Romero González	accf365fd1	More styling.	2016-10-08 21:58:53 -05:00
Adonais Romero González	0d18680eeb	StarCounter styling using absolute positioning.	2016-10-08 21:45:01 -05:00
Adonais Romero González	5ebb2fc289	Refactor + Stars Counter (initial) ... Moved a few things to allow using common transforms for a star counter. This implementation is basic and hacky, but good enough as proof of concept.	2016-10-08 19:11:01 -05:00
Dean Herbert	926c46dbd4	Code formatting and slight changes to transitions.	2016-10-08 23:27:53 +09:00
Dean Herbert	9594b7193c	Standardise drawable state access and split large nested classes out of MainMenu.ButtonSystem	2016-10-08 23:27:46 +09:00
Dean Herbert	97c2dcf590	Use PaddingContainer for better layout.	2016-10-08 23:25:38 +09:00
Dean Herbert	47faf8f40d	Add in-game chat display, along with a global hotkey handling method.	2016-10-08 19:23:21 +09:00
Dean Herbert	1e9e52aecc	osuLogo handles less keys.	2016-10-08 19:23:21 +09:00
Dean Herbert	adba72d293	Toolbar stores its current state locally (just for conformity).	2016-10-08 19:23:21 +09:00
Dean Herbert	3067c890ce	General improvements to chat querying and logic organisation.	2016-10-08 19:23:21 +09:00
Dean Herbert	5ff3767038	Fix typo in comment.	2016-10-08 19:18:50 +09:00
Dean Herbert	5a507838d6	Fix event not being unbound.	2016-10-08 19:12:31 +09:00
Thomas Müller	0c793dfe69	Use own Scheduler instead of Game.Scheduler.	2016-10-08 11:33:24 +02:00
Dean Herbert	556420ee58	Add proper toolbar state handling.	2016-10-08 15:54:09 +09:00
Dean Herbert	27a26cfaaf	Ensure the correct background state is restored when skipping multiple levels	2016-10-08 15:54:09 +09:00
Dean Herbert	93f326bb9b	Fix welcome sound being played twice.	2016-10-08 15:54:08 +09:00
Dean Herbert	243d2cdec5	Block window closing while intro is playing.	2016-10-08 15:54:07 +09:00
Dean Herbert	f2f3b69eee	BackgroundModes shouldn't handle the escape key themselves.	2016-10-08 15:54:07 +09:00
Dean Herbert	08728b84d1	Make sure intro can't be exited unless the main menu has displayed once.	2016-10-08 15:54:06 +09:00
Dean Herbert	c5228b63cb	Unify and smiplify exit logic. Now only OsuGame calls the final Exit.	2016-10-08 15:54:05 +09:00
Dean Herbert	c5ac851ba9	Add the ability to exit the game using escape.	2016-10-08 15:54:05 +09:00
Dean Herbert	b2d899feb5	Add basic intro sequence.	2016-10-08 15:54:04 +09:00
Dean Herbert	a5adbc0615	Update namespace references.	2016-10-08 15:54:02 +09:00
Dean Herbert	065b193b15	Fix the initial state of VolumeControl being wrong.	2016-10-08 15:54:01 +09:00
Dean Herbert	bdb72d7b82	Add basic VolumeControl and saving of volume to config.	2016-10-08 15:54:00 +09:00
Dean Herbert	e25e7319e9	Add sample usage of PlayMode bindable.	2016-10-08 15:54:00 +09:00
Dean Herbert	5ff9d828eb	Add KeyCounter to Player for fun.	2016-10-08 15:53:59 +09:00
Dean Herbert	10468a566c	Add some comments about future usage.	2016-10-08 15:53:58 +09:00
Dean Herbert	d1dfa120d1	Move BackgroundModes to their own files.	2016-10-08 15:53:57 +09:00
Dean Herbert	d6042bd689	Add intro and begin to create central logic nest.	2016-10-08 15:53:56 +09:00
Dean Herbert	9b76a0ffb8	Expose CursorContainer.	2016-10-08 15:53:55 +09:00
Dean Herbert	a23ca25e7d	Remove unusable "tests" button from main menu system.	2016-10-08 15:53:54 +09:00
Dean Herbert	75c97a62e3	Add main menu music back.	2016-10-08 15:53:53 +09:00
Adonais Romero González	a3b4a34a1a	TestCase buttons + minor fixes	2016-10-07 17:15:36 -05:00
Adonais Romero González	7277cf5af1	Reflection to simplify transforms + some refactoring	2016-10-07 16:59:52 -05:00
Adonais Romero González	965e542eaf	Line wrapping	2016-10-07 16:14:35 -05:00
Adonais Romero González	35325fab95	Licence added	2016-10-07 02:24:46 -05:00
Adonais Romero González	00cfc51004	Rolling counters (initial)	2016-10-07 02:05:02 -05:00
Dean Herbert	b588f28856	Make play modes display playfield.	2016-10-05 20:49:31 +09:00
Dean Herbert	c0f25a2683	Improve white-boxed game modes.	2016-10-05 20:08:58 +09:00
Dean Herbert	4eb310c3a5	Remove unused button state.	2016-10-05 20:07:15 +09:00
Dean Herbert	698c1ef1ae	Fix width of toolbar buttons with text.	2016-10-05 20:07:10 +09:00
Dean Herbert	03aea04a00	Add BackgroundMode stack.	2016-10-05 20:06:55 +09:00
Dean Herbert	3891f467a3	Fix being able to click two toolbar buttons at once.	2016-10-04 20:00:55 +09:00
Dean Herbert	836083667f	Clean up a bit.	2016-10-04 19:57:32 +09:00
Dean Herbert	cc52580568	Implement mode selector highlight line.	2016-10-04 19:41:18 +09:00
Dean Herbert	c2d4672b8d	Add osu! prefix to mode descriptions.	2016-10-04 19:40:56 +09:00
Dean Herbert	11403a922a	Make Home, Settings and PlayMode buttons work.	2016-10-04 17:15:03 +09:00
Dean Herbert	51cf13460f	Remove performance overlay.	2016-10-03 23:56:25 +09:00
Dean Herbert	ddcd5ec286	Add basic layout for toolbar.	2016-10-03 20:39:32 +09:00
Dean Herbert	ac16bffe49	Bring framework and resources up-to-date.	2016-10-01 19:05:26 +09:00
Dean Herbert	7db555be5d	Move toolbar to OsuGame.	2016-10-01 18:01:52 +09:00
Dean Herbert	f0681f35c4	Merge remote-tracking branch 'refs/remotes/upstream/master' into game-modes-layout ... # Conflicts: # osu.Game/OsuGame.cs # osu.Game/OsuGameBase.cs # osu.Game/osu.Game.csproj	2016-10-01 17:10:27 +09:00
Dean Herbert	b110a879a7	Merge branch 'refs/heads/master' into api-channels-messages ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj	2016-10-01 17:05:56 +09:00
Dean Herbert	af91341704	Remove unused variable.	2016-10-01 17:03:47 +09:00
Dean Herbert	5afb038025	Use explicit cast to OsuGame rather than in-between derived classes. ... # Conflicts: # osu.Game/GameModes/Menu/MainMenu.cs	2016-10-01 17:02:57 +09:00
Dean Herbert	40e5a449bf	Add parallax to ButtonSystem.	2016-10-01 17:02:20 +09:00
Dean Herbert	4ad618abc9	Adjust scale and outwards transition of ButtonSystem.	2016-10-01 17:02:01 +09:00
Dean Herbert	665352f706	Improve the transition and look of white-boxed game modes.	2016-10-01 17:01:09 +09:00
Dean Herbert	0178e23b73	Ensure we always remain fully visible on any aspect ratio (including very tall ones).	2016-09-30 18:46:34 +09:00
Dean Herbert	cc14aeb802	Add basic background display system.	2016-09-30 18:45:55 +09:00
Dean Herbert	d93718d953	Add template toolbar.	2016-09-30 18:45:27 +09:00
Dean Herbert	463f606004	Add delay for exit process.	2016-09-30 13:31:05 +09:00
Dean Herbert	357c94ed8a	Add OsuGameMode. Standardise naming of classes.	2016-09-30 13:30:55 +09:00
Dean Herbert	643ae0cefe	Merge remote-tracking branch 'upstream/master' into beatmap_framework	2016-09-30 00:13:08 +09:00
Dean Herbert	b4c9dca54b	Merge remote-tracking branch 'upstream/master' into api-channels-messages ... Conflicts: osu.Game/Online/Chat/Message.cs	2016-09-29 23:54:33 +09:00
Dean Herbert	a114463678	Add null check.	2016-09-29 23:52:51 +09:00
Dean Herbert	154226b9a3	Basic white-boxing of all game modes.	2016-09-29 23:51:17 +09:00
Dean Herbert	2db962dc33	Add basic tweening mouse cursor. ... # Conflicts: # osu-framework	2016-09-29 23:46:33 +09:00
Dean Herbert	ae6fb0553d	Add contains override to allow correct rendering by CursorContainer on window bounds.	2016-09-29 23:46:30 +09:00
Dean Herbert	a69c5b4fc0	Fix a few warnings.	2016-09-29 23:46:27 +09:00
Dean Herbert	7dcf2c6269	Add TestCase for main menu ButtonSystem.	2016-09-29 23:46:24 +09:00
Dean Herbert	7c98ef1b3d	Move initialisation of ChatLine to Load.	2016-09-28 16:33:20 +09:00
Dean Herbert	8650e951e5	Merge branch 'refs/heads/master' into api-channels-messages ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj	2016-09-28 16:30:00 +09:00
Dean Herbert	eaab1b718e	Merge branch 'refs/heads/master' into beatmap_framework ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj	2016-09-28 16:09:26 +09:00
Dean Herbert	aad58532ec	Remove getter on Objects.	2016-09-28 15:49:47 +09:00
Dean Herbert	67652a6d8e	Improve formatting of chat lines.	2016-09-27 20:45:26 +09:00
Dean Herbert	754d9c78bd	Simple chat message display functionality.	2016-09-27 19:22:22 +09:00
Dean Herbert	154b914a3a	Fix API scheduling.	2016-09-27 19:22:08 +09:00
Dean Herbert	28045b7136	Add back basic API support for channel/message retrieval.	2016-09-27 18:33:52 +09:00
Huo Yaoyuan	25fecfca06	Relative size and position for text layer.	2016-09-26 16:56:39 +08:00
Huo Yaoyuan	bb13da2b32	Add ResetCount method for Counter.	2016-09-26 14:23:22 +08:00
Huo Yaoyuan	b4bb3d6317	Update private methods implementation.	2016-09-26 14:21:40 +08:00
Huo Yaoyuan	756e7a6a67	Add missing lincense header, remove unnecessary comment and field.	2016-09-26 14:21:25 +08:00
Dean Herbert	f0284ce57c	Use the old naming style for now.	2016-09-26 15:07:29 +09:00
Dean Herbert	ae100e3137	Move PlayTest to the VisualTests project.	2016-09-25 13:59:38 +09:00
Dean Herbert	58ed5c00e4	Merge remote-tracking branch 'refs/remotes/upstream/master' into beatmap_framework ... # Conflicts: # osu.Game/GameModes/Menu/ButtonSystem.cs # osu.Game/OsuGame.cs	2016-09-25 13:40:06 +09:00
Huo Yaoyuan	63535df6dc	Fix typo and missnaming.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	ec2bc4720d	Comma seperator in numbers.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	ed4fae53cb	Add FadeTime and allow setting custom styles directly from container.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	f4ac1f630d	Adjust visual tree of counter.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	0da0d4f35e	Avoid accessing container in each counter.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	c70bf53486	Rename counter classes to avoid confusing.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	16f1dff849	Make counter public.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	d8666deaa0	IsLit Adjustment.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	ba19fe1b97	Move IsCounting to KeyCounter.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	409bb0d068	Counter animation.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	81f269ee69	MouseCount and KeyBoardCount, input handling.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	e5ef3e1d02	Adjust children position of Counter.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	55a1a3827a	Implement KeyCounter and base Count class.	2016-09-24 19:46:10 +08:00
Dean Herbert	7bdb2fcfc7	Add basic implementation of VisualTest framework for osu! project. ... Comes with one complimentary test.	2016-09-24 15:47:17 +09:00
Dean Herbert	9891e72114	Fix indentation.	2016-09-24 15:35:27 +09:00
Dean Herbert	c64dfca82e	Remove silly textboxes.	2016-09-24 00:09:59 +09:00
Dean Herbert	f936618156	Add back TextAwesome and osu!font.	2016-09-24 00:05:09 +09:00
Dean Herbert	997c6f45f6	Update framework again.	2016-09-21 17:37:33 +09:00
Dean Herbert	33e46facec	Use children for initialisation.	2016-09-21 13:25:23 +09:00
Dean Herbert	3a5f37444c	Add back Playfield masking.	2016-09-21 13:21:55 +09:00
Dean Herbert	1712a142a5	Add proper HitObject expiration.	2016-09-21 13:12:15 +09:00
Dean Herbert	f1688499e4	Bring framework up-to-date.	2016-09-21 13:12:05 +09:00
Dean Herbert	e0c06a4f19	Merge branch 'refs/heads/general-fixes' into beatmap_framework ... # Conflicts: # osu-framework # osu.Game/GameModes/FieldTest.cs # osu.Game/GameModes/FontTest.cs # osu.Game/GameModes/Menu/ButtonSystem.cs # osu.Game/Graphics/UserInterface/TextBox.cs # osu.Game/OsuGame.cs # osu.Game/osu.Game.csproj	2016-09-20 16:36:42 +09:00
Dean Herbert	b2e7f290f2	Fix window size.	2016-09-20 16:26:07 +09:00
Dean Herbert	b9de26aa26	Framework updates.	2016-09-20 14:41:55 +09:00
Remie Richards	3b1ef0b991	Reverts a small bandaid fix that's no longer necessary relating to the order in which osulogo is initialised.	2016-09-19 01:57:15 +01:00
Remie Richards	3c297064b6	Fixes invalid button scaling, Fixes invalid button location (they were oddly shifted to the right)	2016-09-19 01:47:14 +01:00
Remie Richards	320f76d860	Fixes over-scaling, Brings osu! logo back to the front	2016-09-19 01:35:50 +01:00
Remie Richards	80dfad9af9	Missed an extra set of () on an object initialiser	2016-09-18 20:49:01 +01:00
Remie Richards	314b0dfc04	Replaced all Add() calls in Load()s with direct Children = new Drawable[] {} settings, for consistency	2016-09-18 20:41:53 +01:00
Remie Richards	4732a4db19	An AddProcessing() call was left behind, AddProcessing() is now gone on the framework end.	2016-09-18 16:42:59 +01:00
Remie Richards	f2fa9f611a	Replaced osu.Game.Graphics.Cursor.CursorContainer.cs with osu.Framework.Graphics.Cursor.CursorContainer.cs	2016-09-17 22:11:27 +01:00
Remie Richards	4754c0e2d1	Clears out old tests (use the framework tests!), Replaces osu.Game.Graphics.UserInterface references with osu.Framework.Graphics.UserInterface	2016-09-17 21:54:52 +01:00
Remie Richards	1a5c2b5221	Updates to latest osu-framework, Updates existing Load() methods to use Children = new Drawable[]{} syntax	2016-09-17 21:33:46 +01:00
Dean Herbert	36ae4dd271	Fix osu! playfield (was using inheriting sizemode when it shouldn't).	2016-09-15 23:58:02 +09:00
Dean Herbert	375406bc97	Bring framework up-to-date.	2016-09-11 17:23:43 +09:00
Dean Herbert	4a85d8627d	Update to latest framework version.	2016-09-11 03:04:47 +09:00
Dean Herbert	851ef4fbbf	Framework updates.	2016-09-11 02:27:42 +09:00
Dean Herbert	b6bbea392b	Merge branch 'general-fixes' into beatmap_framework ... Conflicts: osu-framework	2016-09-11 02:24:15 +09:00
Dean Herbert	842fb1892f	Update to latest framework version.	2016-09-11 02:23:26 +09:00
Dean Herbert	753a67fb3d	Update to use new transform logic.	2016-09-06 21:42:45 +09:00
Dean Herbert	9e76feb159	Add remaining HitRenderers. ... Many general improvements.	2016-09-06 21:42:45 +09:00
Dean Herbert	97d101310d	Make OsuPlayfield box a bit larger.	2016-09-06 21:42:45 +09:00
Dean Herbert	024ae1d1c2	Move playfields to own class.	2016-09-06 21:42:45 +09:00
Dean Herbert	93744f7372	Add basic TaikoHitRenderer.	2016-09-06 21:42:45 +09:00
Dean Herbert	677a1b0e56	Add basic box background to OsuPlayfield.	2016-09-06 21:42:45 +09:00
Dean Herbert	2ea5a5c675	Add basic HitRenderer framework.	2016-09-06 21:42:45 +09:00
Dean Herbert	ec25a50249	Add basic structure for catch mode objects.	2016-09-06 21:41:16 +09:00
Dean Herbert	49110cf8d8	Add mania Note and HoldNote.	2016-09-06 21:41:16 +09:00
Dean Herbert	0a0c8e2014	Fix some base classes not being abstract.	2016-09-06 21:41:16 +09:00
Dean Herbert	c75d74c84c	Taiko notes should have scale, not bool Big.	2016-09-06 21:41:16 +09:00
Dean Herbert	cf12f4764f	Add basic structure for osu! mode objects.	2016-09-06 21:41:16 +09:00
Dean Herbert	9d6b19a2ee	Add duration to BaseHit.	2016-09-06 21:41:16 +09:00
Dean Herbert	7cee44ab1d	HitObject -> HitBase. Also add BaseHits for each game mode.	2016-09-06 21:41:16 +09:00
Dean Herbert	016521240a	Add playtest class.	2016-09-06 21:41:16 +09:00
Dean Herbert	ef98e4ee3c	Move beatmap metadata to separate class.	2016-09-06 21:41:16 +09:00
Dean Herbert	abe8ff21f6	Add more timing and sample related classes.	2016-09-06 21:41:16 +09:00
Dean Herbert	3098204dda	Add basic class structure for Beatmap/HitObject/SampleInfo/User.	2016-09-06 21:41:16 +09:00
Dean Herbert	7e3d2ebe80	Update nuget packages and framework reference once more.	2016-09-06 20:41:18 +09:00
Dean Herbert	49a0e3d9ac	Framework namespace rename.	2016-09-04 18:32:19 +09:00
Dean Herbert	7254c31a92	Drawable is abstract, let's not instantiate it.	2016-09-04 18:32:14 +09:00
Dean Herbert	23111821f5	Update naming conventions.	2016-09-04 18:31:58 +09:00
smoogipooo	59a69ca59c	Remove unused System.Drawing reference.	2016-09-03 23:02:55 +09:30
smoogipooo	dde748b8c1	Fix loaded not being set on textbox Load.	2016-09-03 21:18:07 +09:30
Dean Herbert	7d9cb85289	Hook up new TextInputSource to TextBox.	2016-09-02 14:41:42 +09:00
Dean Herbert	ebd15d6f7c	Remove System.Drawing dependency.	2016-09-02 14:30:08 +09:00
Dean Herbert	49a4d64fad	Fix TextBox always taking keyboard focus.	2016-09-01 22:55:02 +09:00
Dean Herbert	600223a65c	Add proper keyboard sound effects back.	2016-09-01 22:51:45 +09:00
Dean Herbert	923fc228e9	Fix cursor horizontal position.	2016-09-01 22:51:03 +09:00
Dean Herbert	a2fc339a45	Update Transforms to new style.	2016-09-01 22:51:03 +09:00
Dean Herbert	586aaad2b0	Add sample TextBox and SpriteText to MainMenu for comparison.	2016-09-01 22:51:03 +09:00
Dean Herbert	41c03ab255	Move ctor content to Load(). Schedule some prop updates.	2016-09-01 22:51:03 +09:00
Dean Herbert	7f0212f93f	TextSize -> SpaceWidth (temporary).	2016-09-01 22:51:03 +09:00
Dean Herbert	b3e2339175	Make TextBox rendering work again.	2016-09-01 22:51:03 +09:00
Dean Herbert	6e836708bd	Remove unnecessary file extension. ... # Conflicts: # osu.Game/GameModes/Menu/MainMenu.cs	2016-09-01 22:47:48 +09:00
Dean Herbert	af3e024c7b	Update SampleManager Get method call.	2016-09-01 22:47:48 +09:00
Dean Herbert	7d2f303e61	Update font logic to override framework default. ... # Conflicts: # osu.Game/OsuGame.cs	2016-09-01 22:47:48 +09:00
Dean Herbert	9585a9105e	Update resolution handling logic.	2016-09-01 22:47:48 +09:00
Dean Herbert	cb3dfe094e	Add minimum resolution settings.	2016-09-01 22:47:48 +09:00
Huo Yaoyuan	6826391b7a	Replace custom delegates by generic delegates.	2016-09-01 00:48:28 +08:00
Dean Herbert	013cf1cf3f	Fix broken namespaces.	2016-08-31 20:16:05 +09:00
Dean Herbert	8870935a4b	Add basic online API support.	2016-08-31 20:14:01 +09:00
Dean Herbert	e3ec485a9d	New style transformations.	2016-08-31 12:23:44 +09:00
Dean Herbert	81f9ce657f	License -> Licence.	2016-08-26 17:27:49 +09:00
Dean Herbert	6cbbeaaac0	Initial commit.	2016-08-26 14:41:47 +09:00