Dean Herbert
3880c7157b
Merge branch 'master' into fix-missing-metadata
2017-12-11 16:04:08 +09:00
Dean Herbert
08727266e7
Merge branch 'master' into add-ruleset-shortname
2017-12-11 15:41:11 +09:00
Dean Herbert
04715f9a51
Merge branch 'master' into HandleInput
2017-12-11 15:24:29 +09:00
smoogipoo
ed81ed7c54
Add back HandleInput disable overrides
2017-12-11 15:19:00 +09:00
Dean Herbert
5a6ac73fff
Fix broken tools making broken changes
2017-12-11 15:05:19 +09:00
Dean Herbert
77592ed15f
Fix comment formatting
2017-12-11 14:52:15 +09:00
Dean Herbert
de1f51269d
Merge branch 'master' into HandleInput
2017-12-11 13:53:33 +09:00
Dean Herbert
c880386fde
Merge branch 'master' into fix-crash-hidden-sets#2
2017-12-11 13:16:30 +09:00
Dean Herbert
7d8fb12332
DrawableScore -> DrawableProfileScore
...
Discern between the other class of the same name
2017-12-11 12:51:02 +09:00
Dean Herbert
0c2158ccbd
Improve display of beatmap thumbnails
2017-12-11 12:47:31 +09:00
Dean Herbert
98ce856de1
Use more sensible names for classes and methods
...
Adds xmldoc in places too.
2017-12-11 12:33:34 +09:00
Dean Herbert
507d0e3252
Use more sensible names for classes
2017-12-11 12:26:48 +09:00
Dean Herbert
9069f1ccba
Merge branch 'master' into most-played-beatmaps-section
2017-12-11 12:12:23 +09:00
Aergwyn
e629cebe31
fix MusicController ignoring Looping property of a Track
...
my fix to prevent the MusicController from constantly trying to restart a track before accidentally removed this
2017-12-10 13:22:46 +01:00
Aergwyn
e4628427cb
moved query into schedule
2017-12-10 08:15:29 +01:00
Dean Herbert
1417dfd67a
Merge branch 'master' into fix-crash-hidden-sets#2
2017-12-10 13:28:46 +09:00
Dean Herbert
6b63452a23
Merge branch 'master' into add-testing-tag
2017-12-10 13:09:09 +09:00
Dean Herbert
668299ef84
Merge branch 'master' into fix-userprofile-unranked
2017-12-10 13:02:32 +09:00
Dean Herbert
d02e1ae896
Update RulesetInfo and add migration
2017-12-10 12:15:55 +09:00
TocoToucan
219bdbc4e1
Populate HandleInput automatically
2017-12-09 22:21:17 +03:00
Aergwyn
821154d3bb
reverted Beatmaps-setter back to its former glory
2017-12-09 08:42:59 +01:00
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
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
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
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
smoogipoo
bdf283a4e1
A bit more cleanup
2017-12-07 15:55:38 +09:00
smoogipoo
09f54b06ac
Just don't serialize Author altogether for now
2017-12-07 15:55:22 +09:00
smoogipoo
0ba8988580
Don't serialize Author + add SerializableAttributes
2017-12-07 15:32:39 +09:00
Dean Herbert
44ee11e75f
Merge branch 'master' into fix-beatmap-carousel-lag
2017-12-07 15:30:50 +09:00
smoogipoo
e573db04d4
Don't serialize HitObject.Kiai
2017-12-07 14:42:36 +09:00
smoogipoo
f5f7658e90
Don't serialize TotalBreakTime
2017-12-07 14:40:28 +09:00
smoogipoo
245b5f759f
Underscore + lowercase all keys
2017-12-07 14:37:12 +09:00
Dean Herbert
a78441bc5a
Apply changes in line with framework input adjustments
2017-12-07 13:16:59 +09:00
smoogipoo
dfc10d42e8
Merge remote-tracking branch 'origin/master' into beatmap-serialization
2017-12-07 12:49:27 +09:00
smoogipoo
d026587a91
Add flag to explicitly serialize the type version
2017-12-07 12:49:16 +09:00
smoogipoo
9e51480aa3
Cleanup TypedListConverter a bit
2017-12-07 12:27:30 +09:00
smoogipoo
f1dbcc4f1a
Remove misleading comments
2017-12-07 12:23:53 +09:00
smoogipoo
feef4b1890
Add license header
2017-12-07 12:18:00 +09:00
smoogipoo
fcfdbc8e07
Don't show the migrate button on deployed builds for now
2017-12-07 12:02:48 +09:00
smoogipoo
851c20aff0
Add a few comments
2017-12-07 11:17:32 +09:00
smoogipoo
ea2c67ca5f
Fix incorrect serialization condition
2017-12-07 11:10:46 +09:00
smoogipoo
9597f9d46b
Resharper cleanup
2017-12-07 11:10:20 +09:00
smoogipoo
0e3b001b13
Make maps with storyboards decode correctly with OsuJsonDecoder
2017-12-07 10:37:51 +09:00
Dan Balasescu
9c4ca46786
Merge branch 'master' into shader-precompile
2017-12-07 04:15:24 +09:00
smoogipoo
a8db3a9484
Add progress notification to migration
2017-12-07 04:09:03 +09:00
smoogipoo
41b607c165
Dont serialize hitobject sample properties copied from the control point
2017-12-07 03:40:43 +09:00
smoogipoo
9787788081
Revert unintended change
2017-12-07 03:39:43 +09:00
smoogipoo
4232a54b32
Make TypedListConverter not reconstruct serializers
2017-12-07 03:04:56 +09:00
smoogipoo
b6b26cfe25
Add basic method to migrate beatmaps to the new JSON format
2017-12-07 03:04:36 +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
smoogipoo
ed5f7e5353
Make OsuJsonDecoder apply defaults similar to OsuLegacyDecoder
2017-12-06 16:28:34 +09:00
smoogipoo
f9e34dfa3d
Assume that control points are already sequentially-ordered
...
Fixes up deserializing.
2017-12-06 16:24:09 +09:00
Dean Herbert
04ae64e9fd
Add missing IsCompleted check to ensureValid
2017-12-06 16:20:49 +09:00
smoogipoo
887b81148d
Don't ignore RulesetId for now
2017-12-06 14:14:07 +09:00
smoogipoo
44edb8724f
Add JsonIgnores to CommandTimelineGroup
2017-12-06 13:48:44 +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
smoogipoo
e199ee5225
Add a few xmldocs
2017-12-06 00:42:17 +09:00
smoogipoo
d2dc7c8937
Add OsuJsonDecoder
2017-12-06 00:38:12 +09:00
smoogipoo
b584178e85
Make Beatmap ISerializable and add more JsonIgnores
2017-12-06 00:37:37 +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
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
