359 Commits

Author	SHA1	Message	Date
Dean Herbert	12db33ad4b	Visual and readability improvements to StarCounter.	2017-02-24 19:30:56 +09:00
Dean Herbert	c5552dfb27	Merge remote-tracking branch 'upstream/master' into remove-usings	2017-02-24 11:29:34 +09:00
Thomas Müller	0264c44a20	Do not shadow Colour in TwoLayerButton ... Renames Colour to BackgroundColour instead.	2017-02-23 22:33:37 +01:00
Thomas Müller	a5dfa7ab06	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
DrabWeb	99f1f88c75	Merge https://github.com/ppy/osu into mod-overlay	2017-02-22 12:35:55 -04:00
Dean Herbert	afba4fbfad	Merge remote-tracking branch 'upstream/master' into chat-improvement	2017-02-21 15:46:28 +09:00
Jorolf	1e0a694ff8	replaced bool with Bindable<bool> ... Also accounted for the ParallaxAmount when moving to default position	2017-02-19 17:11:36 +01:00
Jorolf	7f751d3653	Update ParallaxContainer.cs	2017-02-19 16:54:00 +01:00
Jorolf	e83ac8b04c	Removed public ParallaxEnabled property	2017-02-19 13:47:26 +01:00
Dean Herbert	520e040396	Add FocusedTextBox abstraction.	2017-02-19 17:59:22 +09:00
Jorolf	f166bb0f96	Moved movement to the default position to property	2017-02-18 22:26:48 +01:00
Jorolf	77bfe57d8c	compacted code, made public bool to disable it	2017-02-18 22:00:07 +01:00
Jorolf	a48e4a31a7	Parallax Option works now	2017-02-18 21:34:21 +01:00
Dean Herbert	78c9348b5a	Make accuracy fixed width and improve feel.	2017-02-18 17:35:54 +09:00
Dean Herbert	1a31589abd	Add padding zeroes to score display (and fix not being applied initially).	2017-02-18 17:35:37 +09:00
Dean Herbert	32ce8cf723	Audio class renames in line with framework changes.	2017-02-18 17:35:04 +09:00
DrabWeb	0a58fc62db	Added mod selection overlay	2017-02-16 16:05:03 -04:00
Dean Herbert	53e40804ab	Move other score components to centre alignment (and switch font).	2017-02-16 22:44:41 +09:00
Dean Herbert	12e265a3e2	Combine triangle system implementations.	2017-02-15 20:39:10 +09:00
Dean Herbert	13ed7db361	Merge branch 'master' into general-fixes	2017-02-15 01:14:25 +09:00
Dean Herbert	f207da6041	Add/update license headers.	2017-02-14 18:17:35 +09:00
Dean Herbert	4f9d1a6c39	Visually disable options which aren't yet wired up.	2017-02-14 00:36:50 +09:00
Thomas Müller	aaaf7163e0	Update framework.	2017-02-13 17:46:50 +09:00
Dean Herbert	e23202c449	Merge remote-tracking branch 'upstream/master' into desktop-unit-tests	2017-02-10 17:22:38 +09:00
Dean Herbert	2da5628184	Merge remote-tracking branch 'upstream/master' into notifications-manager	2017-02-10 16:54:56 +09:00
Dean Herbert	8ec927899f	Implement notifications.	2017-02-10 16:30:23 +09:00
Dean Herbert	d5b7a8ce9e	Add pink glow to cursor because I can't fucking see it against white.	2017-02-10 16:24:40 +09:00
Dean Herbert	becb65f702	Fix ParallaxContainer breaking with no mouse state present.	2017-02-09 19:25:04 +09:00
Dean Herbert	d73093867d	Merge pull request #320 from default0/audio-device-selection ... Audio device selection	2017-02-09 16:45:29 +09:00
Dean Herbert	d05b544d0d	Merge branch 'master' into audio-device-selection ... # Conflicts: # osu-framework # osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs	2017-02-09 16:21:28 +09:00
Dean Herbert	18bb61897f	Update overlay containers in lines with framework changes. ... Allows closing the MusicController using escape.	2017-02-09 13:57:44 +09:00
Dean Herbert	92c77263ed	Use CircularContainer for nub (bumps framework).	2017-02-08 17:21:17 +09:00
Dean Herbert	55e7177577	Password masking character animation.	2017-02-08 16:01:58 +09:00
Dean Herbert	06695dbf9b	Method name update.	2017-02-08 16:01:48 +09:00
Dean Herbert	a6f02106a4	Use new placeholder logic.	2017-02-08 14:08:01 +09:00
Dean Herbert	84096b146e	Make password mask characters look better.	2017-02-08 12:49:20 +09:00
Dean Herbert	5a89ba1040	Make OsuTextBox use OsuSpriteText.	2017-02-08 11:22:46 +09:00
Dean Herbert	e720bed9e5	Add custom representation of unrenderable unicode characters.	2017-02-08 11:22:03 +09:00
Dean Herbert	6b011a50d2	Naming standardisation and enforcing.	2017-02-07 16:20:36 +09:00
Dean Herbert	50bd80cb0c	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Dean Herbert	756fd78a88	Fix incorrect line endings.	2017-02-07 13:52:19 +09:00
Dean Herbert	db8e44c715	Smooth triangles a bit (to avoid whole pixel jumps).	2017-02-07 11:15:37 +09:00
Dean Herbert	9b9ed32245	Remove all @2x references, updates resource and framework.	2017-02-06 22:19:47 +09:00
default0	b230b5cfb9	Update OsuDropDownMenu for Framework-Changes ... Since the DropDownMenu in the framework has changed it was necessary to update the GetDropDownItems override of OsuDropDownMenu to accomodate the new structure of the framework.	2017-02-06 01:17:50 +01:00
Thomas Müller	8271b139e9	Use the framework's new AlwaysPresent switch instead of setting the alpha to 0.01.	2017-02-05 09:40:58 +01:00
Thomas Müller	aae5f4f9e2	Fix volume control not showing is mouse-wheel is turned during its fade-out animation.	2017-02-05 09:40:12 +01:00
Dean Herbert	d97f02a219	Cursor becomes vector.	2017-02-04 22:56:56 +09:00
Dean Herbert	57d97ba2e9	Make triangles look better in many cases.	2017-02-04 22:09:44 +09:00
Dean Herbert	97d52188b2	Make sliderbar lines smoother when scrolling.	2017-02-04 20:56:14 +09:00
Dean Herbert	1e3266a9d2	Fix sliderbar lines lagging behind nub.	2017-02-04 20:55:26 +09:00
Thomas Müller	1913ec659a	Merge branch 'master' of github.com:ppy/osu into better-option-sliders	2017-02-04 12:07:21 +01:00
Thomas Müller	d6714324df	OsuNub -> Nub.	2017-02-04 12:06:53 +01:00
Thomas Müller	6db70f8850	Use MaskingSmoothness to make masked diagonal edges smoother.	2017-02-04 11:06:26 +01:00
Thomas Müller	0edc64a08c	Re-use checkbox nub for option sliders and slightly re-structure.	2017-02-04 09:50:58 +01:00
Dean Herbert	c24edb583f	Uncomment corner radius post-fix.	2017-02-04 16:05:24 +09:00
Dean Herbert	9f9278c837	Fix background colour of dropdown menu item area.	2017-02-03 19:23:14 +09:00
Dean Herbert	4504440f80	Fix much dropdown shit.	2017-02-03 19:13:10 +09:00
Dean Herbert	36cfe54e59	Missing namespace.	2017-02-03 13:16:45 +09:00
Dean Herbert	16a01abc4d	Merge remote-tracking branch 'upstream/master' into options-refactor ... # Conflicts: # osu.Game/Beatmaps/Drawables/BeatmapPanel.cs # osu.Game/Graphics/UserInterface/BackButton.cs # osu.Game/Screens/Play/KeyCounter.cs	2017-02-03 13:16:07 +09:00
Dean Herbert	4f89cc0784	Merge pull request #298 from peppy/skip-button ... Make skip button work.	2017-02-03 12:47:53 +09:00
Andrey Zavadskiy	16dc1460ad	Cursor scale	2017-02-02 14:44:56 +03:00
Dean Herbert	7ce5fc08ee	Merge branch 'master' into skip-button ... # Conflicts: # osu.Game/Graphics/UserInterface/BackButton.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj	2017-02-01 14:05:58 +09:00
Dean Herbert	7008e36167	Button hover and press effects.	2017-01-31 20:32:36 +09:00
Dean Herbert	9ff37e5ed9	Change textbox commit colour to match border.	2017-01-31 20:10:26 +09:00
Dean Herbert	1bb142d42a	Bold font for OsuButtons.	2017-01-31 19:58:45 +09:00
Dean Herbert	a2cd829a2c	Colour conformity pass.	2017-01-31 19:40:02 +09:00
Dean Herbert	6b66ecc131	Global shadows and more sane font size setting.	2017-01-31 18:53:52 +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	bdbe8501d3	Merge branch 'master' into add-flash-effects ... # Conflicts: # osu.Game/Overlays/Options/General/LoginOptions.cs	2017-01-30 21:47:05 +09:00
Dean Herbert	26e9533ff0	Add custom implementation of TextBox.	2017-01-30 20:29:04 +09:00
Dean Herbert	b4c01f104b	Make buttons look closer to the design.	2017-01-30 18:10:30 +09:00
Dean Herbert	f0d30cc873	Make triangles opaque.	2017-01-30 16:53:12 +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	3e7503e860	Make skip button work.	2017-01-27 21:57:22 +09:00
Dean Herbert	420e61fa97	TwoLayerButton	2017-01-27 21:08:36 +09:00
Dean Herbert	5787b43586	wip	2017-01-27 19:14:44 +09:00
Dean Herbert	6d44c5c8f1	Move logo colour definitions local to their usage.	2017-01-27 17:57:52 +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	c3699c1395	Remove unused prevCount variable.	2017-01-27 00:39:00 +09:00
Dean Herbert	4a7b3cf391	Initial implementation of song select footer area.	2017-01-27 00:36:12 +09: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
Drew DeVault	c222be05c0	Add Color4.Opacity and OsuColor.Gray	2017-01-10 13:44:40 -05: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
Dean Herbert	20260b43d1	Improve star animation.	2016-12-15 22:58:34 +09:00
Dean Herbert	0a9e3ce1b0	Don't handle input in triangle particle effect containers.	2016-12-15 22:58:19 +09:00
Dean Herbert	08f8eb649c	Make counters closer to what they should be looking like.	2016-12-07 21:05:29 +09:00
Dean Herbert	f356640cb7	Add missing licence headers.	2016-12-06 19:07:15 +09:00
Dean Herbert	ef8793ff24	Merge branch 'refs/heads/master' into more-sound-effects	2016-12-06 00:08:45 +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
Huo Yaoyuan	2eefc320fd	Make KeyCounterCollection generic.	2016-12-03 15:58:27 +08:00
Thomas Müller	1e8dc780ab	Use new framework-level triangles.	2016-12-01 19:12:35 +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	511dab32ef	Remove masking from Triangles to simplify OsuLogo masking hierarchy.	2016-12-01 21:12:37 +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	11f958030f	Make Triangles more flexible and more random.	2016-12-01 18:53:13 +09:00
Dean Herbert	1e037b3eaa	Merge remote-tracking branch 'refs/remotes/upstream/master' into fix-depth	2016-11-30 12:21:12 +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	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	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	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
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
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
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	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	20ae8df2bd	Refactor volume control to load asynchronously.	2016-11-23 16:12:21 +09:00
Dean Herbert	60d939f323	Use FillMode in more cases.	2016-11-23 13:18:22 +09:00
Dean Herbert	611619fd9c	Fix some namespaces.	2016-11-23 12:00:17 +09:00
Dean Herbert	3e9c398652	Update input handler logic to match framework changes.	2016-11-21 21:36:11 +09: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
Huo Yaoyuan	53deaf2a00	Merge branch 'master'	2016-11-16 10:51:39 +08:00
Dean Herbert	867797a089	Change volume control mouse wheel behaviour to not gain full-screen focus.	2016-11-15 15:22:14 +09: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
Thomas Müller	ac99e2d488	Avoid using load to construct the drawable hierarchy whereever possible.	2016-11-12 18:34:36 +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
Drew DeVault	0d4560a054	Update to latest DI stuff	2016-11-10 17:40:42 -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
Dean Herbert	a61fb5ef5d	Initial updates to make generic containers work.	2016-11-07 21:13:56 +09:00
Dean Herbert	f14a35d480	Update FontAwesome definitions.	2016-11-07 17:59:00 +09: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	5f2bf165a2	Remove now obsolete clock usages.	2016-11-06 10:06:09 +01:00
Thomas Müller	a6c0fd29f2	Make use of new timing system in Drawables and Transforms.	2016-11-06 08:25:21 +01:00
Dean Herbert	2ee5e2efb7	Bring framework up-to-date. ... # Conflicts: # osu-framework	2016-11-05 18:18:52 +09:00
Dean Herbert	bc53642cab	Fix some warnings.	2016-11-04 15:40:05 +09:00
Drew DeVault	cb40b7079f	Rework how references are passed about	2016-11-03 22:43:00 -04:00