1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 21:02:54 +08:00
Commit Graph

421 Commits

Author SHA1 Message Date
smoogipoo
1b279d383f Use GetAsync on all textures 2018-08-27 17:26:44 +09:00
Dean Herbert
5364a6148a Use ToUpperInvariant 2018-07-24 14:42:06 +02:00
Dean Herbert
ab9340f4be Fix usage of culture local ToUpper causing incorrect display on Turkish machines
Closes #3098.
2018-07-24 11:37:43 +02:00
Dean Herbert
6698f320fb
Merge branch 'master' into download-button-state 2018-07-13 22:05:26 +09:00
Dean Herbert
159b26509b Improve visuals of difficulty icons 2018-07-13 17:15:06 +09:00
naoey
2a0b1f3615 Update direct panel download button for new design
- Add a download failed event to BeatmapManager
- Make DownloadButton aware of all 3 possible download states
- Change button appearance based on each state
2018-07-03 20:18:09 +05:30
Dean Herbert
ecc0f5e575 Use Any() instead of Count() 2018-06-08 20:54:09 +09:00
Dean Herbert
064e8190be Add basic documentation 2018-06-08 20:53:58 +09:00
DrabWeb
7819be7957 Remove unused using. 2018-06-06 03:28:07 -03:00
DrabWeb
188272e15d Replace OnAlreadyDownloading with returning a bool from Download. 2018-06-06 03:18:42 -03:00
DrabWeb
80951eae68 Inherit BeatmapSetDownloader from Component. 2018-06-05 18:09:26 -03:00
DrabWeb
d8154f8cad Fix BeatmapSetInfos with OnlineBeatmapSetID set to null being marked as downloaded. 2018-06-04 21:11:27 -03:00
DrabWeb
01c5060bcf Move BeatmapSetDownloader to osu.Game.Beatmaps.Drawables 2018-06-04 20:30:54 -03:00
DrabWeb
6781b81336 Cleanup. 2018-05-31 05:48:42 -03:00
DrabWeb
e920b8d577 Add UpdateableBeatmapSetCover. 2018-05-28 19:11:26 -03:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
DrabWeb
506e27a30e Cleanup. 2018-03-27 17:59:58 -03:00
DrabWeb
eb374c5774 Add beatmap set online status and display it in direct panels and the beatmap set overlay. 2018-03-26 21:04:45 -03:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
Dean Herbert
78dd975a35 Initial carousel infrastructue changes 2017-12-15 14:36:51 +09:00
Dean Herbert
69653c7f4f Don't use nested ternary if 2017-12-12 13:07:34 +09:00
Dean Herbert
8dea999908 Order difficulty icons by ruleset 2017-12-11 21:35:47 +09:00
Dean Herbert
b10240d7ef Handle the case where the selected panel is no longer a valid selection better 2017-12-11 21:31:26 +09:00
Dean Herbert
970e55fc4a Update difficulty icons on headers to match filtered difficulties 2017-12-11 20:49:27 +09:00
Dean Herbert
f58c554d19 Add per-difficulty filtering support
Filters based on selected ruleset
2017-12-11 20:22:10 +09:00
jorolf
22403cac89 Merge branch 'master' of git://github.com/ppy/osu into most-played-beatmaps-section 2017-11-29 23:09:04 +01:00
Dean Herbert
7877f42763 Merge remote-tracking branch 'upstream/master' into new-sounds-and-more 2017-11-27 17:59:24 +09:00
Dean Herbert
f189de437a Simplify blending assignment 2017-11-27 10:01:44 +09:00
Dean Herbert
9c90d9ca45 Add panel hover effects 2017-11-26 17:21:23 +09:00
Dean Herbert
4067b6129b Add visual highlighting on song select panel hover
Prerequisite for adding hover sound effects. Didn't feel right without this change.
2017-11-26 17:14:13 +09:00
jorolf
a1cc18f98c
Merge branch 'master' into most-played-beatmaps-section 2017-11-24 22:51:11 +01:00
Dean Herbert
4986ad73f7 Merge remote-tracking branch 'upstream/master' into load-optimization 2017-11-23 18:44:17 +09:00
FreezyLemon
2cc2323791 Style changes (removing newline from before second constructor parameter) 2017-11-23 09:12:23 +01:00
jorolf
22348a3d67 Merge branch 'master' of git://github.com/ppy/osu into most-played-beatmaps-section 2017-11-22 21:14:11 +01:00
FreezyLemon
7d428875b8 Changed LoadWrapper back to DelayedLoadWrapper and fixed the implementation (dependent on framework change, delay now in ctor) 2017-11-22 15:46:04 +01:00
FreezyLemon
870807c265 Switched over to the new LoadWrapper class for all delayed loading. 2017-11-21 16:17:33 +01:00
Dean Herbert
2603219350 Load beatmap carousel panels asynchronously 2017-11-21 22:30:09 +09:00
Dean Herbert
4f6263ef86 Make many internal classes and methods public
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +09:00
jorolf
fe7f9cccaa BeatmapSetCover can display other types of covers now 2017-11-19 14:16:00 +01:00
Miterosan
567cd6316c beatmap can not be null in DifficultyColouredContainer.cs 2017-11-07 23:17:45 +01:00
Miterosan
a15ab785f2 palette can not be null in DifficultyColouredContainer.cs 2017-11-07 23:16:19 +01:00
Miterosan
36ce287b88 panels can not be null in BeatmapSetHeader.cs 2017-11-07 23:15:51 +01:00
Miterosan
0f539d24f0 Localisation can not be null in BeatmapSetHeader.cs 2017-11-07 23:15:21 +01:00
Miterosan
dc317139c9 beatmap can not be null in BeatmapSetHeader.cs 2017-11-07 23:15:02 +01:00
Miterosan
bc94179032 workingbeatmap can not be null in BeatmapBackgroundSprite.cs 2017-11-07 23:14:22 +01:00
Miterosan
d7dee57886 set can not be null in BeatmapSetCover.cs 2017-11-07 23:13:56 +01:00
Miterosan
dd3874daa8 beatmap can not be null in BeatmapPanel.cs 2017-11-07 23:13:32 +01:00
Miterosan
289a1346fc beatmap can not be null in DifficultyIcon.cs 2017-11-07 23:13:09 +01:00
Miterosan
080c3fabba BeatmapSet and manager can not be null in BeatmapGroup.cs 2017-11-07 23:10:06 +01:00
Dean Herbert
e7931ef4c7 Add a default icon when a ruleset isn't present 2017-10-23 17:32:28 +09:00
Dean Herbert
cf3881b18c Fix not being able to restore hidden beatmaps via context menu 2017-10-17 15:50:52 +09:00
Dean Herbert
c92e0e2dc1 Fix username display on beatmap panels 2017-10-17 11:24:59 +09:00
smoogipoo
d3109a5950 Hook up BeatmapPanel "Edit" item 2017-10-07 00:59:14 +09:00
Dean Herbert
968c61902a Merge branch 'master' into new-menus 2017-09-05 23:42:33 +09:00
Tom
05f5dfba81 Change difficulty colors and add ExpertPlus
ExpertPlus is for beatmaps above 6.75*
2017-09-05 13:57:30 +02:00
smoogipooo
b871323ed8 Fix BeatmapGroup initialization not correctly setting panels to Hidden. 2017-09-05 19:26:28 +09:00
smoogipooo
57678a13d9 Update in-line with framework changes. 2017-09-04 09:32:35 +09:00
Dean Herbert
dd26c80837 Delete -> Hide 2017-09-04 07:59:32 +09:00
Dean Herbert
1f646e6d54 Add hiding support for beatmap difficulties 2017-09-01 17:57:12 +09:00
Dean Herbert
5a58489adf Hook up play and edit (kinda) 2017-08-30 21:12:58 +09:00
Dean Herbert
3b4b4b669b Add framework for deleting difficulties 2017-08-30 21:12:46 +09:00
Dean Herbert
2fb4126ffc Use BeatmapSetInfo instead of WorkingBeatmap 2017-08-30 20:53:33 +09:00
Dean Herbert
8619f28ced Add context menu to beatmap difficulty (wip) 2017-08-30 20:41:53 +09:00
Dean Herbert
07da29ea1c Add context menu to beatmap set header 2017-08-30 20:41:41 +09:00
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
Dean Herbert
5f53426a9a *Database -> *Store
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
Dean Herbert
9e20a02c0a Split out BeatmapDatabase into BeatmapStore
Hide database functionality at a lower level in preparation from eventually making it private.
2017-07-26 16:31:34 +09:00
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Dean Herbert
64f2e2dc32 Use Colour instead of ColourInfo 2017-07-23 13:06:16 +02:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller
a5e610a7ba Update framework and fix compilation
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
DrabWeb
b196b1d3c6 CI fixes, switch RoomInspector to use BeatmapSetCover. 2017-07-13 01:24:59 -03:00
DrabWeb
fea40ccc1a Share BeatmapSet cover sprite code. 2017-07-13 01:17:47 -03:00
Thomas Müller
9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
Thomas Müller
40225238d9 Set RelativeSizeAxes for updated FillMode behavior 2017-06-28 12:24:23 +03:00
paparony03
62dee59672 Shapes namespace
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
smoogipooo
ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00
John Neijzen
4abad17b92 Fix Black Space after } and Symbol Spacing 2017-06-08 14:48:42 +08:00
DrabWeb
c6320c0f11 BeatmapBackgroundSprite public -> internal 2017-05-19 16:02:42 -03:00
DrabWeb
3b8cadd4df Clean up DirectPanel and it's subclasses 2017-05-19 12:52:23 -03:00
Dean Herbert
efab186384 Update namespaces in line with framework 2017-05-16 12:50:30 +09:00
Huo Yaoyuan
146d57953d Use metadata field of WorkingBeatmap. 2017-05-06 14:57:11 +08:00
Dean Herbert
003cf53441 Streamline panel selection event logic.
Was previously firing multiple times where it was completely unnecessary. Also had bidirection firing going on.
2017-04-28 20:43:42 +09:00
smoogipooo
c95a6fbd09 Use single line for GetUnicodePreference. 2017-04-28 14:14:14 +09:00
Huo Yaoyuan
4cb18361c1 Use localisation engine for unicode text. 2017-04-26 19:50:38 +08:00
Dean Herbert
43d09a9734 CI fixes 2017-04-24 20:31:25 +09:00
Dean Herbert
c7b789424b Update BeatmapInfoWedge design
- Adds colour difficulty strip.
- Adjusts paddings.
- Fixes source/artist confusion.
- Double dash to em-dash.
2017-04-24 20:19:44 +09:00
Dean Herbert
a4e2f34ee7
Make a RulesetDatabase. 2017-04-17 17:43:48 +09:00
Dean Herbert
83b083ce64
Move SQLite connections out of database classes; make abstract Database. 2017-04-17 14:37:52 +09:00
smoogipooo
ddce3c157f Clean up a few remaining stragglers. 2017-04-15 06:15:55 +09:00
smoogipooo
59bfc7abad Move statics to RulesetCollection to avoid conflicts later on. 2017-04-15 04:53:37 +09:00
Huo Yaoyuan
411988f038 Remove all trailing whitespaces in this repo. 2017-04-06 16:21:18 +08:00
Dean Herbert
7c74951454
Update bindables.
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCaseResults.cs
#	osu.Game/Screens/Ranking/ResultModeButton.cs
#	osu.Game/Screens/Ranking/Results.cs
2017-04-04 11:34:13 +09:00
Dean Herbert
bfa2e68bfb Container->Wrapper. 2017-04-02 16:17:13 +09:00
Dean Herbert
6f1fff4ee7 Update async load usage to new style. 2017-04-02 15:56:12 +09:00
Dean Herbert
a6c8be3637
Increase load delay on panel backgrounds; add back missing fade. 2017-03-29 19:52:16 +09:00
Dean Herbert
f7dc7e9bb9
Update references. 2017-03-28 21:26:20 +09:00
Dean Herbert
4042b94e01
Use DelayedLoadContainer in more places. 2017-03-28 15:28:58 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
Dean Herbert
907236e475
Move filtering to BeatmapCarousel (but actual logic is now in FilterCriteria. 2017-03-17 19:54:51 +09:00
Dean Herbert
ba73968303
Load whole panel background in async. 2017-03-17 18:28:21 +09:00
Dean Herbert
2abcdbf4df
Fix potentially incorrect states being applied to panels on first display. 2017-03-17 14:56:12 +09:00
Dean Herbert
cd98af29c4
Only calculate difficulties on import for now. 2017-03-17 11:53:13 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Dean Herbert
e356758a7d
Don't expicitly set origin of TextAwesome. 2017-03-06 17:06:48 +09:00
Thomas Müller
73fef85b12 Remove unnecessary usings 2017-03-04 19:43:59 +01:00
Thomas Müller
a14bdf8624 Use Color4Extensions from Framework and remove redundant Name 2017-03-04 19:42:37 +01:00
Dean Herbert
e12d89529c
Merge remote-tracking branch 'upstream/master' into update-flow 2017-03-04 23:28:39 +09:00
Dean Herbert
00fdffe9c8
Update framework (and fix non-conforming anchors in FillFlowContainers). 2017-03-04 23:24:13 +09:00
Thomas Müller
a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01:00
Thomas Müller
a97a7f1024 No more custom lifetimelist in CarouselContainer 2017-03-04 08:54:14 +01:00
Thomas Müller
c732890664 Remove usages of negative Margin / Padding
Replaces such usage with more sensible settings, like changing the
position or size.
2017-03-02 19:16:31 +01:00
Thomas Müller
4d28696479 FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00
Thomas Müller
9c853b0465 Update framewörk 2017-03-01 19:33:01 +01:00
Thomas Müller
d46e68b36b Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor
# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
2017-03-01 18:05:58 +01:00
Dean Herbert
e60cead483
Merge remote-tracking branch 'upstream/master' into warning_fixes 2017-02-28 13:49:19 +09:00
default0
03889e6ca6 Update References to FlowStrategies
References now use the Create*-names instead of the outdated
Get*-names to create instances of FlowStrategies.
2017-02-27 16:55:55 +01:00
Andrey Zavadskiy
3487dfe236 Removed unused variables and parameters 2017-02-27 17:32:32 +03:00
Dean Herbert
777f673a46
Fix more test regressions. 2017-02-27 19:48:48 +09:00
Dean Herbert
47997c20ad
Weld -> BindWith. 2017-02-27 12:24:53 +09:00
default0
0d1dec665a Set StarDifficulty to -1 for invalid beatmaps
The StarDifficulty calculation in a BeatmapGroup would not properly deal
with Beatmaps that cannot be loaded and thus cause a
NullReferenceException when trying to work with them, instead of
assigning a StarDifficulty of -1 to signify that the map is invalid.
2017-02-26 21:57:19 +01:00
default0
8d91519d59 Update usage of FlowContainer and its subclasses 2017-02-26 21:32:43 +01:00
Dean Herbert
c227eb1be5
Welded bindables. 2017-02-26 22:08:21 +09:00
Thomas Müller
1585ae842a Update framework 2017-02-26 11:22:58 +09:00
Thomas Müller
f7d985fe18 Fix and refactor star difficulty calculation boilerplate
Moves star difficulty calculation entry-point to Beatmap, and sets
star difficulty at the correct place for song select to display.
2017-02-24 19:36:17 +01:00
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
2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01:00
Thomas Müller
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Dean Herbert
c83d2bbe6e
Make panels fade in again. 2017-02-22 21:54:49 +09:00
Thomas Müller
417f146386 Add difficulty calculation
Adds base classes for difficulty calculations, hooks them up with
carousel container, and adds a port of the osu difficulty calculator.
2017-02-19 17:41:51 +01:00
Thomas Müller
aaaf7163e0
Update framework. 2017-02-13 17:46:50 +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
57d97ba2e9 Make triangles look better in many cases. 2017-02-04 22:09:44 +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
aec84ae725 Fix laggy animations, incorrect hiding logic. 2017-02-02 19:24:14 +09:00
Drew DeVault
9f9245cee3 Fix use of previous value in Alpha check
Frustratingly, this does not fix the problem of ghost groups
2017-02-01 19:28:08 -05:00
Drew DeVault
3143e9d35e Fix poorly written BeatmapGroup logic 2017-01-31 20:04:17 -05:00
Drew DeVault
0861eb79e4 Minor cleanups 2017-01-31 19:55:36 -05:00
Drew DeVault
637a99e8d0 Merge remote-tracking branch 'upstream/master' into song-select-filtering 2017-01-31 19:00:50 -05:00
Dean Herbert
6b66ecc131 Global shadows and more sane font size setting. 2017-01-31 18:53:52 +09: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
Drew DeVault
42a2285ef3 Make BeatmapGroup.Hidden more intelligent 2017-01-30 09:47:04 -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
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
f0d30cc873 Make triangles opaque. 2017-01-30 16:53:12 +09:00
Dean Herbert
0272c4b559 Add StarDifficulty property and correct colouring of difficulty icons. 2017-01-30 15:26:28 +09:00
Dean Herbert
2ed5cf7c91 Hook up icons better. 2017-01-30 13:35:40 +09:00
Dean Herbert
3125fa89ee Fix method which should be class. 2017-01-29 15:06:44 +09:00
Drew DeVault
10897486ba Merge remote-tracking branch 'upstream/master' into song-select-filtering 2017-01-27 15:41:46 -05:00
Drew DeVault
f3c5c1f0b8 Fixes following recent updates upstream 2017-01-26 21:31:28 -05:00
Dean Herbert
162e183b36 Fix some nullrefs when running visualtests with no maps loaded. 2017-01-27 00:16:02 +09:00
Drew DeVault
678f0aaa16 Implement filtering with strings 2017-01-17 19:18:15 -05:00
Drew DeVault
fa007e632d Refactor colors to palette based design 2017-01-12 16:38:27 -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
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
8ce18e8986 Improve song select startup time via better database querying. Also fix difficulty displays. 2016-12-15 22:58:32 +09:00
Dean Herbert
11f958030f Make Triangles more flexible and more random. 2016-12-01 18:53:13 +09:00
Thomas Müller
b12b82fdd3 Fix depth values. 2016-11-29 20:50:12 +01:00
Thomas Müller
724f849543 Fix incorrect BeatmapPanel border caused by triangles. 2016-11-27 11:49:51 +01: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
e36a51acf0 Custom LifetimeList (experimental). 2016-11-25 18:30:13 +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
Dean Herbert
ece3bc0e01 Refactor BeatmapInfoWedge to be async. 2016-11-24 13:48:48 +09:00
Dean Herbert
611619fd9c Fix some namespaces. 2016-11-23 12:00:17 +09:00