1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 04:13:00 +08:00
Commit Graph

394 Commits

Author SHA1 Message Date
smoogipoo
e5ebd21156 Fix test scene and add pooling support 2020-07-29 16:25:17 +09:00
smoogipoo
f044c06d08 Fix hold notes accepting presses during release lenience 2020-07-20 22:26:58 +09:00
smoogipoo
03a7b8a6ef Rename 2020-07-16 21:18:24 +09:00
smoogipoo
18d3685023 Pass in content 2020-07-16 21:17:51 +09:00
smoogipoo
b09c584d91 Add test 2020-07-16 17:42:37 +09: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
mcendu
5c2959eeb6
allow lookup of stage decoration paths and add test images 2020-07-05 13:02:50 +08:00
Bartłomiej Dach
5e92809401 Add failing test case 2020-06-27 16:46:43 +02:00
Bartłomiej Dach
c47f762f24 Update test scene to allow checking samples 2020-06-27 16:45:39 +02:00
Bartłomiej Dach
c7d2ce12eb Add failing test cases 2020-06-22 20:08:32 +02:00
Dan Balasescu
904b688b4b
Merge branch 'master' into test-scene-create-ruleset 2020-06-15 16:40:02 +09:00
mcendu
aa476835e7 tidy up code 2020-06-13 11:31:34 +08:00
mcendu
a42bfcb5ab remove reference to stage bottom from skin ini 2020-06-12 23:23:57 +08:00
mcendu
da46288ef0 remove stage bottom image 2020-06-12 23:20:04 +08:00
mcendu
7def6a9181 fix tests incorrectly showing judgements not present in mania 2020-06-12 23:06:19 +08:00
mcendu
8a9d011197 add test files 2020-06-12 22:09:58 +08:00
Dean Herbert
0b6e8783d4
Merge branch 'master' into test-scene-create-ruleset 2020-06-12 17:06:27 +09:00
Bartłomiej Dach
4c6116e6e7 Fix compilation failure in Android test project 2020-06-04 23:50:58 +02:00
Bartłomiej Dach
35544ede50 Add failing test cases 2020-06-04 22:33:30 +02:00
Bartłomiej Dach
6b88141e58 Add mania sample conversion test 2020-06-04 21:53:37 +02:00
Salman Ahmed
741fa20149
Use CreateRuleset() for editor test scenes as well 2020-06-04 00:47:10 +03:00
Salman Ahmed
84b40ea2c6
Merge remote-tracking branch 'upstream/master' into test-scene-create-ruleset
# Conflicts:
#	osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
#	osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
#	osu.Game/Tests/Visual/ModTestScene.cs
#	osu.Game/Tests/Visual/OsuTestScene.cs
2020-06-03 22:00:02 +03:00
Dan Balasescu
64d1b4b11b
Merge branch 'master' into move-setter-to-duration 2020-06-01 15:55:48 +09:00
Dean Herbert
e43217f579 Add test resources 2020-05-31 20:01:13 +09:00
Dean Herbert
e8b43e8e1f Merge branch 'master' into move-setter-to-duration 2020-05-29 16:04:23 +09:00
Dean Herbert
6be5917eb0 Remove necessity for custom mania interface caching 2020-05-27 23:15:16 +09:00
Dean Herbert
cbd563e80b Rename to IHasDuration 2020-05-27 12:38:39 +09:00
Dean Herbert
e7442ec3a2 Remove need for ManiaSnapResult 2020-05-25 19:33:03 +09:00
Dean Herbert
9a2889abc5 Remove remaining left-over test implementations 2020-05-22 11:32:35 +09:00
Dean Herbert
6de2597958 Merge branch 'editor-position-snap' into mania-distance-snap-grid 2020-05-22 11:27:36 +09:00
Dean Herbert
0db1ea6a9d Fix failing tests 2020-05-21 15:47:12 +09:00
Dean Herbert
bac78707de Move more logic to column to both clean things up and fix tests 2020-05-21 14:25:37 +09:00
Dean Herbert
5ad7842b91 Move ScreenSpacePositionAtTime to inside Column implementation 2020-05-21 13:33:02 +09:00
Dean Herbert
922b793a5a Update hit object composer tests 2020-05-21 13:04:35 +09:00
Dean Herbert
94bb59db0d Merge branch 'editor-position-snap' into mania-distance-snap-grid 2020-05-21 12:50:49 +09:00
Dean Herbert
69db62b78a Combine implementation of time-to-position lookup 2020-05-20 21:42:21 +09:00
Dean Herbert
0bc3073d49 Fix test failures 2020-05-20 15:01:32 +09:00
Dean Herbert
406f39e8bf Construct online visible lines 2020-05-18 21:27:26 +09:00
Dean Herbert
32dd00cb17
Merge branch 'master' into mania-distance-snap-grid 2020-05-16 18:55:48 +09:00
smoogipoo
648999a2de Remove all RequiredTypes usages 2020-05-16 18:17:12 +09:00
smoogipoo
16585f767e Add initial beat snap grid implementation 2020-05-14 19:17:24 +09:00
smoogipoo
0ef3bae26a Expose playfield from IManiaHitObjectComposer 2020-05-14 18:34:51 +09:00
Dan Balasescu
2f12c4126a
Apply suggestions from code review
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-05-10 13:49:08 +09:00
smoogipoo
d67facf8e4 Add test scene 2020-05-08 18:50:06 +09:00
smoogipoo
7868c0dad5 Fix test case failures 2020-04-28 20:15:56 +09:00
smoogipoo
db12fafc2c Update comment 2020-04-28 18:58:29 +09:00
smoogipoo
7d54d4b800 Improve test scene 2020-04-28 18:36:10 +09:00
smoogipoo
3eb7c8755c Cleanup 2020-04-28 15:34:41 +09:00
smoogipoo
d905ef53b3 Add test scene for mania composer 2020-04-28 15:33:01 +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
Salman Ahmed
227503c0af
Merge remote-tracking branch 'upstream/master' into test-scene-create-ruleset 2020-04-23 16:25:33 +03:00
Salman Ahmed
2fa47992dc
Seal the ruleset creation methods and let abstract method take their place
Also makes `CreatePlayerRuleset()` and `CreateRulesetForSkinProvider()` not-null to avoid unwanted behaviour with their derivers
2020-04-23 13:27:12 +03:00
smoogipoo
c59096a941 Fix note placement 2020-04-23 12:36:40 +09:00
smoogipoo
4642a6093c Add test 2020-04-21 17:15:13 +09:00
Salman Ahmed
fc6c245de5 Replace all judged event logic with HasCompleted bindable 2020-04-19 05:36:04 +03:00
Salman Ahmed
155bc8b49a Remove ModTestScene ruleset parameter on constructor and use CreateRuleset instead 2020-04-17 11:17:59 +03:00
Salman Ahmed
92df4e3a9e Remove PlayerTestScene constructor and use CreateRuleset method instead 2020-04-17 11:17:51 +03:00
Salman Ahmed
5fa6bcb5a3 Move SkinnableTestScene into using the global CreateRuleset method 2020-04-17 11:17:44 +03:00
Dean Herbert
7f95418262 Fix osu!mania replays actuating incorrect keys when multiple stages are involved 2020-04-14 16:52:17 +09:00
Dean Herbert
cb6372acac
Merge branch 'master' into mania-stage-background-skinning 2020-04-09 15:37:48 +09:00
smoogipoo
d13231eff7 Use ctor for default width 2020-04-08 18:23:24 +09:00
Dean Herbert
e6b87656ba Fix TestSceneColumn columns not getting a width 2020-04-08 18:04:53 +09:00
smoogipoo
83db6cebb6 Implement bottom stage image 2020-04-08 16:20:54 +09:00
smoogipoo
e429c274a9 Initial structure 2020-04-08 15:35:37 +09:00
Dean Herbert
3794b55eef Rename ManiaStage to Stage 2020-04-08 14:13:31 +09:00
Dean Herbert
9071bf5cbb Fix mania test scene not using mania skinnable test scene 2020-04-07 16:20:13 +09:00
Dean Herbert
0a340bac5a Ensure the correct (up-to-date) ruleset is retrieved 2020-04-07 16:20:13 +09:00
Dean Herbert
2c840c52a3 Add skinnable test scene per ruleset to better allow dynamic compilation 2020-04-07 16:20:13 +09:00
smoogipoo
1f797207f7 Rework lookups to not require total playfield columns 2020-04-03 12:31:05 +09:00
Dan Balasescu
0f5fd8051c
Merge branch 'master' into mania-hitexplosion-skinning 2020-04-02 23:08:31 +09:00
smoogipoo
9552319732 Fix hold note animation not being reset 2020-04-02 17:09:08 +09:00
smoogipoo
63708532a1 Remove frozen clock from test scenes 2020-04-02 16:36:57 +09:00
smoogipoo
09eb9facdd Add column to test scene 2020-04-02 14:37:29 +09:00
smoogipoo
94031b57ea Split hit explosion positioning from column 2020-04-02 14:37:29 +09:00
smoogipoo
aac7709640 Add stage test scene 2020-04-01 13:31:25 +09:00
smoogipoo
c10a91a33e Add odd/even type to test scenes 2020-04-01 12:04:33 +09:00
mcendu
c9a81e7f71 Merge branch 'column-type3' into mania-skinning-refactor 2020-03-31 22:33:27 +08:00
smoogipoo
c4f76ffdaf Implement mania note skinning 2020-03-31 15:29:25 +09:00
smoogipoo
211a8db4c5 Merge branch 'mania-key-area-skinning' into mania-note-skinning 2020-03-31 15:23:59 +09:00
smoogipoo
538dc0c558 Merge branch 'mania-hitobject-area-skinning' into mania-note-skinning 2020-03-31 15:20:56 +09:00
mcendu
275f96791d
add regression tests 2020-03-31 13:57:37 +08:00
smoogipoo
02237133cb Implement mania hit target skinning 2020-03-31 12:17:44 +09:00
smoogipoo
cb1513b374 Add mania key area skinning 2020-03-31 11:23:33 +09:00
smoogipoo
44727eb2b8 Implement column background skinning 2020-03-31 10:57:56 +09:00
smoogipoo
bd87a4cde8 Re-namespace testscene 2020-03-30 23:21:40 +09:00
smoogipoo
655fab6a97 Add mania skinnable test helpers 2020-03-30 23:21:40 +09:00
Dean Herbert
232c255986 Basic test scene setup 2020-03-23 17:33:02 +09:00
Dean Herbert
0be423183d Rename data class 2020-03-11 00:36:56 +09:00
smoogipoo
d11d29c1f7 Adjust namespaces 2020-03-03 15:30:53 +09:00
smoogipoo
6d939e9d41 Add failing test scenes 2020-03-02 12:42:48 +09:00
smoogipoo
239cfddcbb Improve test scenes/cases 2020-03-02 10:50:41 +09:00
smoogipoo
a02c5710ac Rename base class 2020-03-02 10:06:49 +09:00
voidedWarranties
089ec4c792 Test scene for mod development 2020-02-29 21:16:28 -08:00
mcendu
f7f8622436 make TestSceneDrawableJudgement use scene from osu.Game.Tests 2020-02-17 15:42:52 +08: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
Dean Herbert
3a5015d013
Merge branch 'master' into fix-hold-note-input 2019-12-27 21:48:38 +09:00
mcendu
64381bf4b1
rm unnecessary usings 2019-12-26 22:08:46 +08:00
mcendu
75d1e4cc76
rm TestLegacySkin 2019-12-26 22:06:29 +08:00
mcendu
8ebfe5cfd8
add tests 2019-12-26 21:15:49 +08:00
smoogipoo
d5288760a7 Fix test text 2019-12-23 18:50:18 +09:00
smoogipoo
7bb4a08f10 Add failing tests 2019-12-23 18:47:58 +09:00
smoogipoo
78b30a076f Add mania player test scene 2019-12-23 17:48:57 +09:00
Dean Herbert
492a910671 Update missed launch configurations 2019-12-20 19:08:05 +09:00
Huo Yaoyuan
351e826120 Upgrade project targets to netcoreapp3.1 2019-12-20 17:03:54 +08:00
Dean Herbert
709ec1404f Centralise End/StartTime retrieval to extension method 2019-11-25 19:09:14 +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
179cde917b
Merge branch 'master' into rework-selection-updates 2019-10-06 15:00:56 +08:00
smoogipoo
2d0c522398 Remove unused method 2019-10-03 18:43:46 +09:00
smoogipoo
ee34c5ccb4 Add a flip step to mania placement test scenes 2019-10-03 18:40:48 +09:00
smoogipoo
a310c4b65f Make selection blueprints a bit more testable 2019-10-01 19:32:47 +09:00
Bartłomiej Dach
8efab559c8 Remove unused using directives 2019-09-25 01:13:42 +02:00
Bartłomiej Dach
56b460365b Add bar line anchoring checks in mania test stage
Add steps checking bar line anchoring in the mania Stage visual test
to reproduce the regression in #6215 and prevent it from happening in
the future.
2019-09-24 20:34:09 +02: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
Dean Herbert
381daffe52 Generate better temporary frames to support framed handling flaws 2019-09-18 16:09:48 +09:00
Dean Herbert
2db1e236a7 Fix frame count dependent tests regressing 2019-09-18 14:08:09 +09:00
Bartłomiej Dach
a407e267a2 Fix PF/SD legacy mod conversion
Upon investigating an user report in #6091 that indicated that viewing
replays using the Perfect mod would also display the Sudden Death mod
icon despite Perfect being the more restrictive of the two, it turned
out that the logic of importing legacy scores was missing that corner
case. A similar case of Double Time/Nightcore mutual exclusion was
handled, but PF/SD was missed.

