smoogipoo
9c59db4be3
Merge remote-tracking branch 'origin/master' into editor-selection-tool
2017-12-14 14:20:49 +09:00
Aergwyn
1d206f7ec6
add visual tests for BeatmapInfoWedge
2017-12-12 14:44:12 +01:00
smoogipoo
a6a07b1aa7
Cleanups
2017-12-11 22:20:07 +09:00
naoey
ccbbd09d84
Merge remote-tracking branch 'upstream/master' into leaderboard-scopes
2017-12-11 13:59:22 +05:30
FreezyLemon
f8bc52bbe6
Merged https://github.com/ppy/osu master branch
2017-12-11 09:27:54 +01:00
smoogipoo
7189446943
Merge remote-tracking branch 'origin/master' into editor-selection-tool
2017-12-11 16:34:27 +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
91335a83ec
Remove unnecessary whitespace
2017-12-11 12:24:47 +09:00
Dean Herbert
9069f1ccba
Merge branch 'master' into most-played-beatmaps-section
2017-12-11 12:12:23 +09:00
Aergwyn
cdf9ea0d01
removed unnecessary variable
...
and fixed the test because of new DI letting it fail
2017-12-09 13:39:11 +01:00
smoogipoo
faa921ba05
Fix up post-merge issues
2017-12-08 17:41:10 +09:00
smoogipoo
f41af191ed
Merge remote-tracking branch 'origin/master' into editor-selection-tool
2017-12-08 15:13:18 +09:00
FreezyLemon
c950d1359a
various CI adjustments
2017-12-07 19:39:13 +01:00
FreezyLemon
e05618a415
Removed unnecessary "using" directives
2017-12-07 19:36:56 +01:00
FreezyLemon
772bba27be
Small style changes
2017-12-07 16:41:46 +01:00
FreezyLemon
465f92af07
Removed unnecessary whitespace
2017-12-07 16:31:02 +01:00
FreezyLemon
334cb3dd10
Removed TODO and added another test line
2017-12-07 16:26:50 +01:00
FreezyLemon
07660a6600
Added licence header to the new test case
2017-12-07 13:17:51 +01:00
FreezyLemon
f3f3d1d0fc
Various test fixes
2017-12-07 11:11:43 +01:00
FreezyLemon
006ac44e11
Fixed up style in the ChatDisplay test
2017-12-07 10:29:54 +01:00
FreezyLemon
65afbd5c1b
Added new test case for URL parsing / link display in chat
2017-12-07 10:29:33 +01:00
Dean Herbert
44ee11e75f
Merge branch 'master' into fix-beatmap-carousel-lag
2017-12-07 15:30:50 +09:00
smoogipoo
b0684cb194
Add storyboard test case but disable for now
2017-12-07 12:02:34 +09:00
smoogipoo
499ecb4edd
Add parity checking OsuJsonDecoder test cases
2017-12-07 11:11:38 +09:00
smoogipoo
f9e34dfa3d
Assume that control points are already sequentially-ordered
...
Fixes up deserializing.
2017-12-06 16:24:09 +09:00
smoogipoo
b584178e85
Make Beatmap ISerializable and add more JsonIgnores
2017-12-06 00:37:37 +09:00
FreezyLemon
dcdc186a53
Added chatoverlay caching to testcase so test still works (chat needs to be injected so channels can be opened)
2017-12-04 13:27:14 +01:00
Dean Herbert
7957e55710
Merge branch 'master' into editor-composer
2017-12-03 14:47:07 +09: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
Aergwyn
2bbfe0dda1
expanded BeatmapDecoder tests, added StoryboardDecoder tests
2017-12-02 15:28:00 +01:00
FreezyLemon
7f029a382b
Made the Chat testcase include a beatmapsetoverlay so links can be clicked from in there. Also had to implement private DI to make it work
2017-12-02 10:43:19 +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
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
smoogipoo
a30270658d
Merge remote-tracking branch 'origin/master' into netstandard
2017-12-01 18:50:28 +09:00
Aergwyn
c16925059c
split parsing a beatmap and parsing a storyboard
2017-11-30 19:16:13 +01:00
smoogipoo
e9cbef88f1
Improve selection/deselection behaviour of RadioButtonCollections
2017-11-30 19:50:07 +09:00
smoogipoo
efa39f38ca
CI fixes
2017-11-30 18:49:08 +09:00
smoogipoo
33adf569a4
Don't select a new beatmap in load()
2017-11-30 17:39:06 +09:00
smoogipoo
73e41f9dde
Add constructors to RadioButton
2017-11-30 16:57:30 +09:00
smoogipoo
ead7456978
Add compose radio buttons + testcase
2017-11-30 15:43:19 +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
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
smoogipoo
0ec10ba32d
CI fixes
2017-11-30 00:11:00 +09:00
smoogipoo
267bb75458
Merge remote-tracking branch 'Aergwyn/master' into netstandard
2017-11-29 23:45:29 +09:00
smoogipoo
2ec24f58c8
Add testcase for editor compose
2017-11-29 16:30:59 +09:00
