1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 06:07:28 +08:00
Commit Graph

255 Commits

Author SHA1 Message Date
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
Drew DeVault
6c0cef894e Add OsuButton with sane defaults 2016-11-03 19:06:22 -04:00
Dean Herbert
b86f308af6 Add async workflow. 2016-11-01 23:24:14 +09:00
Dean Herbert
13b5fb0578 Update transforms to not accept clock. 2016-10-28 17:42:00 +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