Add analogous handling of PF/SD legacy mods for all four rulesets,
and additionally cover a tiny fraction of all cases with unit tests.
The most problematic cases (NC+HD and PF+SD) are covered in all four
basic rulesets.
2019-09-15 22:55:25 +02:00
smoogipoo
b941f12688 Cleanup 2019-09-12 14:09:21 +09:00
Dean Herbert
8f6bc6fd5c Make osu!mania hit explosions more explodey 2019-09-11 18:19:47 +09:00
Dean Herbert
c27eed0195
Centralise and share bar line generation code between rulesets (#6054)
Centralise and share bar line generation code between rulesets
2019-09-10 19:31:29 +09:00
Dean Herbert
ef90914f58 Fix mania notes test scene not visually displaying 2019-09-10 15:27:40 +09:00
Dean Herbert
af3bb5a2cd Centralise and share bar line generation code between rulesets 2019-09-10 13:30:54 +09:00
Dean Herbert
f505a3ff1d Mark AutoGeneration tests as headless 2019-09-10 11:44:11 +09: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
379c9e8b7c Use expression body 2019-08-05 10:02:28 +02:00
smoogipoo
ed4dda1936 Support beatmap conversion tests with mods 2019-08-01 12:49:01 +09:00
smoogipoo
0108700793 Make beatmap conversion test use WorkingBeatmap 2019-08-01 12:44:10 +09:00
Dean Herbert
8327452fe1 Make AccentColour a bindable 2019-07-22 14:48:59 +09:00
Roman Kapustin
bf41fd5d9d Update package references 2019-07-06 23:29:35 +03:00
Dean Herbert
4ac2acbfc0 Fix usages of SpriteText (instead of OsuSpriteText) 2019-05-21 14:13:52 +09:00
Roman Kapustin
a538c94fed Update NuGet packages 2019-05-17 21:40:46 +03:00
Roman Kapustin
459a285cd8 Rename test cases to test scenes inline with the framework change 2019-05-14 22:37:25 +03:00
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
smoogipoo
1db2d49696 Fix testcases 2019-04-10 17:54:57 +09:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert
d6f17a5ecd Bring nuget packages up to date 2019-03-22 02:41:21 +09:00
smoogipoo
78596dfe80 Merge remote-tracking branch 'origin/master' into move-osu-settings
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
#	osu.Game.Rulesets.Osu.Tests/TestCaseSlider.cs
2019-03-05 13:25:03 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
7e41fbc29b Remove LegacyDifficultyCalculator 2019-02-21 13:12:37 +09:00
smoogipoo
0693ab8e7d Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
smoogipoo
b47ced8c58 Fix failing test 2019-02-18 15:01:14 +09:00
smoogipoo
68725dc005 Implement new difficulty calculator for Rulesets.Mania 2019-02-18 15:00:20 +09:00
smoogipoo
a8faa942a6 Implement new difficulty calculator structure 2019-02-18 14:49:43 +09:00
smoogipoo
e319a760b8 Add mania difficulty calculator test 2019-02-15 16:25:44 +09:00
Unknown
8ddff673b7 revert previous rename and rename ruleset specific classes instead 2019-01-25 11:14:37 +01:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert
bfb18b4ffb Update framework and other nuget packages 2019-01-16 10:14:37 +09:00
Dean Herbert
e26958f901 Fix targeting netcoreapp2.1 in many places 2018-12-21 10:24:32 +09:00
Dean Herbert
dbc33c45a6 Update nuget packages 2018-12-06 00:14:21 +09:00
Dean Herbert
68745b221e Update projects to target .NET core 2.2 2018-12-05 19:46:07 +09:00
Dean Herbert
5254b07680 Merge remote-tracking branch 'upstream/master' into inter-column-movements 2018-11-30 11:57:53 +09:00
Dean Herbert
132d334e15 Merge branch 'master' into hold-note-placement 2018-11-29 17:02:55 +09:00
Dean Herbert
bfebed053d
Merge branch 'master' into note-placement 2018-11-26 14:19:46 +09:00
smoogipoo
60ffad169f Fix post-merge errors 2018-11-26 11:47:48 +09:00
smoogipoo
c0fcbc283e Merge branch 'note-placement' into inter-column-movements
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
2018-11-26 11:47:22 +09:00
smoogipoo
56032a4522 Merge branch 'mania-selection-movement' into inter-column-movements
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
#	osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
2018-11-26 11:45:48 +09:00
smoogipoo
4ba3fa4ab6 osuTK 2018-11-26 10:44:48 +09:00
Dean Herbert
1da2006dea
Merge branch 'master' into note-placement 2018-11-22 19:44:39 +09:00
Dean Herbert
7de85659ba Merge branch 'master' into mania-selection-movement 2018-11-21 20:00:46 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
smoogipoo
c84f49addf Add testcase 2018-11-19 19:02:59 +09:00
smoogipoo
f7fc2ca569 Basic inter-column selection movement 2018-11-15 21:37:22 +09:00
smoogipoo
eddba44d0f Merge branch 'note-placement' into inter-column-movements 2018-11-15 20:53:57 +09:00
Dean Herbert
4dec2d1db0 Merge remote-tracking branch 'upstream/master' into note-placement 2018-11-14 18:29:31 +09:00
smoogipoo
a9a33b1fcb Implement mania selection movements 2018-11-13 16:42:40 +09:00
smoogipoo
3d8ef97e81 Add testcase 2018-11-12 19:41:06 +09:00
smoogipoo
3a1fee59fb Implement note placement 2018-11-12 18:24:18 +09:00
smoogipoo
2e0e1befe9 Add selection mask testcases
# Conflicts:
#	osu.Game/Tests/Visual/SelectionBlueprintTestCase.cs
2018-11-12 17:40:09 +09:00
smoogipoo
10543cf1b6 Move rest of ScrollingPlayfield into ScrollingRulesetContainer 2018-11-12 17:34:35 +09:00
smoogipoo
ad45bc7666 Move scroll direction to scrollinginfo 2018-11-12 17:34:35 +09:00
smoogipoo
9fde7f7f44 Move scrolling info to osu.Game 2018-11-12 17:34:35 +09:00
Dean Herbert
4554fc2c7b Update framework and other dependencies 2018-11-05 18:22:16 +09:00
Dean Herbert
15dae9b2e4 Update nuget dependencies (version mismatches) 2018-10-12 18:51:51 +09:00
Dean Herbert
182aa63cc8 Update nuget dependencies 2018-10-12 17:08:59 +09:00
Dean Herbert
dc78049839 Add test for propagation of direction through mania stack 2018-08-08 12:21:44 +09:00
smoogipoo
31146fbc01 Add anchor/origin tests 2018-08-08 11:28:55 +09:00
smoogipoo
6379c70a68 Add some ticks 2018-08-08 11:28:44 +09:00
Dean Herbert
6ee06602b8
Merge branch 'master' into mania-mask-container 2018-08-02 20:41:27 +09:00
Dean Herbert
21a19dc552 Remove remaining references to net471 2018-08-01 22:07:39 +09:00
Dean Herbert
6ce32bd431 Update remaining nuget deps 2018-08-01 19:17:16 +09:00
Dean Herbert
338496452d Move testing package references to somewhere appveyor will find them 2018-07-30 15:15:51 +09:00
Dean Herbert
3cf906042e
Merge branch 'master' into remove-net471-target 2018-07-30 11:28:06 +09:00
Dean Herbert
da8fc0ee5d ToLower -> ToLowerInvariant 2018-07-25 07:37:05 +02:00
smoogipoo
be297ddf76 Fix direction reversal not quite working correctly 2018-07-19 19:30:20 +09:00
Dean Herbert
fb09385f51 Remove net471 targeting 2018-07-18 11:01:08 +09:00
smoogipoo
6437fdd9db Merge remote-tracking branch 'origin/master' into mania-mask-container
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-07-17 16:46:48 +09:00
smoogipoo
827c5c4939 Remove scroll direction from ScrolingPlayfield constructor 2018-07-17 15:14:03 +09:00
smoogipoo
577ff4cc7f Merge remote-tracking branch 'origin/master' into mania-mask-container
# Conflicts:
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
#	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
#	osu.Game.Rulesets.Mania/UI/ManiaStage.cs
2018-07-17 13:13:57 +09:00
Dean Herbert
fbc5250bf1 Update framework 2018-07-11 17:12:01 +09:00
Dan Balasescu
290812cf65
Merge branch 'master' into more-mania-conversion-fixes 2018-07-06 13:29:16 +09:00
smoogipoo
45a4187923 Tidy up lookups to NestedHitObjects 2018-07-02 16:10:56 +09:00
smoogipoo
f007e71c87 Retrieve the mania key action through DI 2018-07-02 12:31:41 +09:00