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

6051 Commits

Author SHA1 Message Date
Dean Herbert
16b8c9bd11
Merge branch 'master' into fix-crash-hidden-sets#2 2017-12-09 11:51:47 +09:00
ColdVolcano
1f762dc6d8 Fix PreviewBar receiving a NaN Width value 2017-12-08 15:46:09 -06:00
Aergwyn
114604a642 removed unused DI 2017-12-08 14:45:40 +01:00
Aergwyn
c97646bea6 added confirmation dialog for Delete ALL beatmaps 2017-12-08 14:27:07 +01:00
Dean Herbert
c1989dbafe Merge branch 'master' into direct-relevance-sorting 2017-12-08 22:15:57 +09:00
Dean Herbert
4160c10921
Merge branch 'master' into direct-relevance-sorting 2017-12-08 21:18:18 +09:00
Dean Herbert
40652d2e74
Merge branch 'master' into fix-importing-some-beatmaps 2017-12-08 21:18:01 +09:00
Aergwyn
dde7678095 select beatmap on import/download 2017-12-08 13:09:30 +01:00
FreezyLemon
856b56d79c Fixed small typo. 2017-12-08 12:54:36 +01:00
FreezyLemon
e1c04a1f44 Added check for "menu music beatmap hash" before undeleting so circles.osu doesn't get imported on Undelete. Also moved the const property to BeatmapManager. 2017-12-08 12:50:04 +01:00
Aergwyn
3e417d8e30 removed specific AddBeatmap method
the way UpdateBeatmapSet was extended it can handle all of this and better
2017-12-08 12:47:28 +01:00
FreezyLemon
b1270a84f8 Added handling for rank == 0 (unranked), removed "#0" from country name if that happens, also display "no rank" when hovering over history instead of "#0" 2017-12-08 11:31:32 +01:00
FreezyLemon
4a723f7382 Added the "Service Include" tag that is used by Visual Studio's test explorer to the .csproj files 2017-12-08 11:05:00 +01:00
Dean Herbert
679134c030 Add ShortName to rulesets 2017-12-08 18:55:25 +09:00
Dean Herbert
51dc66df12 Add support for relevance based search results in osu!direct 2017-12-08 18:48:36 +09:00
FreezyLemon
d93a1fdaae Merge branch 'master' of https://github.com/ppy/osu into undelete-button-add 2017-12-08 10:30:42 +01:00
smoogipoo
5341e79102 Remove SelectionDragger for now 2017-12-08 17:51:15 +09:00
smoogipoo
faa921ba05 Fix up post-merge issues 2017-12-08 17:41:10 +09:00
Dean Herbert
31884a951a Remove "redundant" parenthesis 2017-12-08 15:53:59 +09:00
smoogipoo
f41af191ed Merge remote-tracking branch 'origin/master' into editor-selection-tool 2017-12-08 15:13:18 +09:00
Dean Herbert
2e1dfa16a2 Fix checks disallowing import of older beatmaps with no embedded online IDs 2017-12-08 14:59:32 +09:00
Aergwyn
105d01d85b fix crash when restoring from any non-SongSelect-screen
removed unwanted refresh
2017-12-07 22:02:53 +01:00
Aergwyn
95955d68ef rephrased description of local context checking 2017-12-07 14:14:50 +01:00
Aergwyn
1dcbfab18e removed redundant comment 2017-12-07 13:56:37 +01:00
Aergwyn
76c09ae59e added comments for local context checking 2017-12-07 13:44:47 +01:00
Dan Balasescu
9e37a122e1
Merge branch 'master' into fix-sensitivityslider 2017-12-07 21:01:53 +09:00
smoogipoo
d52b84df46 Move KeyboardStep assignment to ctor 2017-12-07 20:53:28 +09:00
smoogipoo
46cd6fdb45 Merge remote-tracking branch 'origin/master' into fix-sensitivityslider 2017-12-07 20:49:48 +09:00
Dean Herbert
24b3b10942 Move drawable assignment to load, remove depth overrides 2017-12-07 20:44:55 +09:00
Dean Herbert
8c89354b36 Remove extra whitespace 2017-12-07 20:44:38 +09:00
Dean Herbert
d36982b1d9
Merge branch 'master' into header-button-should-derive 2017-12-07 20:04:41 +09:00
Dean Herbert
f2eef6621a
Merge branch 'master' into fix-missing-metadata 2017-12-07 19:23:51 +09:00
Dean Herbert
c35c8263b9 Merge remote-tracking branch 'upstream/master' into input-revamp 2017-12-07 18:07:26 +09:00
Dean Herbert
2a1a9b9f1f Fix post-merge issue 2017-12-07 17:26:39 +09:00
Dean Herbert
44ee11e75f
Merge branch 'master' into fix-beatmap-carousel-lag 2017-12-07 15:30:50 +09:00
Dean Herbert
a78441bc5a Apply changes in line with framework input adjustments 2017-12-07 13:16:59 +09:00
Dan Balasescu
9c4ca46786
Merge branch 'master' into shader-precompile 2017-12-07 04:15:24 +09:00
Dan Balasescu
8e3cce798d
Merge branch 'master' into fix-async-is-loaded 2017-12-06 23:01:38 +09:00
Dean Herbert
34596b3368 Rename and comment for clarification 2017-12-06 21:47:48 +09:00
Dean Herbert
04ae64e9fd Add missing IsCompleted check to ensureValid 2017-12-06 16:20:49 +09:00
Dean Herbert
15ed3b4aac Fix IsValueCreated method not cecking whether the async task was completed
Caused potential stutters for components that relied on this check.
2017-12-06 09:49:12 +09:00
Dean Herbert
fb6408257a Add shader precompile step
Resolves  https://github.com/ppy/osu-framework/issues/1180 in a way.
2017-12-05 17:41:47 +09:00
Dean Herbert
c1b607fed9 Wait until track has restarted before continuing operation
I removed this from my previous PR thinking it was not required, but it turned out to be required after all. Just isn't so noticeable when it fails.
2017-12-05 14:06:40 +09:00
Dean Herbert
caee6c1cf1 Use Restart instead of Start 2017-12-04 21:40:26 +09:00
Dean Herbert
a83add8540 Tidy up events 2017-12-04 20:30:56 +09:00
Aergwyn
12665fb8cf remove unnecessary declaration + revert accidental formatting 2017-12-04 12:11:28 +01:00
Aergwyn
011223048b fix crash if any amount of maps were restored from main menu
also fixes preview not playing if an entire set is restored
2017-12-04 11:47:27 +01:00
Dean Herbert
22656233d3
Merge branch 'master' into fix-playlist-audio-issue 2017-12-04 19:24:03 +09:00
Dean Herbert
d75db5046b
Merge branch 'master' into editor-composer 2017-12-04 12:41:40 +09:00
smoogipoo
5f9de399e4 Add keydown override 2017-12-04 11:30:25 +09:00
Aergwyn
14096c90cc removed looping if only one song is in the list (temporarily)
It had one problem in relation to SongSelect disabling it when left and in general that topic belongs to another PR.
2017-12-03 16:41:21 +01:00
Aergwyn
9d13bf3602 remove redundant expression 2017-12-03 14:35:23 +01:00
Aergwyn
dfa7448716 use ?: expression 2017-12-03 14:25:12 +01:00
Aergwyn
0c9ebcd58c fix possible NullRef 2017-12-03 14:15:08 +01:00
Aergwyn
a1dbd7916b fixes MusicController constantly trying to start a track
In Detail:
It tried to start a track if the current one ended even if no BeatmapSets were present.
Also if only one BeatmapSet is present if will loop by itself now.
2017-12-03 14:03:43 +01:00
Dean Herbert
7957e55710
Merge branch 'master' into editor-composer 2017-12-03 14:47:07 +09:00
Aergwyn
ad8cd7eb5d fix possible NullReference?
AppVeyor pls?
2017-12-02 17:04:42 +01:00
Aergwyn
cc76c58f5f fall back to .osu file for storyboard if no .osb file is present
+ CI fixes
2017-12-02 16:05:39 +01:00
smoogipoo
2852337b04 Remove unused using 2017-12-02 20:35:47 +09:00
smoogipoo
cd20d6df16 Apply suggested changes 2017-12-02 20:31:15 +09:00
smoogipoo
c14d68e685 Use OsuColour for radio buttons 2017-12-02 20:30:18 +09:00
smoogipoo
a80059032c Remove PlayfieldOverlay 2017-12-02 20:24:10 +09:00
smoogipoo
5a7c4772bd Remove PlayfieldUnderlay for now 2017-12-02 19:53:20 +09:00
Aergwyn
e07b85311b removed unnecessary using 2017-12-01 22:15:10 +01:00
Aergwyn
c466296b14 reverted split at Decoder, moved logic down
I'm done experimenting, sorry
- `Decoder` only returns a "Beatmap"`Decoder` now
- "Storyboard"`Decoder` is retrieved from a "Beatmap"`Decoder`
- moved parse methods down in the hierarchy where I forgot to do that
- renamed `OsuLegacyDecoderTest` to `LegacyDecoderTest`
2017-12-01 22:05:01 +01:00
Aergwyn
a49f3479a2 Split retrieving of beatmap and storyboard decoder
Storyboard works again. Not satisfied with the solution though.
2017-12-01 19:11:52 +01:00
gtensha
de94082b1e Fix filename casing to compile on Linux 2017-12-01 18:10:39 +01:00
Aergwyn
db50ad794e CI adjustments
- removing unnecessary `using`s
- name Fields/Methods according to rules
- removing unnecessary initializations
2017-12-01 17:58:11 +01:00
Aergwyn
806c0e3b26 restructured OsuLegacyDecoder into LegacyDecoder
Beatmap works, Storyboard not...
2017-12-01 17:43:33 +01:00
smoogipoo
cf859a6cf2 Make the dragger attach to objects it surrounds
Plus a lot more implementation.
2017-12-02 00:26:02 +09:00
Dean Herbert
70b29b8b62
Merge branch 'master' into fix-set-hidden-crash 2017-12-01 23:35:48 +09:00
Dean Herbert
7532795935 Lock during validity checks 2017-12-01 22:43:49 +09:00
Dean Herbert
87b6181a19 Merge remote-tracking branch 'upstream/master' into fix-track-disposal 2017-12-01 22:36:20 +09:00
smoogipoo
5be00cb0ec Add todo 2017-12-01 18:40:55 +09:00
smoogipoo
0b95e36675 Fix RelativeChildSize error temporarily 2017-12-01 18:00:20 +09:00
smoogipoo
f6591851c3 Implement a selection dragger box 2017-12-01 13:15:58 +09:00
Aergwyn
7080711cb2 remove unnecessary using 2017-11-30 20:13:10 +01:00
Aergwyn
be018a63c6 remove unnecessary lines 2017-11-30 19:17:11 +01:00
Aergwyn
c16925059c split parsing a beatmap and parsing a storyboard 2017-11-30 19:16:13 +01:00
Aergwyn
016057ab01 readd storyboard to beatmap + minor cleanup 2017-11-30 16:49:53 +01:00
smoogipoo
52ba68e25d Add/fix up license headers 2017-11-30 22:21:02 +09:00
smoogipoo
c0c051aa32 Remove unused parameter for now 2017-11-30 21:58:41 +09:00
smoogipoo
e8cbde3ae1 Add overlay/underlay 2017-11-30 21:56:19 +09:00
smoogipoo
89772f4efd A few resharper fixes 2017-11-30 19:54:58 +09:00
smoogipoo
7e34b0f08d Remove SelectionTool, make Select the default tool 2017-11-30 19:53:52 +09:00
smoogipoo
e9cbef88f1 Improve selection/deselection behaviour of RadioButtonCollections 2017-11-30 19:50:07 +09:00
smoogipoo
677f3653eb Hide osu! playfield cursor 2017-11-30 19:19:34 +09:00
FreezyLemon
b09ba19d3f Used the already-existing private method to undelete a mapset 2017-11-30 11:02:53 +01:00
FreezyLemon
bf386598b6 Added a new "undelete" button that restores every beatmap with "DeletePending" set to true. 2017-11-30 10:58:32 +01:00
smoogipoo
efa39f38ca CI fixes 2017-11-30 18:49:08 +09:00
smoogipoo
e5353bb53e Add border to playfield, add shadow to toolbox buttons 2017-11-30 17:38:55 +09:00
smoogipoo
456bbe25f3 Implement toolbox into HitObjectComposer 2017-11-30 16:58:14 +09:00
smoogipoo
73e41f9dde Add constructors to RadioButton 2017-11-30 16:57:30 +09:00
Nicolas Brassard
36cfa552f4 Fix SensitivitySlider keyboard control 2017-11-29 23:03:26 -08:00
smoogipoo
ead7456978 Add compose radio buttons + testcase 2017-11-30 15:43:19 +09:00
smoogipoo
abd6125691 Make sure that composerContainer is cleared for testing purposes 2017-11-30 14:00:17 +09:00
smoogipoo
a7a9569aee Don't exit when we don't have composer for now 2017-11-30 13:53:57 +09:00
smoogipoo
fd3049fd65 Merge remote-tracking branch 'origin/master' into editor-composer 2017-11-30 13:47:47 +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
jorolf
14fdf98abc rename GetBeatmapSetsResponse 2017-11-29 23:08:46 +01:00
Aergwyn
96f5bd3323 remove Storyboard from Beatmap, add it to WorkingBeatmap 2017-11-29 21:54:04 +01:00
Aergwyn
cd653c1cbc split storyboard loading into GetStoryboard() 2017-11-29 21:28:02 +01:00
Aergwyn
acb2cafa58 fix wedge not appearing 2017-11-29 21:09:08 +01:00
Dean Herbert
d402222f17 Fix DisposeTrack and improve AsyncLazy to support disposal 2017-11-30 05:05:07 +09:00
smoogipoo
36be171c29 Fix up/clean up csprojs for C#7 support 2017-11-30 02:06:03 +09:00
smoogipoo
a0c3349935 Add LangVer.props and osu.Game.props for common csproj properties 2017-11-30 00:45:37 +09:00
Dean Herbert
28d925dc1d
Merge branch 'master' into random-song-fix 2017-11-29 20:32:10 +09:00
Dean Herbert
b2fc50247c Hide metadata by default to avoid initial jump when no data present 2017-11-29 20:13:00 +09:00
Dean Herbert
2b7bf285e4 Improve code quality 2017-11-29 20:07:00 +09:00
mattiapette
6dd6f08bd0 Random song selection when entering the select menu with default osu theme or invalid beatmap 2017-11-29 11:51:56 +01:00
Dean Herbert
d4c1359a49
Merge branch 'master' into update-statistics-async 2017-11-29 19:27:22 +09:00
Dean Herbert
801d81ecfc Add a notice when not logged in 2017-11-29 19:00:08 +09:00
smoogipoo
ee35422efc Handle rulesets that don't support composition a bit better 2017-11-29 18:38:12 +09:00
Dean Herbert
93d7cd5a6d
Merge branch 'master' into performance-calculator 2017-11-29 18:37:07 +09:00
Dean Herbert
404e7d62ff
Merge branch 'master' into mania-important-frames 2017-11-29 18:12:57 +09:00
smoogipoo
309eb4edd7 Integrate HitObjectComposer into Compose
Also removes the other rulesets' HitObjectComposers for now.
2017-11-29 17:46:21 +09:00
Dean Herbert
bad970d1d1 Add wait steps to ensure the player is completely loaded before continuing 2017-11-29 17:25:55 +09:00
smoogipoo
f586cbac32 Restructure Compose to use grids and eventually support HitObjectContainer 2017-11-29 16:47:52 +09:00
smoogipoo
8c30fd490c Add HitObjectComposer class 2017-11-29 16:22:11 +09:00
smoogipoo
1136db1556 Fix mania replays not defining important frames
Resolves https://github.com/ppy/osu/issues/1495 .
2017-11-29 14:20:15 +09:00
Dean Herbert
85201ea30c
Merge branch 'master' into performance-calculator 2017-11-29 13:23:40 +09:00
Dean Herbert
d1afbf8055 Load Player-based TestCases asynchronously 2017-11-29 13:10:33 +09:00
Aergwyn
3bdf82d8df refactor newly added code to be less redundant 2017-11-28 21:38:11 +01:00
Aergwyn
6a4cc93360 fixes crash if all beatmaps of a set are hidden 2017-11-28 21:26:13 +01:00
Santeri
898c49c19d remove unnecessary assignments 2017-11-28 16:14:32 +02:00
Dean Herbert
66fa108696 Vertically centre the panels in osu!direct 2017-11-28 22:25:20 +09:00
smoogipoo
a9cc156d7a Merge remote-tracking branch 'origin/master' into performance-calculator 2017-11-28 21:38:26 +09:00
Dean Herbert
23b4d2163c Fix spelling and grammar 2017-11-28 21:30:03 +09:00
Dean Herbert
bd88df2722 Add note about sequential execution of ConvertHitObject 2017-11-28 18:33:41 +09:00
Dean Herbert
473eba9776 Remove precision limitation on chat height to allow pixel-perfect dragging 2017-11-28 12:09:44 +09:00
Santeri
e9277d8cb1 last directive error... 2017-11-28 00:27:58 +02:00
Santeri
49949bf698 fix minor param/directive errors 2017-11-28 00:20:44 +02:00
Santeri
86de6f8252 derives from trianglebutton rather than osubutton 2017-11-28 00:09:58 +02:00
Santeri
0a8fa2e6de Merge branch 'master' into header-button-should-derive 2017-11-27 23:16:42 +02:00
jorolf
7f068c0c68 correct string mistake 2017-11-27 21:13:01 +01:00
Aergwyn
c058065a3a remove unnecessary using 2017-11-27 20:24:01 +01:00
Aergwyn
d87235a289 prevent inserting duplicate metadata 2017-11-27 20:08:16 +01:00
Santeri Nogelainen
96f782e75a fix object reference issue maybe? 2017-11-27 13:51:56 +02:00
Santeri Nogelainen
bf8d15108e headerbutton now derives from osubutton 2017-11-27 13:39:01 +02:00
Dean Herbert
3a01bfc1ef Remove unnecessary new prefix 2017-11-27 18:53:19 +09:00
Dean Herbert
bf5ea027ef Add xmldoc to TriangleButton 2017-11-27 18:26:20 +09:00
Dean Herbert
96d42b3e5b Fix redundant string interpolation 2017-11-27 18:20:13 +09:00
Dean Herbert
51372d7cda Remove HandleInput override from TriangleButton 2017-11-27 18:19:06 +09:00
Dean Herbert
760f7d02d9 Remove AlwaysPresent (not actually required) 2017-11-27 18:12:52 +09:00
Dean Herbert
7877f42763 Merge remote-tracking branch 'upstream/master' into new-sounds-and-more 2017-11-27 17:59:24 +09:00
FreezyLemon
82a9b57277 Removed unnecessary "using" statement 2017-11-27 08:58:09 +01:00
FreezyLemon
b4513497d6 Added a textContainer reference to MetadataSection so casting is no longer required for setting new text 2017-11-27 08:52:26 +01:00
FreezyLemon
507da0dfb7 Renamed addTextAsync to setTextAsync 2017-11-27 08:48:47 +01:00
FreezyLemon
ac0942df86 Removed unnecessary private method to update the metadata 2017-11-27 08:48:12 +01:00
FreezyLemon
d49ee295d9 Removed unnecessary schedule and null checks 2017-11-27 08:47:36 +01:00
FreezyLemon
b34e724b8d Changed MetadataSection so that the Text setter loads the new text in async before displaying it. 2017-11-27 08:18:09 +01:00
Dean Herbert
2dcc3b9e74
Merge branch 'master' into fix-missing-metadata 2017-11-27 12:28:33 +09:00
Dean Herbert
3e0f282d52
Merge branch 'master' into global-track-volume-reduction 2017-11-27 12:27:01 +09:00
Dan Balasescu
00c552dea1
Merge branch 'master' into panel-hover-effect 2017-11-27 11:14:04 +09:00
Dan Balasescu
a574b092f6
Merge branch 'master' into change-transition-blur-rate 2017-11-27 10:42:32 +09:00
Dan Balasescu
77bfc6037d
Merge branch 'master' into fix-stuck-in-play 2017-11-27 10:06:34 +09:00
Dean Herbert
c555867aaf Merge remote-tracking branch 'upstream/master' into panel-hover-effect 2017-11-27 10:01:47 +09:00
Dean Herbert
f189de437a Simplify blending assignment 2017-11-27 10:01:44 +09:00
Dan Balasescu
98de969b47
Merge branch 'master' into fix-reload-all-panels 2017-11-27 09:56:44 +09:00
Dan Balasescu
bb9e399808
Merge branch 'master' into fix-reload-all-panels 2017-11-27 09:50:17 +09:00
Dan Balasescu
55741f3898
Merge branch 'master' into show-converts-toggle 2017-11-27 09:41:30 +09:00
Dan Balasescu
3f65c19bce
Merge branch 'master' into fix-sprite-icon 2017-11-27 09:32:37 +09:00
jorolf
70b6071898 add license header 2017-11-26 22:13:52 +01:00
jorolf
4c68090e59 separate GetUserBeatmapsRequest and GetUserMostPlayedBeatmapsRequest 2017-11-26 22:06:03 +01:00
jorolf
02fa1f9dd6 move shared stuff between MostPlayedBeatmapDrawable and DrawableScore to DrawableBeatmapRow 2017-11-26 21:52:35 +01:00
Unknown
ae55d392de only use == for comparion on primitive types 2017-11-26 19:37:46 +01:00
Aergwyn
ba0b16dc0b setting BeatmapSets as list to prevent endless LINQ query chain 2017-11-26 19:35:58 +01:00
Dean Herbert
671b3d01ff Fix OsuClickableContainer's local content geting overwritten 2017-11-26 17:21:23 +09:00
Dean Herbert
9c90d9ca45 Add panel hover effects 2017-11-26 17:21:23 +09:00
Dean Herbert
5aa6615107 Add confirm-selection sound in song select 2017-11-26 17:21:22 +09:00
Dean Herbert
c5aacb75c6 Add hover sounds to mod buttons 2017-11-26 17:21:22 +09:00
Dean Herbert
880418fd0d Split out click and hover sound layers 2017-11-26 17:21:22 +09:00
Dean Herbert
0c6a125777 Remove custom colour handling 2017-11-26 17:21:21 +09:00
Dean Herbert
ac7e373f40 Add hover/click sound effects to more stuff everywhere 2017-11-26 17:21:21 +09:00
Dean Herbert
8f57bf2498 Add choices of hover sample sets 2017-11-26 17:17:50 +09:00
Dean Herbert
8d7c891882 Add hover and click sound effects to settings sidebar buttons 2017-11-26 17:17:49 +09:00
Dean Herbert
af499df6dd Make a base OsuButton class to handle default samples 2017-11-26 17:17:48 +09:00
Dean Herbert
ae48b85827 Don't play logo select sample when actions are playing their own 2017-11-26 17:17:47 +09:00
Dean Herbert
07d6a70028 New sound effects with better names 2017-11-26 17:17:46 +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
Dean Herbert
df16a019ed Add a global reduction of audio track volume
Music is overpowering compared to our current game samples. We will need to do further adjustments on this, but for now let's reduce the track volume globally.
2017-11-26 17:08:58 +09:00
Dean Herbert
69e388dd52 Adjust background blur rate 2017-11-26 17:08:14 +09:00
Unknown
7be55df790 fix being stuck in gameplay if exit is pressed too fast
The reliance on `pauseOverlay.Alpha == 1` created a race condition that, when you pressed Exit while the pauseoverlay is still fading in, could get you stuck in gameplay.
The game wants to show the pause overlay but also thinks it's already paused and returns early.
2017-11-25 19:09:05 +01:00
Unknown
5da1466e28 requested changes
use IEquatable<T> instead of overriding Equals and `==` operator for primitive types.
2017-11-25 15:05:59 +01:00
Unknown
f6a33b3ea2 fix osu!direct download reloading all panels
This fixes the recreation of all panels when a download completes.
Also fixes NullReference when you download without ever opening the details of one Set.
2017-11-25 14:45:57 +01:00
Huo Yaoyuan
d955229ee5 Handle user rating metrics when no maps by using more linq. 2017-11-25 21:29:23 +08:00
jorolf
a1cc18f98c
Merge branch 'master' into most-played-beatmaps-section 2017-11-24 22:51:11 +01:00
jorolf
21d5d10738 replace BeatmapResponse with BeatmapInfo 2017-11-24 22:48:56 +01:00
Dean Herbert
09facdc838 Add a setting to toggle showing converted beatmaps 2017-11-24 18:34:20 +09:00
Dean Herbert
d6ac724f10
Merge branch 'master' into fix-sprite-icon 2017-11-24 13:41:23 +09:00
smoogipoo
3d8432aecf Merge branch 'master' into fix-player-testcases 2017-11-24 13:23:42 +09:00
Dean Herbert
7ff39d62a1 Fix SpriteIcon potentially not updating texture during a load race condition
Better fix for #1577.
2017-11-24 12:48:02 +09:00
Aergwyn
e3a230320a compare metdata and remove duplicate from beatmap to prevent redundant storage 2017-11-23 19:46:58 +01:00
Dean Herbert
95fbe6a4a2 Update framework 2017-11-23 23:43:27 +09:00
Dean Herbert
c7a5a7cd93 Merge remote-tracking branch 'upstream/master' into fix-player-testcases 2017-11-23 23:42:19 +09:00
Dean Herbert
6ddefa5f8c
Merge branch 'master' into improve-user-ratings-calculations 2017-11-23 23:33:05 +09:00
Dean Herbert
dbb03bcff2 Handle the case where a map hasn't been rated yet 2017-11-23 23:30:57 +09:00
Dan Balasescu
dd78479a1a
Merge branch 'master' into fix-ef-issues 2017-11-23 21:18:20 +09:00
Dean Herbert
2f3e4a27c6
Merge branch 'master' into improve-user-ratings-calculations 2017-11-23 20:55:55 +09:00
Dean Herbert
9565a9c352 Fix TestCasePlayer not working as expected 2017-11-23 20:42:07 +09:00