RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,315 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

263 Commits

Author SHA1 Message Date
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
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
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
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
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
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 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
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
EVAST9919 d301ad1435 Add supporter icon to the user panel 2017-11-16 20:06:49 +03: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