h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 22:47:25 +08:00
Code Issues Releases Wiki Activity
25,503 Commits 3 Branches 648 Tags 270 MiB
891f9a9b18
Commit Graph

16184 Commits

Author SHA1 Message Date
Andrei Zavatski
891f9a9b18 Remove unused using 2020-01-26 16:49:39 +03:00
Andrei Zavatski
cd0fcfabd9 Merge master with conflicts resolved 2020-01-26 16:35:07 +03:00
Dean Herbert
97c80529d5 Adjust wave colours slightly 2020-01-26 21:47:40 +09:00
Andrei Zavatski
49c5d5b23d Make colour provider readonly 2020-01-26 14:06:05 +03:00
Andrei Zavatski
1305634c52 Simplify colour provider caching 2020-01-26 14:02:05 +03:00
Andrei Zavatski
e442e8535b Remake OsuTabControl.AccentColour 2020-01-26 12:57:19 +03:00
Andrei Zavatski
6c1fa05804 Merge remote-tracking branch 'refs/remotes/ppy/master' into no-control-overlay-headers 2020-01-26 12:48:01 +03:00
Andrei Zavatski
8e470678c7 Rename convert() to getColour() 2020-01-26 12:42:23 +03:00
Andrei Zavatski
750a4476d8 Simplify getBaseHue function 2020-01-26 12:41:21 +03:00
Andrei Zavatski
6dee287a82 Move private methods below public 2020-01-26 12:39:15 +03:00
Andrei Zavatski
406bc23fde Rename incorrect colours 2020-01-26 12:38:20 +03:00
Andrei Zavatski
ed314ee935 Merge remote-tracking branch 'refs/remotes/ppy/master' into colour-provider-implementation 2020-01-26 12:28:46 +03:00
Dean Herbert
eabb5a8701 Use ToString instead of Substring 2020-01-26 17:40:38 +09:00
Dean Herbert
50ab5a7d07 Merge remote-tracking branch 'upstream/master' into LegacyDecoder_changes 2020-01-26 17:38:44 +09:00
TheWildTree
d2a032ca8d Move reverse-order comparer to ChannelTabControl 2020-01-25 22:16:21 +01:00
Salman Ahmed
8aec9e4500 Fix NullReferenceException on main menu for mobile game hsots 2020-01-25 11:41:26 +03:00
Andrei Zavatski
73e822e08d Make waves colour dependent on overlay colour scheme 2020-01-25 06:46:54 +03:00
Dean Herbert
fa595e07a6 Update framework 2020-01-25 12:44:48 +09:00
Andrei Zavatski
448663ae9a Merge remote-tracking branch 'refs/remotes/ppy/master' into colour-provider-implementation 2020-01-25 06:41:49 +03:00
Berkan Diler
219e14baa2 Address review and fix InspectCode 2020-01-24 17:05:27 +01:00
Dean Herbert
bc75290655 Ensure min and max stars are correctly ordered 2020-01-25 00:11:20 +09:00
Dean Herbert
92a5fbe948
Merge branch 'master' into star-filtering 2020-01-24 23:28:36 +09:00
smoogipoo
d1684a3c92 Duplicate keywords for better UX 2020-01-24 19:50:16 +09:00
smoogipoo
75d0fd0bab Rename class 2020-01-24 19:43:23 +09:00
smoogipoo
45a25214ab Make upper and lower bounds inclusive 2020-01-24 19:39:21 +09:00
Dan Balasescu
9be3d7a161
Merge pull request #7591 from peppy/improve-song-select-uiscale 
Improve song select display on ultrawide displays (or when UI scale is set low)
 2020-01-24 19:14:46 +09:00
smoogipoo
ed66ee3ba6 Allow 10.0 stars to be selectable 2020-01-24 19:12:56 +09:00
smoogipoo
2643b6fca3 Add additional keywods 2020-01-24 19:12:48 +09:00
smoogipoo
62fa619ad4 Display "no limit" for maximum stars 2020-01-24 19:08:14 +09:00
smoogipoo
9e0e7be8d0 Modernise filter implementation 2020-01-24 18:57:17 +09:00
Andrei Zavatski
d9af43da4c Remove unused usings 2020-01-24 12:55:51 +03:00
Andrei Zavatski
619c2d6d9c Merge remote-tracking branch 'refs/remotes/ppy/master' into colour-provider-implementation 2020-01-24 12:44:13 +03:00
Andrei Zavatski
e03a085d70 Make overlay elements use OverlayColourProvider 2020-01-24 12:33:34 +03:00
smoogipoo
12cc97ca31 Merge remote-tracking branch 'origin/master' into star-filtering 
# Conflicts:
#	osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
#	osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
#	osu.Game/Screens/Select/FilterControl.cs
#	osu.Game/Screens/Select/FilterCriteria.cs
 2020-01-24 18:30:52 +09:00
Andrei Zavatski
db4cd51d02 Implement OverlayColourProvider 2020-01-24 12:24:35 +03:00
Dan Balasescu
368587fc06
Merge branch 'master' into timeline-maybe 2020-01-24 18:08:29 +09:00
smoogipoo
027778acc1 Fix slider circles not being selected by default 2020-01-24 17:51:24 +09:00
smoogipoo
811ddb02a4 General refactoring 2020-01-24 17:50:36 +09:00
smoogipoo
28727bbafd Fix crash when deselecting via ctrl+click 2020-01-24 17:30:37 +09:00
Dean Herbert
f9e93e2a6a Fix regressed input handling order 2020-01-24 17:15:05 +09:00
Andrei Zavatski
1d549a0c8a Remove unused using 2020-01-24 10:46:27 +03:00
Dean Herbert
827f48c29b Adjust fade 2020-01-24 16:32:39 +09:00
Andrei Zavatski
738980e3f7 Refactor OsuTabControl.AccentColour 2020-01-24 10:31:47 +03:00
Dean Herbert
6f44f8a1ad Ensure only run once when not current screen 2020-01-24 16:27:49 +09:00
Dean Herbert
f9a54dfb1d Tidy up implementation and show on returning with new song 2020-01-24 16:27:37 +09:00
Andrei Zavatski
34ffbcf2ae Adjust xmldoc 2020-01-24 10:24:44 +03:00
Andrei Zavatski
2b941a0d52 Merge remote-tracking branch 'refs/remotes/ppy/master' into no-control-overlay-headers 2020-01-24 10:18:45 +03:00
Dean Herbert
3f6fa93365 Merge remote-tracking branch 'upstream/master' into main-menu-song-ticker 2020-01-24 16:08:34 +09:00
Dean Herbert
f5a3de3187 Merge remote-tracking branch 'upstream/master' into improve-song-select-uiscale 2020-01-24 15:44:40 +09:00
Dean Herbert
fdde4a6858 Tidy up song select hierarchy to be more readable 2020-01-24 15:44:31 +09:00