smoogipoo
7a793eaded
Merge master into netstandard
2017-12-27 20:48:53 +09:00
Dean Herbert
7d0c94fd01
Fix notification overlay layout and scheduled tasks being delayed
...
Closes #1295
2017-12-27 19:42:44 +09:00
Dan Balasescu
1af7f71c97
Merge branch 'master' into notification-verbosity
2017-12-27 15:01:28 +09:00
smoogipoo
5b529511ec
Update OpenTK nuget package
...
Fixes the recent AppVeyor errors
2017-12-27 13:18:34 +09:00
Dean Herbert
94449ed597
Merge branch 'master' into notification-verbosity
2017-12-26 20:48:59 +09:00
Dean Herbert
3182c22c7d
Merge remote-tracking branch 'upstream/master' into hide-useless-beatmap-info
2017-12-26 20:36:22 +09:00
Dean Herbert
7504cd589d
Move alpha handling to state
2017-12-26 20:18:47 +09:00
Dean Herbert
1c4bcdda96
Fix test race condition
...
async loads
2017-12-26 20:13:55 +09:00
Dean Herbert
ee67e7119d
Merge remote-tracking branch 'upstream/master' into fix-info-wedge
2017-12-26 19:44:28 +09:00
Dean Herbert
ab6c93fba4
Merge branch 'master' into notification-verbosity
2017-12-26 16:14:24 +09:00
Dan Balasescu
ef0031a719
Merge branch 'master' into popup-word-wrap
2017-12-26 15:47:58 +09:00
Dean Herbert
024d9a6850
Remove unnecessary null check
2017-12-26 15:33:02 +09:00
Dean Herbert
e14ad31a07
Increase wait durations for test stability
2017-12-26 15:32:53 +09:00
Dan Balasescu
ad811961a7
Merge branch 'master' into quieter-notifications
2017-12-26 15:30:12 +09:00
Dean Herbert
ed7ae4e956
Merge branch 'master' into fix-info-wedge
2017-12-26 15:08:52 +09:00
FreezyLemon
c822735724
Added tests for hiding diffs (and especially the last visible diff)
2017-12-26 03:57:18 +01:00
FreezyLemon
025d3941a2
Fixed problems introduced by the merge
2017-12-25 19:43:35 +01:00
FreezyLemon
a30448095e
Merge branch 'master' into url-parsing-support
2017-12-25 19:12:23 +01:00
Dean Herbert
1fc240f6c5
Expose unread notification count
2017-12-26 01:50:05 +09:00
Dean Herbert
bb33d0211a
Add a count of unread notifications to the toolbar
2017-12-26 01:36:58 +09:00
Dean Herbert
dff082ed94
Make toolbar testable and add the most basic of visual tests
2017-12-26 01:12:46 +09:00
Aergwyn
48e55a0686
fix formatting and test
...
add missing line
2017-12-25 16:52:17 +01:00
Dean Herbert
f76878e2fe
Add a very basic popup testcase
2017-12-26 00:38:30 +09:00
Aergwyn
bb4b5bebf9
fix supporter icon in profile missing its background
...
also it doesn't show up on profiles without supporter anymore
2017-12-25 15:30:42 +01:00
Dean Herbert
40dd66cb97
Make TestCaseNotificationOverlay dynamically testable
2017-12-25 18:31:19 +09:00
Dean Herbert
fa95612fb7
Merge remote-tracking branch 'upstream/master' into fix-info-wedge
2017-12-25 01:06:56 +09:00
Dean Herbert
a7ee6985b0
Add wait step
2017-12-25 01:06:33 +09:00
Dean Herbert
482e10966c
Ensure a selection is made on entering song select if no selection is current
2017-12-24 17:02:56 +09:00
Dean Herbert
cf316b3c51
Add tests for initial load states of PlaySongSelect
2017-12-24 15:39:25 +09:00
Aergwyn
9bb0cda525
fix NotificationOverlay going out of bounds at the bottom
...
also fixes the overlap with the Toolbar at the top
2017-12-23 14:33:43 +01:00
Aergwyn
1d67746d32
fix crash in SongSelect when traversing while zero beatmaps are loaded
2017-12-23 12:53:11 +01:00
smoogipoo
1f44e98f9c
Add unavailable state to testcase
2017-12-23 20:17:12 +09:00
Aergwyn
49e855a29a
finished up visual tests
2017-12-23 11:56:53 +01:00
Dean Herbert
5026c7a95e
SoundControlPoint -> SampleControlPoint
2017-12-23 16:34:34 +09:00
Aergwyn
6a8fd74e05
fix failing tests
...
1) waiting for loading to finish so Drawables are all present to do asserts on
2) fix NullRef in ResultPage because of removed line in DummyWorkingBeatmap (author one)
2017-12-22 17:38:22 +01:00
Dean Herbert
4d40004e97
Merge branch 'master' into beatmap-serialization
2017-12-22 22:45:00 +09:00
Aergwyn
ed827d5424
more visual tests for BeatmapInfoWedge
...
also fix Author showing when not wanted
2017-12-22 12:33:52 +01:00
Dean Herbert
728d1cb7f6
Formatting and more dynamically testable references
2017-12-22 19:24:54 +09:00
Dean Herbert
1a318c5c2b
Improve LineGraph invalidation logic
2017-12-22 18:58:35 +09:00
EVAST9919
8c50fa0b84
Add testcase
2017-12-22 18:57:23 +09:00
Dan Balasescu
a3d947301b
Merge branch 'master' into beatmap-serialization
2017-12-22 07:38:05 +09:00
Dean Herbert
40ceaf12f2
Merge branch 'master' into leaderboard-scopes
2017-12-22 00:44:24 +09:00
Dean Herbert
63f2436220
Merge branch 'master' into leaderboard-scopes
2017-12-21 21:18:56 +09:00
smoogipoo
d80079a73a
Merge remote-tracking branch 'origin/master' into beatmap-serialization
2017-12-21 20:15:01 +09:00
smoogipoo
a3fcc0b60c
Back to using SortedLists
2017-12-21 19:40:41 +09:00
naoey
01c4b1e544
Maintain a placeholder state and add tests showing all the states.
...
- Also don't replace placeholder if new one is same as old
2017-12-21 15:27:20 +05:30
Dean Herbert
fdfc596abe
Merge branch 'master' into add-confirmation-dialog
2017-12-21 18:45:52 +09:00
smoogipoo
e8e5e8270b
Rename decoder
2017-12-21 14:19:37 +09:00
smoogipoo
bfa4f1a2c3
Apply changes in line with master changes
2017-12-21 13:59:03 +09:00
smoogipoo
c99ea32574
Merge branch 'master' into beatmap-serialization
2017-12-21 13:39:39 +09:00
smoogipoo
e1a71f7662
Merge branch 'master' into make-testcases-public
2017-12-21 13:32:02 +09:00
Dan Balasescu
e051353dad
Merge branch 'master' into add-deselect-mods-button
2017-12-21 11:54:46 +09:00
Aergwyn
ebc2ad55f8
greatly expanded tests for ModSelectOverlay
2017-12-20 19:05:23 +01:00
Dean Herbert
020d272636
Make all TestCases public
2017-12-20 21:51:00 +09:00
Dean Herbert
3292ef33fd
Fix test edge cases
2017-12-20 21:16:19 +09:00
Dean Herbert
21829ba37b
Merge branch 'master' into leaderboard-scopes
2017-12-20 20:17:11 +09:00
Dean Herbert
a6496e35ec
Merge branch 'master' into url-parsing-support
2017-12-20 14:41:12 +09:00
Dean Herbert
9940d4630f
Merge branch 'master' into customize-progress-notification
2017-12-20 02:52:57 +09:00
Aergwyn
bfe986230d
Merge branch 'master' into add-confirmation-dialog
2017-12-18 17:29:06 +01:00
Dean Herbert
a74ac278fe
Merge remote-tracking branch 'upstream/master' into editor-selection-tool
2017-12-18 21:48:01 +09:00
FreezyLemon
f898481523
Changed existing implementations to have a custom CompletionText
2017-12-18 11:14:07 +01:00
smoogipoo
f90e3346c1
Add automated test cases
2017-12-18 19:13:40 +09:00
smoogipoo
918e7c9a4b
MenuOverlay -> GameplayMenuOverlay
2017-12-18 16:40:50 +09:00
smoogipoo
1e4cad900d
Fix up incorrect RequiredTypes
2017-12-18 16:04:51 +09:00
smoogipoo
9fb3d3704a
TestCaseMenuOverlays -> TestCaseMenuOverlay
2017-12-18 15:42:11 +09:00
Dan Balasescu
35b6114d01
Merge branch 'master' into editor-selection-tool
2017-12-18 13:57:32 +09:00
Dean Herbert
3759c39f00
Update test case to handle scheduled removal
2017-12-18 02:51:09 +09:00
Dean Herbert
5aee8f80bb
Fix incorrect test assumption (affected by random select above)
2017-12-16 17:33:50 +09:00
Dean Herbert
bd9056c709
Better choose new selection when multiple items are removed including current
2017-12-16 17:32:21 +09:00
Dean Herbert
3c406662ed
Ensure correct selection after deletion of currently selected
...
Also fixes a lot of bad interactions and simplifies further.
2017-12-16 16:18:44 +09:00
Dean Herbert
49ce42d90c
Add ToString() overrides on many classes to make debugging easier
2017-12-16 16:14:01 +09:00
Aergwyn
2e196661bb
Merge branch 'master' into add-confirmation-dialog
2017-12-15 18:11:13 +01:00
Dean Herbert
a8a2c233a0
Add tests for (and fix) removal of last item in carousel
2017-12-16 00:33:09 +09:00
Dean Herbert
e6cac4a675
Allow tests to work with a variable number of beatmap sets loaded
2017-12-15 14:44:14 +09:00
Dean Herbert
2817ed0d46
Fix typo
2017-12-15 14:36:51 +09:00
Dean Herbert
67f05977ea
Add sorting support
2017-12-15 14:36:51 +09:00
Dean Herbert
b4b2f12116
Add support for adding/removing items
...
Tests accompany of course
2017-12-15 14:36:51 +09:00
Dean Herbert
5cbb9b9b18
Fix random and add tests
...
Also exposes SelectedBeatmapSet.
2017-12-15 14:36:51 +09:00
Dean Herbert
8646d5d1e0
Add testing and fix filtering only some difficulties
2017-12-15 14:36:51 +09:00
Dean Herbert
48f30d2bb5
Get ready for more tests
2017-12-15 14:36:51 +09:00
Dean Herbert
ec4f99c92e
Clean up tests some more
2017-12-15 14:36:51 +09:00
Dean Herbert
1b85952441
Cleanup and basic TestCase
2017-12-15 14:36:51 +09:00
Dean Herbert
78dd975a35
Initial carousel infrastructue changes
2017-12-15 14:36:51 +09:00
smoogipoo
2c1a83f82e
Merge branch 'master' into editor-selection-tool
2017-12-15 13:36:47 +09:00
Aergwyn
f329b1ed72
add Spinner Count to BeatmapInfoWedge
...
- added Tooltips to the respective InfoLabels
- made the TestCase internal like all others
2017-12-14 19:55:15 +01:00
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
Unknown
e832f163e7
Add failure test case.
...
- Only show failure if request wasn't cancelled
2017-11-28 12:09:32 +05:30
Dean Herbert
af499df6dd
Make a base OsuButton class to handle default samples
2017-11-26 17:17:48 +09:00
Unknown
0b3f75505e
Don't break VisualTests and add a real beatmap step.
2017-11-25 20:59:03 +05:30
jorolf
6b3347d6ac
remove description
2017-11-24 22:59:21 +01: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
4e96c5aea2
Fix TestCaseButtonSystem not working
...
Was missing an osu! logo
2017-11-23 20:44:49 +09:00
Dean Herbert
52c971cd75
Fix using incorrect Description attribute
2017-11-23 18:58:25 +09:00
Dean Herbert
288c21dfec
Move TestCase descriptions to attributes
...
Depends on https://github.com/ppy/osu-framework/pull/1186 .
2017-11-23 16:09:32 +09:00
jorolf
57f2d8556b
add a visual test
2017-11-22 22:00:17 +01:00
smoogipoo
de7c571be3
Merge remote-tracking branch 'origin/master' into netstandard
2017-11-22 19:46:17 +09:00
Dean Herbert
757bb6911e
Fix license header from wrong project
2017-11-22 12:06:31 +09:00
Dean Herbert
e3c5a599b6
Tidy some regressions
2017-11-22 11:36:29 +09:00
Dean Herbert
0f8499c580
Rename to PlaybackControl and add a TestCase
2017-11-22 11:22:46 +09:00
smoogipoo
756f6f2d16
Remove net461 targets
2017-11-20 10:10:28 +09:00
smoogipoo
067c018422
Cleanups
2017-11-19 17:31:35 +09:00
smoogipoo
440c1a9f83
Make osu.Desktop and osu.Game.Tests compile under net461+netstandard
2017-11-19 14:30:56 +09:00
EVAST9919
d301ad1435
Add supporter icon to the user panel
2017-11-16 20:06:49 +03:00
smoogipoo
f461f03b08
Make osu! compile with framework changes
2017-11-16 14:51:31 +09:00
Dean Herbert
eaf1a60fe1
Merge branch 'master' into beatmap_scores
2017-11-15 17:58:07 +09:00
EVAST9919
ea2fa5fa00
Fix wrong ratings calculations
2017-11-15 09:48:40 +03:00
Dean Herbert
7dd2720b4b
Merge branch 'master' into beatmap_scores
2017-11-15 13:41:38 +09:00
Dean Herbert
6ef60d0b4e
Merge branch 'master' into beatmap-overlay-scores
2017-11-15 13:18:32 +09:00
EVAST9919
f5e510cdf2
CI fixes
2017-11-12 09:09:54 +03:00
EVAST9919
96e99d996b
Add TestCase
2017-11-12 09:01:13 +03:00
EVAST9919
4b21c83f35
Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed
2017-11-10 17:24:26 +03:00
EVAST9919
c2f3971188
Extend Beatmap Set Response
2017-11-10 03:01:11 +03:00
Dean Herbert
d8d7165164
Add a test case which starts the game
2017-11-08 13:52:44 +09:00
Dean Herbert
3adcfa8c38
Many fixes
2017-11-03 17:54:35 +09:00
Dean Herbert
27156aeb93
Fix the shit
2017-11-01 17:07:03 +09:00
Dean Herbert
ca8afc0c80
Merge remote-tracking branch 'upstream/master' into intro
2017-10-31 15:49:28 +09:00
Dean Herbert
fcb88de626
Merge branch 'master' into recent-scores
2017-10-30 18:48:26 +09:00
EVAST9919
08637253df
Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed
2017-10-26 15:04:44 +03:00
EVAST9919
e5dae81356
Move testcase to the right place
2017-10-26 14:42:23 +03:00
Jorolf
0449639f41
remove inner classes and make User property a bindable
2017-10-25 20:07:12 +02:00
Dean Herbert
c30dc77b28
Unique MD5s for unit test
2017-10-25 22:25:28 +09:00
Dan Balasescu
4f64358d67
Merge branch 'master' into extended-textawesome-test
2017-10-24 12:10:24 +09:00
Dean Herbert
0316ec3098
Remove no-longer-necessary Thread.Sleep
2017-10-24 10:08:00 +09:00
Dean Herbert
c704c0349a
Disable IPC test for now
2017-10-24 06:50:33 +09:00
Dean Herbert
7dadb7e21e
Mark IPC non-parallelizable
2017-10-24 06:13:39 +09:00
EVAST9919
d4789e4a9c
Make TextAwesome TestCase more useful
2017-10-23 19:08:53 +03:00
Dean Herbert
22b3f5dd19
Merge remote-tracking branch 'upstream/master' into import-test-fixes
2017-10-23 22:03:37 +09:00
Dean Herbert
4e7c0f11f1
Disable import tests so we can make forward progress
2017-10-23 20:14:17 +09:00
Dean Herbert
e7c935a985
Fix incorrect reference to osu.Game project
2017-10-23 19:33:36 +09:00
Dean Herbert
dc9c474033
Move all TestCases to Testing project
...
This allows tests to successfully retrieve rulesets, as they are referenced.
2017-10-23 19:32:02 +09:00
Dean Herbert
aff30db89d
Add thread sleep as a temporary workaround for failing tests
2017-10-22 16:21:41 +09:00
Dean Herbert
908c6d827f
ValueTuple please
2017-10-19 14:49:23 +09:00
Dean Herbert
5d5ea5fb2e
Fix all remaining db structure issues
2017-10-19 14:05:11 +09:00
Dean Herbert
71d614b813
FIx missing columns yet again
2017-10-18 21:57:54 +09:00
Dean Herbert
00be98dba7
Query test assert conditions less often
2017-10-18 20:37:53 +09:00
Dean Herbert
ac4b2797dc
valuetuple nightmare
2017-10-18 20:07:25 +09:00
Dean Herbert
799f510217
FileStore logic fixes
2017-10-17 10:25:18 +09:00
Dean Herbert
eff1c20e38
CI fixing
2017-10-16 22:00:54 +09:00
Dean Herbert
e378d0685d
Remove weird additions
2017-10-16 20:37:10 +09:00
Dean Herbert
d73c0c0c98
Fix test regression
2017-10-16 13:09:01 +09:00
TocoToucan
56e8c7303c
Revert "Fix inconsistent lock usage in BeatmapManager"
...
This reverts commit 4a064da30f
2017-10-16 12:59:59 +09:00
TocoToucan
4a064da30f
Fix inconsistent lock usage in BeatmapManager
2017-10-15 21:56:33 +03:00
smoogipoo
9924f518b7
Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore
...
# Conflicts:
# osu-framework
# osu.Game/Beatmaps/BeatmapMetadata.cs
# osu.Game/osu.Game.csproj
# osu.Game/packages.config
2017-10-14 16:36:37 +09:00
smoogipoo
b178be21d1
Let's not rename columns yet
2017-10-14 14:30:58 +09:00
smoogipoo
674ad4a30c
Fix compile errors
2017-10-14 12:49:03 +09:00
smoogipoo
b83d7cd4df
Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore
...
# Conflicts:
# osu-framework
# osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
# osu.Game/Beatmaps/BeatmapInfo.cs
# osu.Game/Online/API/Requests/GetBeatmapSetsResponse.cs
2017-10-14 12:38:59 +09:00
Dean Herbert
ed152c08ac
Fix regressions
2017-10-14 12:27:32 +09:00
Dean Herbert
bf6ab77b0e
Always use live queries to ensure waiting asserts actually get dynamic data
2017-10-11 13:37:24 +09:00
Dean Herbert
b6cfc49b06
Improve resilience of beatmap import test
...
Fixes this happening https://ci.appveyor.com/project/peppy/osu/build/master-4694/tests
2017-10-11 12:41:43 +09:00
TocoToucan
887aa7496b
Rework EF Core usage in model classes
2017-10-06 00:23:26 +03:00
TocoToucan
6a4198d0d6
Initial EF Core commit
2017-10-04 22:52:12 +03:00
Dean Herbert
990ef3ca56
Make import tests more resilient to race condition failures
...
Also centralises wait-or-assert logic.
2017-09-27 14:51:01 +08:00
Dean Herbert
bbc990a6fd
Assign a name to individual import tests to avoid file contention
2017-09-27 11:26:56 +08:00
Dean Herbert
1e6c480791
Add back missing tests
2017-09-25 11:58:37 +08:00
Dean Herbert
393aa12eec
Remove old files
2017-09-19 16:06:59 +09:00
Dean Herbert
6d3d485565
And then everything became one
2017-09-19 16:06:58 +09:00
Dean Herbert
fb7740a3ab
Update all dependencies in line with framework
2017-09-13 20:25:40 +09:00
Dean Herbert
7170fbd087
Target .NET 4.6.1
2017-09-11 12:39:00 +09:00
Dean Herbert
e777ccc339
Avoid threading conflicts when resetting the database in unit tests
2017-08-23 14:42:46 +09:00
Dean Herbert
5f53426a9a
*Database -> *Store
...
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
Dean Herbert
cbe7b08642
Make BeatmapStore's BeatmapDatabase private
2017-07-27 15:34:13 +09:00
Dean Herbert
96b08b8777
Simplify and document DatabaseStore API
2017-07-27 15:06:10 +09:00
Dean Herbert
898a601098
Introduce a reference counting file store
2017-07-26 20:22:02 +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
Thomas Müller
96675965d8
Fix broken test case
2017-07-22 12:16:46 +02:00
Dean Herbert
55d999e4a1
Fix comment
2017-07-11 10:45:43 +09:00
Dean Herbert
e9b397f06f
Remove assert which is not always true on some operating systems
2017-07-11 10:41:18 +09:00
Thomas Müller
4134f84559
Increase test timeout to 1 minute
2017-07-10 12:54:11 +03:00
Dean Herbert
41d4aee4f5
Update nuget packages
...
- [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820
2017-06-13 11:50:46 +09:00
John Neijzen
d9a9616125
EOF remove blank spaces
2017-06-08 14:56:03 +08:00
Dean Herbert
0f59645e17
Increase timeout in TestImportOverIPC
...
Has been failing CI randomly, so let's increase the timeout a bit.
2017-05-31 15:51:52 +09:00
Dean Herbert
a2f6d8a3e6
Fix broken test cases, remove some recursive lookup methods.
2017-05-11 19:38:28 +09:00
Huo Yaoyuan
f37c857af8
CI fixes.
2017-05-06 16:06:38 +08:00
Huo Yaoyuan
767cfaaac3
Access database recursively.
2017-05-06 15:37:53 +08:00
Dean Herbert
d06b3c898f
Update framework with new DI changes.
2017-05-02 15:32:47 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset.
2017-04-18 16:05:58 +09:00
smoogipooo
1be1683a4f
Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion
2017-04-18 09:58:39 +09:00
Dean Herbert
4393c2cb25
Add unit tests to ensure all rulesets' beatmaps are added successfully.
2017-04-18 09:46:14 +09:00
smoogipooo
786446354e
Fix post-rebase errors.
2017-04-18 09:00:53 +09:00
smoogipooo
09208adf81
Re-implement legacy hit object conversion.
2017-04-18 08:58:21 +09:00
Dean Herbert
4b6ba565f8
Fix forgotten revert.
2017-04-17 20:10:51 +09:00
Dean Herbert
af13f97435
Fix regressions and test cases.
2017-04-17 19:44:03 +09:00
Dean Herbert
a4e2f34ee7
Make a RulesetDatabase.
2017-04-17 17:43:48 +09:00
Dean Herbert
ce12cc20bd
Merge remote-tracking branch 'upstream/master' into remove-playmode
2017-04-17 13:00:53 +09:00
Adrian Kaz Scherzinger
60f7879875
Explicitly set C# 6.0 for now.
2017-04-16 06:44:08 +09:00
smoogipooo
0a1376c2db
Remove PlayMode game-wide.
2017-04-15 05:22:41 +09:00
smoogipooo
a89af273be
Make BeatmapInfo expose Ruleset instead of PlayMode.
2017-04-15 05:01:36 +09:00
smoogipooo
59bfc7abad
Move statics to RulesetCollection to avoid conflicts later on.
2017-04-15 04:53:37 +09:00
Dean Herbert
c0338a82e7
Update nuget packages.
...
Includes fix in OpenTK for focus issues.
2017-04-12 19:35:16 +09:00
Huo Yaoyuan
411988f038
Remove all trailing whitespaces in this repo.
2017-04-06 16:21:18 +08:00
smoogipooo
4cc309e5a7
Make hit sounds into consts.
2017-04-06 12:14:06 +09:00
smoogipooo
2a16eafe8f
Fix assertions.
2017-04-06 11:54:05 +09:00
smoogipooo
eb82a4c090
Back to using SampleInfo + fix taiko beatmap conversion.
2017-04-06 11:41:16 +09:00
smoogipooo
d607207b69
Ability to contain multiple sample banks. Get default bank name from control point.
2017-04-05 21:59:07 +09:00
smoogipooo
2d8239a3f7
Re-implement the SampleBank/Sample structure. No parsing support yet.
2017-04-05 21:34:28 +09:00
smoogipooo
4b424263ce
Fully parse control points.
2017-04-04 13:13:27 +09:00
smoogipooo
15db37d9e0
Cleanup.
2017-04-03 20:27:25 +09:00
smoogipooo
19b5555ef2
Slightly clean up archive readers + decoders. Read beatmap version into BeatmapInfo.
2017-04-03 20:26:46 +09:00
Dean Herbert
a61cb078e3
Increase timeout on IPC wait.
2017-03-23 17:32:57 +09:00
smoogipooo
e0a8c3b1e5
Rename BaseDifficulty -> Difficulty / BeatmapDifficulty.
2017-03-16 23:18:02 +09:00
smoogipooo
1f43370886
Fix failing unit test, move legacy hitobjects to Objects/Legacy/.
2017-03-14 18:06:32 +09:00
Dean Herbert
ba10c3a8db
Revert "Merge pull request #441 from tacchinotacchi/archive-reader"
...
This reverts commit 6f20473e65c76a495d3d
2017-03-14 11:46:34 +09:00
Huo Yaoyuan
db104d04d3
Use AutoGenerateBindingRedirects instead of explicit app.config.
2017-03-14 03:20:33 +08:00
Alex Amadori
c84a9d56f5
Fix namespace, comply with naming rules
2017-03-13 11:36:21 +01:00
Alex Amadori
caa6e9c82b
General improvements
2017-03-13 11:29:24 +01:00
Alex Amadori
f969c3b7b3
Fix test
2017-03-09 21:00:13 +01:00
Dean Herbert
30de7aa59c
Remove duplicate reference to nunit.
2017-03-09 16:15:33 +09:00
Dean Herbert
5a42035f88
Update license headers.
2017-03-08 15:50:52 +09:00
Dean Herbert
4430255ec4
Merge remote-tracking branch 'upstream/master' into replay
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
# osu.Desktop/OsuGameDesktop.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
# osu.Game/Database/BeatmapDatabase.cs
# osu.Game/Graphics/Cursor/OsuCursorContainer.cs
# osu.Game/IPC/BeatmapImporter.cs
# osu.Game/Modes/Mod.cs
# osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
# osu.Game/Modes/UI/Playfield.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/Screens/Play/PlayerInputManager.cs
2017-03-07 13:50:08 +09:00
Dean Herbert
1751532a01
Fix a few regressions.
2017-03-07 13:30:36 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings.
2017-03-07 13:05:57 +09:00
Dean Herbert
aa9d85624d
Change IPC to make sense.
2017-03-04 18:51:16 +09:00
Mikal Stodal
866dbf0b1d
Added new test
...
When file is in use, we expect it to presist removal, in other words, fail to delete.
2017-03-02 15:24:12 +01:00
Mikal Stodal
7e72911d3a
Update tests
2017-02-28 14:36:11 +01:00
Dean Herbert
a22216d0b0
Update nuget packages.
2017-02-27 20:38:30 +09:00
Dean Herbert
686372a7f9
Update with framework structural changes.
2017-02-26 20:54:32 +09:00
Thomas Müller
6a67ffa5b3
Attempt to fix failing beatmap import test case
2017-02-25 08:31:29 +01:00
Dean Herbert
9067907789
Better assertions.
2017-02-25 11:55:30 +09:00
Dean Herbert
fdf5867a1a
Add more informative asserts in unit tests.
2017-02-25 11:46:04 +09:00
Dean Herbert
3a89348413
Centralise access to WorkingBeatmaps.
...
They can now only be instantiated from BeatmapDatabase and are abstract (to avoid misuse).
2017-02-24 13:43:21 +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
da2bfe6d3c
Framework updates.
2017-02-23 16:42:12 +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
Dean Herbert
f207da6041
Add/update license headers.
2017-02-14 18:17:35 +09:00
Dean Herbert
11643d2e09
Remove unnecessary methods and local variables.
2017-02-13 18:30:51 +09:00
John Leuenhagen
7ad9cd6b6e
add explicit false values to prevent warnings as errors
2017-02-12 02:32:11 -05:00
柯十六夜
acfbf2e32e
Add prefix Online to BeatmapID and BeatmapSetID
2017-01-09 21:05:01 +08:00
Dean Herbert
40ea6e0d72
Fix incorrect folder name.
2016-12-08 21:36:34 +09:00
Dean Herbert
027d71ffd8
Fix unit tests failing.
2016-11-21 12:34:03 +09:00
Dean Herbert
da1f6eeab5
Circle -> HitCircle.
2016-11-16 16:16:45 +09:00
Dean Herbert
d3f810f72f
Introduce concept of HitObjectParsers, fix tests and stop using reflection (unreliable due to lazy loading).
2016-11-14 22:03:39 +09:00
Dean Herbert
4590be552f
Move play modes to their own projects.
2016-11-14 18:54:24 +09:00
Dean Herbert
06f4f93918
Move play modes to Modes namespace.
2016-11-14 18:03:20 +09:00
Dean Herbert
0f4538f69f
Rename GameModes namespace to Screens.
2016-11-14 17:23:33 +09:00
Drew DeVault
19fd6fe249
Introduce dependency injection
2016-11-10 16:38:25 -05:00
Thomas Müller
32ee20b843
Merge branch 'master' of github.com:ppy/osu into better-clocks
...
# Conflicts:
# osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
2016-11-06 10:08:24 +01:00
Thomas Müller
a6c0fd29f2
Make use of new timing system in Drawables and Transforms.
2016-11-06 08:25:21 +01:00
Dean Herbert
cc140c9634
Fix broken tests.
2016-11-05 22:48:32 +09:00
Dean Herbert
a11d534067
Add beatmap backgrounds.
2016-11-05 20:00:14 +09:00
Dean Herbert
7a54fdfffb
Fix ImportBeatmapTest.
2016-11-03 16:59:16 +09:00
Dean Herbert
f156ac25be
Fix nunit hint path.
2016-10-29 04:17:56 +09:00
Dean Herbert
5ce102b36c
Fix outdated test attributes.
2016-10-28 16:09:55 +09:00
Drew DeVault
fd867b2eb7
Fix use of obsolete NUnit attribute
2016-10-26 10:37:36 -04:00
Drew DeVault
157512b45f
Merge branch 'master' into song-select
2016-10-26 10:37:18 -04:00
Dean Herbert
3f23900347
Framework & OpenTK updates.
2016-10-26 23:13:44 +09:00
Drew DeVault
ddfa457ad3
Fix up sqlite
2016-10-25 19:39:09 -04:00
Drew DeVault
cea660dce5
Fix up JSON reference
2016-10-24 15:02:13 -04:00
Drew DeVault
d559903ebc
Fix busted test project
2016-10-24 11:41:14 -04:00
Dean Herbert
d3a857edb9
Make importing work properly.
...
Moves import code to BeatmapDatabase.
2016-10-24 11:39:53 -04:00
Dean Herbert
6cc5407348
Fix path not being local enough for some unit tests.
2016-10-25 00:27:47 +09:00
Dean Herbert
1ce16afa23
Update nuget package versions.
2016-10-24 22:46:44 +09:00
Drew DeVault
449f04c07b
Refactor the database code
2016-10-18 13:38:27 -04:00
John Leuenhagen
fedfb8a22a
Converted all .cs files to use CRLF line endings.
2016-10-13 23:33:58 -04:00
Drew DeVault
25d08c8e2c
Improve beatmap loading and hydration
2016-10-13 10:29:30 -04:00
Drew DeVault
dd86e75ea7
Minor fixes
2016-10-13 12:19:06 +09:00
Drew DeVault
2f8fbee364
Moved test osz file into osu-resources
2016-10-13 12:18:29 +09:00
Drew DeVault
c39179d299
Add test for hit objects
2016-10-13 12:17:40 +09:00
Drew DeVault
7a4501323b
Decode beatmap colours
2016-10-13 12:17:35 +09:00
Drew DeVault
c0022f3515
Add more tests for legacy decoder
2016-10-13 12:17:31 +09:00
Drew DeVault
34b24e1399
Use embedded resources for test assets
2016-10-13 12:17:23 +09:00
Drew DeVault
9b4bc3e36d
Implement most of the legacy beatmap decoder
...
Missing timing points, events, and hit object decoders remain to be
written
2016-10-13 12:17:03 +09:00
Drew DeVault
32ab8f97bb
Add more decoding (including full BeatmapMetadata)
2016-10-13 12:16:58 +09:00
Drew DeVault
2a3f047895
Start implementing legacy decoder
2016-10-13 12:16:48 +09:00
