Commit Graph

96 Commits

Author SHA1 Message Date
67bd375bfa Merge remote-tracking branch 'upstream/master' into raw-input-fixes 2018-02-07 22:05:44 +09:00
dfc344b47a Update OpenTK version 2018-02-06 13:47:54 +09:00
cf39236fc1 Make NUnit tests run locally again 2018-02-05 18:29:58 +09:00
6b35ef7063 Update OpenTK version 2018-02-05 16:13:30 +09:00
28b67e3d77 Merge branch 'master' into url-parsing-support 2018-01-30 17:47:55 +09:00
f996acd7e6 Add back old non-visual tests 2018-01-29 18:37:11 +09:00
a5b0d51205 Merge remote-tracking branch 'upstream/master' into url-parsing-support
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-01-27 14:06:58 +09:00
8f0ab2040f Add Jetbrains.Annotations NuGet package 2018-01-26 12:46:28 +01:00
be225eff90 Merge branch 'master' into fix-replays 2018-01-17 18:01:41 +09:00
da793d91ea Make a testcase for replay vs autoplay 2018-01-17 17:35:27 +09:00
54b0f4b912 Merge branch 'master' into url-parsing-support 2018-01-17 16:16:55 +09:00
d230fd486e Add automated cursor testcase 2018-01-16 15:28:00 +09:00
45301d07fd Merge branch 'master' into url-parsing-support 2018-01-12 19:34:44 +09:00
f34131f8f4 Initial game-wide replacement of scrolling playfields 2018-01-04 18:50:17 +09:00
7beb4c3507 Initial implementation of a new scrolling hitobject container 2018-01-04 16:21:15 +09:00
faf1181fc3 Merge branch 'master' into url-parsing-support 2018-01-02 17:51:50 +09:00
2ca10b28c6 Use a non-broken opentk library 2017-12-29 15:42:51 +09:00
5b529511ec Update OpenTK nuget package
Fixes the recent AppVeyor errors
2017-12-27 13:18:34 +09:00
ef0031a719 Merge branch 'master' into popup-word-wrap 2017-12-26 15:47:58 +09:00
a30448095e Merge branch 'master' into url-parsing-support 2017-12-25 19:12:23 +01:00
dff082ed94 Make toolbar testable and add the most basic of visual tests 2017-12-26 01:12:46 +09:00
f76878e2fe Add a very basic popup testcase 2017-12-26 00:38:30 +09:00
4d40004e97 Merge branch 'master' into beatmap-serialization 2017-12-22 22:45:00 +09:00
8c50fa0b84 Add testcase 2017-12-22 18:57:23 +09:00
c99ea32574 Merge branch 'master' into beatmap-serialization 2017-12-21 13:39:39 +09:00
a6496e35ec Merge branch 'master' into url-parsing-support 2017-12-20 14:41:12 +09:00
a74ac278fe Merge remote-tracking branch 'upstream/master' into editor-selection-tool 2017-12-18 21:48:01 +09:00
918e7c9a4b MenuOverlay -> GameplayMenuOverlay 2017-12-18 16:40:50 +09:00
9fb3d3704a TestCaseMenuOverlays -> TestCaseMenuOverlay 2017-12-18 15:42:11 +09:00
35b6114d01 Merge branch 'master' into editor-selection-tool 2017-12-18 13:57:32 +09:00
1b85952441 Cleanup and basic TestCase 2017-12-15 14:36:51 +09:00
9c59db4be3 Merge remote-tracking branch 'origin/master' into editor-selection-tool 2017-12-14 14:20:49 +09:00
1d206f7ec6 add visual tests for BeatmapInfoWedge 2017-12-12 14:44:12 +01:00
f8bc52bbe6 Merged https://github.com/ppy/osu master branch 2017-12-11 09:27:54 +01:00
7189446943 Merge remote-tracking branch 'origin/master' into editor-selection-tool 2017-12-11 16:34:27 +09:00
9069f1ccba Merge branch 'master' into most-played-beatmaps-section 2017-12-11 12:12:23 +09:00
faa921ba05 Fix up post-merge issues 2017-12-08 17:41:10 +09:00
f41af191ed Merge remote-tracking branch 'origin/master' into editor-selection-tool 2017-12-08 15:13:18 +09:00
65afbd5c1b Added new test case for URL parsing / link display in chat 2017-12-07 10:29:33 +01:00
44ee11e75f Merge branch 'master' into fix-beatmap-carousel-lag 2017-12-07 15:30:50 +09:00
b0684cb194 Add storyboard test case but disable for now 2017-12-07 12:02:34 +09:00
499ecb4edd Add parity checking OsuJsonDecoder test cases 2017-12-07 11:11:38 +09:00
b584178e85 Make Beatmap ISerializable and add more JsonIgnores 2017-12-06 00:37:37 +09:00
7957e55710 Merge branch 'master' into editor-composer 2017-12-03 14:47:07 +09:00
2bbfe0dda1 expanded BeatmapDecoder tests, added StoryboardDecoder tests 2017-12-02 15:28:00 +01:00
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
cf859a6cf2 Make the dragger attach to objects it surrounds
Plus a lot more implementation.
2017-12-02 00:26:02 +09:00
ead7456978 Add compose radio buttons + testcase 2017-11-30 15:43:19 +09:00
36be171c29 Fix up/clean up csprojs for C#7 support 2017-11-30 02:06:03 +09:00
a0c3349935 Add LangVer.props and osu.Game.props for common csproj properties 2017-11-30 00:45:37 +09:00