1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-09 09:20:05 +08:00
Commit Graph

249 Commits

Author SHA1 Message Date
Shivam
c167727ac6 Merge branch 'master' into tourney-asset-refactor
# Conflicts:
#	osu.Game/IO/OsuStorage.cs
2020-08-09 12:38:41 +02:00
dependabot-preview[bot]
8087a75c35
Bump NUnit3TestAdapter from 3.15.1 to 3.17.0
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.15.1 to 3.17.0.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.15.1...V3.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-13 17:22:39 +00:00
Shivam
0cddb85f1b Move storageconfig set and saving to migrate method 2020-06-28 15:27:50 +02:00
Shivam
9639ebdd97 Merge branch 'master' into tourney-asset-refactor 2020-06-28 15:06:34 +02:00
Shivam
d82d901542 Reuse custom_tournament where it was still used as a literal 2020-06-25 20:36:55 +02:00
Dean Herbert
5fd6246d1b Fix remaining test scenes 2020-06-24 17:57:07 +09:00
Dean Herbert
eb3e1b2b26 Fix incorrect inheritance on remaining test scene 2020-06-24 17:03:22 +09:00
Dean Herbert
1387a9e2c6 Move all tournament tests to using placeholder data rather than reading from bracket 2020-06-24 16:57:17 +09:00
Shivam
839f197111 Change type from TournamentStorage to Storage in tests 2020-06-24 02:37:59 +02:00
Shivam
0ca8c961c8 Remove string interpolation & unnecessary test setup 2020-06-24 00:05:30 +02:00
Shivam
08759da3a7 Move drawings.ini out of config subfolder 2020-06-22 12:41:43 +02:00
Shivam
eec1e9ef4d Remove unnecessary comments and added file check for tournament.ini on test start 2020-06-22 12:22:59 +02:00
Shivam
291dadf0b2 Merge branch 'master' of https://github.com/ppy/osu into tourney-asset-refactor 2020-06-22 12:01:24 +02:00
Bartłomiej Dach
586d5791e0 Remove unused argument 2020-06-13 15:07:41 +02:00
Bartłomiej Dach
5f79feaa8b Merge branch 'master' into custom-ipc-location 2020-06-13 13:41:59 +02:00
Dean Herbert
5ef3a3f188
Merge branch 'master' into tourney-asset-refactor 2020-06-12 11:23:05 +09:00
Shivam
56a40e616b Add drawings to the migration test 2020-06-11 20:11:44 +02:00
Shivam
222ac86304 Add newlines at the end of the file 2020-06-11 15:52:14 +02:00
Shivam
603054f521 Remove unused property and reuse tournamentBasePath 2020-06-11 15:47:21 +02:00
Shivam
883185d349 Add a comment to describe what's going on before the headless game starts 2020-06-11 15:18:21 +02:00
Shivam
18a9e5a0a6 Add NonVisual tests for custom tournaments
Can test the default directory from a clean instance, it can test a custom directory and can execute migration from an instance using the older directory setup.
2020-06-11 13:57:29 +02:00
smoogipoo
f3b5149648 Move some suggestions to warnings, resolve issues 2020-06-03 16:48:44 +09:00
Shivam
3731e76b10 Move stable_config declaration, rename testscene 2020-05-28 15:28:27 +02:00
Shivam
4c3900cfc8 Remove unnecessary comments, simplify initialPath and clarified TestScene name 2020-05-25 17:16:40 +02:00
Shivam
c6345ba6c9 corrected styling issues 2020-05-22 20:01:26 +02:00
Shivam
0717dab8e4 Add StablePathSelectScreen visual test 2020-05-22 19:51:08 +02:00
Shivam
d1f39b6b00
Merge branch 'master' into tourney-subscreen-back-button 2020-05-16 12:51:30 +02:00
Shivam
358345cee7 Change logic for parentscreen/subscreen relation 2020-05-16 12:50:56 +02:00
smoogipoo
648999a2de Remove all RequiredTypes usages 2020-05-16 18:17:12 +09:00
dependabot-preview[bot]
03863d901b
Bump Microsoft.NET.Test.Sdk from 16.5.0 to 16.6.1
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.5.0 to 16.6.1.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.5.0...v16.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-27 08:59:09 +00:00
smoogipoo
754d0ca14d Fix crashes due to ladder re-use 2020-03-23 10:28:17 +09:00
Dean Herbert
336d927157 Update tests to not use positional data (nunit runs at an incompatible window size) 2020-03-18 15:38:19 +09:00
Dean Herbert
2ca225877f Merge branch 'master' into tournament-mappool-flow-logic 2020-03-18 15:05:20 +09:00
Dean Herbert
8895d52d29 Fix header-text scaling on intro/winner screens 2020-03-17 13:16:18 +09:00
Dean Herbert
00d7dc19cc Update tests and logic 2020-03-13 14:25:58 +09:00
Dean Herbert
fbb7e9f12a Add tests (wip) 2020-03-13 14:25:58 +09:00
Dean Herbert
ec1c6f88ee Adjust metrics to align logo pieces correctly on gameplay / map pool 2020-03-12 14:27:56 +09:00
Dean Herbert
b6b802e821 Add back customisable header logo/text
Also adds test scene for MatchHeader component.
2020-03-12 14:27:56 +09:00
Dean Herbert
e158cbfe24
Merge branch 'master' into tournament-design-schedule 2020-03-10 09:40:08 +09:00
Dean Herbert
48c46efdd7 Remove rogue newline 2020-03-09 15:09:34 +09:00
Dean Herbert
8b0b910196 Update song / chat / beatmap info display to reflect new design 2020-03-08 18:25:22 +09:00
Dean Herbert
8e4b15aaa5 Update test scene 2020-03-08 17:43:55 +09:00
Dean Herbert
434feb5ac6 Fix alignment on schedule screen 2020-03-08 16:01:41 +09:00
Dean Herbert
9bd837da41 Update match score display 2020-03-08 15:55:54 +09:00
Dean Herbert
86b12a384b Initial pass of gameplay screen design update 2020-03-08 15:55:54 +09:00
Dean Herbert
1c5d6e0cf4 Split out nested classes to higher level for better code sharing 2020-03-08 15:34:45 +09:00
Dan Balasescu
5eeed3faa1
Merge branch 'master' into owc-2019 2020-03-04 16:27:46 +09:00
Dean Herbert
003aeeb052 Add test scene for seedings editor 2020-03-04 13:26:25 +09:00
Dean Herbert
b6edd17242 Fix TeamWin test scene 2020-03-03 19:20:42 +09:00
Dean Herbert
093f2affdf Add seeding screen 2020-03-03 19:19:03 +09:00
dependabot-preview[bot]
48781e5685 Bump Microsoft.NET.Test.Sdk from 16.4.0 to 16.5.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.4.0 to 16.5.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.4.0...v16.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-10 08:24:12 +00:00
smoogipoo
91735ff367 Update MathUtils namespace usages 2020-01-09 13:43:44 +09:00
smoogipoo
2688a855a0 Downgrade NUnit to fix discovery issues 2020-01-08 14:14:46 +09:00
dependabot-preview[bot]
f91637e7b6
Bump NUnit3TestAdapter from 3.15.1 to 3.16.0
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.15.1 to 3.16.0.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.15.1...V3.16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-06 07:41:37 +00:00
Huo Yaoyuan
351e826120 Upgrade project targets to netcoreapp3.1 2019-12-20 17:03:54 +08:00
Huo Yaoyuan
e9b8cbb516 Apply other styles. 2019-11-11 20:27:04 +08:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
Dean Herbert
c280f1ab08 Fix incorrect DI usage in some tournament screen tests 2019-11-08 19:35:55 +09:00
dependabot-preview[bot]
f2084df0bb
Bump Microsoft.NET.Test.Sdk from 16.3.0 to 16.4.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.3.0 to 16.4.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.3...v16.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-07 06:19:49 +00:00
Dean Herbert
5d6648d9c9 Update 2.2 references 2019-10-10 17:45:38 +09:00
Dean Herbert
3b52e7c724 Add boilerplate logic 2019-09-23 03:17:14 +09:00
dependabot-preview[bot]
f10b390ca0
Bump Microsoft.NET.Test.Sdk from 16.2.0 to 16.3.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.2.0 to 16.3.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.2.0...v16.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-19 16:32:39 +00:00
dependabot-preview[bot]
2876588193
Bump NUnit3TestAdapter from 3.15.0 to 3.15.1
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.15.0 to 3.15.1.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.15...V3.15.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 13:36:31 +00:00
dependabot-preview[bot]
72a644996c
Bump NUnit3TestAdapter from 3.14.0 to 3.15.0
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.14.0 to 3.15.0.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.14...V3.15)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-23 13:41:27 +00:00
dependabot-preview[bot]
58e98e53d2
Bump NUnit3TestAdapter from 3.13.0 to 3.14.0
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.13.0 to 3.14.0.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.13...V3.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-09 03:58:06 +00:00
Dean Herbert
62f6958165 Fix tournament tests not running 2019-07-30 07:23:25 +09:00
Roman Kapustin
bf41fd5d9d Update package references 2019-07-06 23:29:35 +03:00
smoogipoo
12323c87ae Add VSCode debug configs 2019-06-21 15:00:48 +09:00
Dean Herbert
c31713078f Ensure enough room for control panel display in editor tests 2019-06-18 15:44:07 +09:00
Dean Herbert
926a11ab8c Group, rename and standardise tests 2019-06-18 15:28:36 +09:00
Dean Herbert
fa61b08a05 Mark LadderTestScene abstract 2019-06-18 15:20:28 +09:00
Dean Herbert
3db6913a9c Rename editor screens removing plurals 2019-06-18 15:15:28 +09:00
Dean Herbert
7652339dc0 Remove test file 2019-06-18 15:07:33 +09:00
Dean Herbert
21138e6e2c Fix mismatching filenames 2019-06-18 15:05:55 +09:00
Dean Herbert
da20904a57 MatchPairing -> TournamentMatch 2019-06-18 14:57:05 +09:00
Dean Herbert
96e24ebd20 General namespace tidy-up 2019-06-18 14:51:48 +09:00
Dean Herbert
4f5abeb79f Grouping -> Round 2019-06-18 14:44:15 +09:00
Dean Herbert
796afc0bf9 Rename and expand chat tests 2019-06-18 14:03:09 +09:00
Dean Herbert
93fc14426b Convert TournamentTeam props to use binadbles 2019-06-17 19:11:57 +09:00
Dean Herbert
e58d259498 Create wireframe for team editor 2019-06-17 19:11:57 +09:00
Dean Herbert
d4ff9dc833 TestCase -> TestScene 2019-06-14 20:32:23 +09:00
Dean Herbert
4cd6955a96 Fix GameplayScreen test not working 2019-06-14 20:32:23 +09:00
Dean Herbert
1eb15c39f9 Fix tests not working 2019-06-14 20:32:23 +09:00
Dean Herbert
bc46253299 Update test case naming 2019-05-18 20:18:07 +09:00
Dean Herbert
e93fea7dc3 Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-05-18 19:20:44 +09:00
Dean Herbert
1ef2a4c46f Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-04-03 16:23:33 +09:00
Dean Herbert
cf63ee4948 Update licence headers 2019-03-04 13:24:19 +09:00
Dean Herbert
f183210362 Fix test bindables 2019-03-02 13:50:43 +09:00
Dean Herbert
ef321b4103 Fix regressed test 2019-02-17 19:48:58 +09:00
Dean Herbert
f0743ebecf Merge remote-tracking branch 'upstream/master' into tournament-tools
# Conflicts:
#	osu.Game.Tournament.Tests/TestCaseDrawings.cs
#	osu.Game/osu.Game.csproj
2019-02-17 17:25:09 +09:00
Dean Herbert
482a01e7ba Merge branch 'master' into tournament-tools
# Conflicts:
#	osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
#	osu.Game/OsuGameBase.cs
#	osu.Game/Overlays/ChatOverlay.cs
#	osu.Game/Screens/Menu/MainMenu.cs
#	osu.Game/Screens/Tournament/Drawings.cs
#	osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
2019-02-02 19:09:48 +09:00
Dean Herbert
f91d2e2e07 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-22 10:25:30 +09:00
Dean Herbert
c1e3c4d435 Make chat tests work again, clear old messages 2018-11-17 10:40:44 +09:00
Dean Herbert
4b74105ad9 Fix code sanity issues 2018-11-16 20:34:51 +09:00
Dean Herbert
cf0976955b Expose groupings editor 2018-11-16 20:30:12 +09:00
Dean Herbert
67bb428aef Move editing functionality to its own screen 2018-11-16 20:16:18 +09:00
Dean Herbert
1ab4713ef6 Add tournament chat display 2018-11-16 15:30:19 +09:00
Dean Herbert
46e163ec5e Add score display 2018-11-15 21:28:42 +09:00
Dean Herbert
be3904b647 Add win screen 2018-11-11 10:39:04 +09:00
Dean Herbert
eabcef3e12 Add schedule screen 2018-11-11 10:13:17 +09:00
Dean Herbert
9064f3fe0f Fix ladder manager not saving changes out correctly 2018-11-09 17:39:46 +09:00
Dean Herbert
5c84c3c0a8 Add support for picks and bans 2018-11-08 06:29:04 +09:00
Dean Herbert
a0d64c1b13 Add ability to select current match 2018-11-07 01:24:35 +09:00
Dean Herbert
53ec01d51f Perform mappings earlier in execution 2018-11-06 20:18:11 +09:00
Dean Herbert
4e87288049 Add the concept of "current match" 2018-11-06 20:13:04 +09:00
Dean Herbert
ca9df94ea2 Add skeleton for gameplay screen 2018-11-06 19:27:10 +09:00
Dean Herbert
afb3b38098 Fix regression in testing logic 2018-11-06 18:32:59 +09:00
Dean Herbert
5a4292717f Allow tests to run custom game 2018-11-06 17:59:01 +09:00
Dean Herbert
6f25548737 Remove now unnecessary null setters 2018-11-06 14:49:20 +09:00
Dean Herbert
9c5eddea54 Allow running tournament tools from main executable 2018-11-06 14:49:09 +09:00
Dean Herbert
43c70d354d Merge tag '2018.1105.0' into tournament-tools 2018-11-06 00:35:21 +09:00
Dean Herbert
fb93aea909 Use logo-less video by default 2018-11-05 23:15:30 +09:00
Dean Herbert
7e092c6084 Read videos from storage 2018-11-04 21:15:06 +09:00
Dean Herbert
54a02ee2d7 Add showcase screen 2018-11-04 07:12:07 +09:00
Dean Herbert
97b32a72f5 Read and write bracket from storage instead of arbitrary location 2018-11-04 04:59:11 +09:00
Dean Herbert
a918e83b1e Add drawings screen 2018-11-04 04:58:59 +09:00
Dean Herbert
5568e9ff8a Reduce test case crashes when missing data is present 2018-10-25 01:31:24 +09:00
Dean Herbert
12c0b2c37d Add test videos and adjust alignment to match 2018-10-18 02:18:09 +09:00
Dean Herbert
143d9d54f9 Add basic scene manager 2018-10-16 18:02:47 +09:00
Dean Herbert
216de3c53d Don't cache manager 2018-10-16 17:34:58 +09:00
Dean Herbert
dfaff3aaed Fix filename mismatch 2018-10-16 15:45:41 +09:00
Dean Herbert
f324072d44 Make map pool layout more correct 2018-10-16 15:25:56 +09:00
Dean Herbert
3a5af47ee8 Populate beatmaps with api information when not present 2018-10-16 15:20:12 +09:00
Dean Herbert
61083190d0 Add WIP map pool testcase 2018-10-14 18:09:22 +09:00
Dean Herbert
63fbe4e946 Add map pool beatmaps to groupings 2018-10-14 18:00:28 +09:00
Dean Herbert
0c4ea4beb1 Allow dynamic recompilation of beatmap panel testcase 2018-10-14 05:20:10 +09:00
Dean Herbert
a02caeef64 Add team intro screen
Also adds dates to groups and matches (must be manually populated via json)
2018-10-14 05:19:50 +09:00
Dean Herbert
b17ead22a3 fixup! Fix incorrect access definitions 2018-10-14 03:05:34 +09:00
Dean Herbert
e136f72c8e Fix incorrect access definitions 2018-10-14 03:03:17 +09:00
Dean Herbert
f5716c3d21 Add ability to change best of, add and delete groupings 2018-10-14 01:03:04 +09:00
Dean Herbert
522f106f74 Add initial version of beatmap card 2018-10-14 00:41:10 +09:00
Dean Herbert
2173f46a46 Add missing licence header 2018-10-13 19:45:59 +09:00
Dean Herbert
a4bb4255b1 Add grouping manager 2018-10-13 07:10:13 +09:00
Dean Herbert
c26d226a75 Make saving the ladder to disk a button-based operation rather than on dispose 2018-10-13 07:09:33 +09:00
Dean Herbert
77055f6d5c Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-10-12 18:49:47 +09:00
Dean Herbert
991d85a9f3 Cleanups 2018-09-25 10:30:04 +09:00
Dean Herbert
baefcb9deb Simplify team storage 2018-09-25 03:14:30 +09:00
Dean Herbert
2f2dcec8c7 Complete editing support 2018-09-22 06:32:30 +09:00
Dean Herbert
f2f4e964c5 Add deletion support 2018-09-21 19:58:47 +09:00
Dean Herbert
0076ef3447 Fix layout in MatchPairing test case 2018-09-21 18:52:00 +09:00
Dean Herbert
ffadd5dfd0 Improve join request visual guide 2018-09-21 18:51:37 +09:00
Dean Herbert
74014bec40 wip 2018-09-21 18:18:28 +09:00
Dean Herbert
ff125f4c71 Reduce noise in json output and handle the case the file doesn't exist 2018-09-21 18:18:28 +09:00
Dean Herbert
234b04dfc5 Add basic ladder manager and state retention 2018-09-21 18:18:28 +09:00
Dean Herbert
e4ea802c7b Add user interaction and stricter change validation rules 2018-09-21 18:18:28 +09:00
Dean Herbert
bfc5ccd6d0 Add winners and progressions 2018-09-21 18:18:28 +09:00
Dean Herbert
3d3a7f714d Move and use shared components 2018-09-21 18:18:28 +09:00
Dean Herbert
40b01ec35a Add basic match pairing component for ladder display 2018-09-21 18:18:28 +09:00
Dean Herbert
51dcfeee92 Move existing tournament resources to new project 2018-09-21 18:18:28 +09:00