smoogipoo
7e41fbc29b
Remove LegacyDifficultyCalculator
2019-02-21 13:12:37 +09:00
Dan Balasescu
f6d70e687b
Use correct local variable
...
Co-Authored-By: peppy <pe@ppy.sh>
2019-02-20 12:27:25 +09:00
Dean Herbert
b4bb87fee3
Make TrackVirtualTracking more accurate on seeks/stops
2019-02-20 12:08:30 +09:00
Dean Herbert
f2ad2931c7
Merge remote-tracking branch 'upstream/master' into test-working-beatmap-clock
2019-02-20 11:37:33 +09:00
Dean Herbert
87dd7bcf6b
Fix one more test regression
2019-02-19 13:02:33 +09:00
Dean Herbert
0fce23a36b
Fix test regression
2019-02-19 12:38:45 +09:00
Dean Herbert
62fe5ad481
Nest class
2019-02-19 12:35:52 +09:00
Dean Herbert
f8033a3b35
Give TestWorkingBeatmap a reference clock
2019-02-19 12:27:30 +09:00
smoogipoo
a8faa942a6
Implement new difficulty calculator structure
2019-02-18 14:49:43 +09:00
Dean Herbert
42dc7644f2
Merge branch 'master' into diffcalc-testcases
2019-02-17 21:06:42 +09:00
Dean Herbert
65721a01ab
Fix regressed screen test cases
2019-02-15 17:01:06 +09:00
smoogipoo
280081d589
Fix beatmap ruleset not being set
2019-02-15 14:42:42 +09:00
Dean Herbert
490d48fa5e
Fix MultiplayerTestCase not being abstract
2019-02-15 13:48:14 +09:00
smoogipoo
f50a0be29d
Add osu! difficulty calculator test
2019-02-14 16:22:14 +09:00
Dean Herbert
3ec94e4ab3
Remove disable setting
2019-02-13 15:14:34 +09:00
Dean Herbert
43843ac558
Remove explicit dispose
2019-02-13 14:58:40 +09:00
Dean Herbert
19bef01dd0
Attempt to maybe fix tests
2019-02-13 11:05:02 +09:00
Dean Herbert
b967b93b88
Fix regressions in tests
2019-02-12 19:53:08 +09:00
Dean Herbert
e2e615cc5c
Merge branch 'master' into leased-bindables-dont-work
2019-02-11 16:30:12 +09:00
smoogipoo
7aca0f4a1d
Fix failing test cases
2019-02-08 16:08:23 +09:00
smoogipoo
aac371ba6e
Use CMC for all of multiplayer
2019-02-05 19:00:08 +09:00
Dean Herbert
ca5c8d37d1
Use leased bindables
2019-02-01 16:44:06 +09:00
smoogipoo
b90207fa54
Give ScreenTestCase a background stack
2019-01-31 14:55:48 +09:00
Dean Herbert
e8c39b9c37
Fix test screen loading
2019-01-31 11:00:44 +09:00
smoogipoo
91302ea0bc
Merge remote-tracking branch 'origin/master' into iscreen
...
# Conflicts:
# osu.Game/Screens/Multi/Match/MatchSubScreen.cs
# osu.Game/Screens/Multi/Multiplayer.cs
# osu.Game/Screens/Multi/MultiplayerSubScreen.cs
# osu.Game/Screens/OsuScreen.cs
# osu.Game/osu.Game.csproj
# osu.sln
2019-01-29 21:21:36 +09:00
smoogipoo
8ea7ec6445
Convert everything to use IScreen
2019-01-24 19:47:44 +09:00
Dean Herbert
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09:00
Dean Herbert
f107a922b4
Add tests for key counter inside player heirarchy
2019-01-23 14:51:25 +09:00
smoogipoo
1a3c06f2d9
Fix OsuTestCase beatmap not having a correct default beatmap
2018-12-05 20:33:27 +09:00
Dean Herbert
1da2006dea
Merge branch 'master' into note-placement
2018-11-22 19:44:39 +09:00
smoogipoo
f27bd3ef3e
OpenTK -> osuTK
2018-11-20 17:14:59 +09:00
Dean Herbert
4dec2d1db0
Merge remote-tracking branch 'upstream/master' into note-placement
2018-11-14 18:29:31 +09:00
Dean Herbert
a83efe225e
Merge remote-tracking branch 'upstream/master' into add-mania-selection-testcase
2018-11-14 18:11:53 +09:00
smoogipoo
7274908059
Implement interface
2018-11-14 15:33:09 +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
d8e7ad8241
Fix post-rebase issues
2018-11-12 17:36:19 +09:00
smoogipoo
10543cf1b6
Move rest of ScrollingPlayfield into ScrollingRulesetContainer
2018-11-12 17:34:35 +09:00
smoogipoo
e7969ecec7
Move ScrollAlgorithm inside IScrollingInfo
2018-11-12 17:34:35 +09:00
smoogipoo
ad45bc7666
Move scroll direction to scrollinginfo
2018-11-12 17:34:35 +09:00
smoogipoo
4277cb0d59
Adjust some missed renames
2018-11-07 15:04:48 +09:00
smoogipoo
52f4923c8e
Remove intermediate Screens namespace
2018-11-06 18:28:22 +09:00
smoogipoo
b3fa7c111b
Rename testcases
2018-11-06 18:06:20 +09:00
smoogipoo
bd775af274
PlacementMask -> PlacementBlueprint
2018-11-06 18:04:03 +09:00
smoogipoo
f2a5f28ea2
SelectionMask -> SelectionBlueprint
2018-11-06 17:56:04 +09:00
smoogipoo
951a309d04
Increase placement testcase circlesize
2018-10-26 15:36:09 +09:00
smoogipoo
2f42112d87
Add placement mask testcase
2018-10-25 19:11:57 +09:00
smoogipoo
4ecd4ca462
Add selection mask test cases
2018-10-25 19:10:52 +09:00
ekrctb
50091252e2
Adapt signature change of event handlers
2018-10-02 12:02:55 +09:00
ekrctb
99fc04c8af
Change signature to new event handler
2018-10-02 12:02:47 +09:00
Dean Herbert
02313c6d6e
Wait longer before confirming test players are cleaned up
2018-09-11 13:21:05 +09:00
Dean Herbert
2169a47325
Prevent fatal failures on delete failures
2018-07-23 10:39:43 +02:00
Dean Herbert
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
Dean Herbert
7be3a5d466
Centralise test storage logic
2018-07-19 14:07:55 +09:00
Dean Herbert
41441771ae
Remove unnecessary cast
2018-07-18 22:22:28 +09:00
Dean Herbert
0c24244340
Remove SingletonContextFactory
...
It is dangerous to use this as it doesn't correctly handle contexts and can cause issues that will never actually arise in normal execution.
# Conflicts:
# osu.Game/Database/SingletonContextFactory.cs
2018-07-18 16:50:56 +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
b61fe10f62
Adapt to IBindables
2018-07-02 15:07:18 +09:00
smoogipoo
4070c1a888
Merge remote-tracking branch 'origin/master' into non-null-ruleset
...
# Conflicts:
# osu.Game/Screens/Select/FilterControl.cs
2018-07-02 15:05:34 +09:00
smoogipoo
c0c94e24b9
Use VirtualBeatmapTrack in testcases
2018-06-28 11:45:48 +09:00
Dean Herbert
018dcc98b4
Fix failing tests
2018-06-26 19:17:34 +09:00
Dean Herbert
4bcc05a7fc
Remove null checks on ruleset
...
Add a default ruleset to `OsuTestCase` to cover testing scenarios.
2018-06-26 18:24:34 +09:00
smoogipoo
97057ced85
Merge remote-tracking branch 'origin/master' into full-mania-fix
2018-06-25 12:43:49 +09:00
ekrctb
d6084c0b30
Adapt to new input handling changes
2018-06-22 18:10:27 +09:00
Dean Herbert
5f2d1d4a1e
Dim TestCase background a bit
2018-06-21 12:48:44 +09:00
Dean Herbert
a20ec0d4cc
Merge branch 'master' into timeline-audio-scrolling
2018-06-17 19:01:21 +09:00
Dean Herbert
e0ee5e2085
Merge branch 'master' into timeline-audio-scrolling
2018-06-17 19:01:16 +09:00
smoogipoo
47ae962099
Output only one mapping failure per mapping
2018-06-15 18:36:22 +09:00
Dean Herbert
a6437c005c
Merge branch 'master' into diffcalc-rework
2018-06-15 18:02:18 +09:00
smoogipoo
e945186978
Expose the beatmap converter
2018-06-15 17:59:52 +09:00
smoogipoo
a4d2364083
Add one more newline
2018-06-14 21:29:08 +09:00
smoogipoo
b99b520656
Allow convertmapping to be extended
2018-06-14 21:25:33 +09:00
smoogipoo
024d2abfe0
Always generate mappings/convert values as soon as objects are converted
...
# Conflicts:
# osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
2018-06-14 21:25:23 +09:00
smoogipoo
8d0e7abdd6
Some rulesets don't have a beatmap processor
2018-06-14 21:23:11 +09:00
smoogipoo
5e66b02108
Process beatmap before generating mappings
2018-06-14 21:22:56 +09:00
smoogipoo
540b43313e
Remove PP test cases (osu-tools/osu-server should be used instead)
2018-06-14 15:57:06 +09:00
Dean Herbert
0fdb04f57d
Fix empty line
2018-06-13 15:43:18 +09:00
Dean Herbert
39738a997e
Add check for player screens too
2018-06-13 15:26:23 +09:00
Dean Herbert
14f5c814a6
Add test for WorkingBeatmap leakage
2018-06-13 15:12:10 +09:00
smoogipoo
ca3186f34c
Create dependencies before children are loaded
2018-06-12 19:51:35 +09:00
Dean Herbert
475fb06559
Use new bind method
2018-06-07 16:46:54 +09:00
Dean Herbert
621be3bbfc
Merge branch 'master' into disallow-beatmap-change
2018-06-07 00:38:40 +09:00
smoogipoo
ebcfe97ccf
Expose Dependencies from base OsuTestCase
2018-06-06 20:25:40 +09:00
smoogipoo
f2ac5b8b2d
CreatePlayer shouldn't receive a beatmap
2018-06-06 20:21:47 +09:00
smoogipoo
72cc53aded
Rename GameBeatmap -> BindableBeatmap
2018-06-06 20:16:20 +09:00
smoogipoo
4086ff7313
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
# osu.Game/Screens/Menu/Intro.cs
# osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
Dean Herbert
601ef3b6f7
Consume osu.Framework via nuget
2018-06-05 14:14:56 +09:00
Dean Herbert
64eda27547
Update framework
2018-06-03 03:05:53 +09:00
smoogipoo
a3470f9ec3
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
...
# Conflicts:
# osu.Game/Overlays/Music/PlaylistOverlay.cs
# osu.Game/Screens/OsuScreen.cs
2018-05-28 18:01:15 +09:00
smoogipoo
3a5228af43
Make GameBeatmap late-bind its AudioManager for ctor Beatmap access
2018-05-28 17:55:41 +09:00
Dean Herbert
975ce82177
Ensure autoplay tests actually increase score above zero
2018-05-26 14:46:05 +09:00
Dean Herbert
699f661b02
Merge remote-tracking branch 'upstream/master' into AlFasGD-editor-seekbar-fix
2018-05-25 19:07:30 +09:00
smoogipoo
f1ac84d95b
Fix base.CreateLocalDependencies sometimes not being called
2018-05-24 13:03:25 +09:00
smoogipoo
5a517bad63
Move beatmap cleanup to Dispose()
2018-05-24 12:53:32 +09:00
smoogipoo
a25462e10f
Fix testcase audio + dependency overrides not working
2018-05-23 18:52:09 +09:00
smoogipoo
8004b8af4d
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
2018-05-23 17:38:02 +09:00
smoogipoo
8d8b7e6fa2
Fix conversion tests for ruleset-specific beatmaps not working
...
TRuleset was a mistake. This resulted in cases that checked whether the beatmap was for the current ruleset (TaikoBeatmapConverter and ManiaBeatmapConverter) failing due to TestXRuleset != XRuleset...
2018-05-16 13:09:48 +09:00
AlFasGD
e44062b77a
Fix tests and implementation
2018-05-08 16:37:06 +03:00
smoogipoo
6867886f4c
Give conversion-tested beatmaps a ruleset
2018-05-07 14:04:37 +09:00
smoogipoo
794418432f
Fix incorrect method name
2018-05-07 11:22:25 +09:00
smoogipoo
db3e48c194
Rename GetBeatmap() to GetPlayableBeatmap()
2018-05-07 10:40:30 +09:00
smoogipoo
9128e64c9a
Rename OriginalBeatmap back to Beatmap
2018-05-07 10:29:38 +09:00
smoogipoo
77e661489d
Merge branch 'i-beatmap' into beatmap-conversion-rework
2018-05-07 10:00:24 +09:00
smoogipoo
1aefd71b65
Merge remote-tracking branch 'origin/master' into i-beatmap
2018-05-07 09:58:53 +09:00
Dean Herbert
64ddee5646
Change load order to ensure runner is loaded before blocking op
2018-04-22 04:26:27 +09:00
Dean Herbert
44a9aa529a
Test CI run with new changes
2018-04-22 03:51:17 +09:00
smoogipoo
03a5df84c6
Initial rework of beatmap conversion process
2018-04-19 22:04:12 +09:00
smoogipoo
66b3b295e7
Use IBeatmap wherever possible
2018-04-19 20:44:38 +09:00
smoogipoo
b5a55a0dce
Make an interface for beatmaps
2018-04-19 18:58:40 +09:00
smoogipoo
d5ce618d9b
Update with framework changes
2018-04-18 15:12:48 +09:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
smoogipoo
6e35910419
Remove start/stop clock logic
...
Beatmap track shouldn't be start/stopped anyway - the IAdjustableClock should be DI'd in to perform the functionality.
2018-04-12 14:06:36 +09:00
smoogipoo
fbc50d6030
Merge master into editor-clock
2018-04-12 13:35:53 +09:00
smoogipoo
070e68f235
Give the test case clock an accurate IsRunning value
2018-04-06 19:14:04 +09:00
smoogipoo
e59124962c
Remove re-instantiation of clock in EditorClockTestCase
2018-04-06 18:38:44 +09:00
smoogipoo
b238130fe4
DI beat divisors to test cases with editor clocks
2018-04-06 18:23:22 +09:00
smoogipoo
fdb3227fd7
Fix + cleanup testcases
2018-04-06 18:12:44 +09:00
Dean Herbert
37fb207abd
Remove TestTestCase
...
No longer necessary as we have restructured tests considerably.
2018-04-05 16:01:33 +09:00
Dean Herbert
94b1d3e4af
Make VisualTests/nUnit work again
2018-03-28 12:33:01 +09:00
smoogipoo
e97349fd63
Derive ScreenTestCase + use LoadComponentAsync
2018-03-13 16:00:56 +09:00
smoogipoo
0c705b0397
Rename to EditorTestCase
2018-03-13 15:57:05 +09:00
Dean Herbert
b93e83e3d2
Merge branch 'master' into base-editor-testcase
2018-03-13 15:53:33 +09:00
smoogipoo
e32eec9259
No more caching
2018-03-13 15:22:46 +09:00
smoogipoo
706c26c32b
Remove extra whitespace
2018-03-13 09:27:33 +09:00
smoogipoo
d2859d779d
Create a base TestCaseEditor for rulests to derive
2018-03-12 19:43:52 +09:00
smoogipoo
13c20438ef
Fix build issues
2018-03-12 19:41:51 +09:00
smoogipoo
b91524dbba
Give TestWorkingBeatmap's track a valid length
2018-03-12 19:41:15 +09:00
smoogipoo
7406cb290f
Split out test beatmap from TestCasePlayer into instantiable class
2018-03-12 19:41:09 +09:00
Dean Herbert
ab4c527ebc
Merge branch 'master' into decoders
2018-03-12 13:38:22 +09:00
HoLLy
9c75c392f2
Only check by null instead of sign
2018-03-11 21:27:49 +01:00
HoLLy
a321bcf3af
Fix check against LegacyID for non-default rulesets
2018-03-11 20:19:03 +01:00
Dean Herbert
217dd2ecdc
Initial push for better decoders
2018-03-09 21:24:15 +09:00
Dean Herbert
c4c1b0b6ff
Fix merge regression
2018-03-06 01:39:01 +09:00
smoogipoo
49b8670dfc
Fix beatmap conversion tests not properly constructing decoder
2018-03-05 14:53:57 +09:00
smoogipoo
a2c239d5e3
Rename to IBeatmapConverter, move to separate file
2018-03-02 20:19:47 +09:00
smoogipoo
cdca7371a3
Replace testcases with a basic test suite
2018-03-02 18:20:33 +09:00
Dan Balasescu
4aff659272
Merge branch 'master' into beatmap-conversion-testcases
2018-03-02 16:04:32 +09:00
smoogipoo
1f834825dc
Add testcase to osu.Game in-case nunit tries to discover tests in it
2018-03-02 15:43:55 +09:00
smoogipoo
573d6d1b5f
Allow multiple mappings to be generated for a single hitobject
2018-03-02 13:13:01 +09:00
smoogipoo
4e363664fd
Add beatmap parameter to beatmapconverter creation
2018-03-02 13:13:01 +09:00
smoogipoo
070c5a95ee
Improve output
2018-03-02 13:13:01 +09:00
smoogipoo
797d03a65f
Implement basic structure for beatmap conversion testing
2018-03-02 13:13:00 +09:00
Dean Herbert
f2b3d9a0e8
Change some missed instances
2018-02-22 14:17:35 +09:00
Dan Balasescu
c5b71d2cb7
Remove unused using
2018-02-14 23:15:34 +09:00
Dan Balasescu
9f7736fab3
Merge branch 'master' into restore-ruleset-tests
2018-02-14 22:48:29 +09:00
Dean Herbert
789e25069f
Fix non-visual tests not cleaning up previous executions
2018-02-08 17:07:59 +09:00
smoogipoo
ccc948a0b9
Update framework (testing)
2018-02-08 12:45:51 +09:00
Dean Herbert
58626e3b30
Allow rulesets to create their own instantiation info
2018-01-10 17:04:07 +09:00
Dean Herbert
37d393bca0
Update licence headers
2018-01-05 20:21:19 +09:00
Dean Herbert
61c2bf7ebe
Fix TestCasePerformancePoints binding to global beatmap
...
and never unbinding
2018-01-03 13:34:27 +09:00
Dean Herbert
324a7d6377
Merge remote-tracking branch 'upstream/master' into better-testcase-player
2017-12-27 20:26:38 +09:00
Dean Herbert
99a44e6d79
Allow testbrowser's rate adjust to affect TestCasePlayer
2017-12-26 15:03:45 +09:00
Dean Herbert
9fb958eadc
Make TestCasePlayer more usable
...
No results screen crash, no unnecessary leadin time.
2017-12-26 14:23:14 +09:00
Dean Herbert
3c1654e5e4
Fix many instances of non-osu-prefixed text classes being used
...
Results in incorrect default formatting.
2017-12-26 00:44:35 +09:00
Dean Herbert
c871a25dfa
Remove unnecessary constructure and make ruleset required
2017-12-20 20:41:01 +09:00
Aergwyn
e07b85311b
removed unnecessary using
2017-12-01 22:15:10 +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
c16925059c
split parsing a beatmap and parsing a storyboard
2017-11-30 19:16:13 +01:00
Dean Herbert
801d81ecfc
Add a notice when not logged in
2017-11-29 19:00:08 +09:00
Dean Herbert
93d7cd5a6d
Merge branch 'master' into performance-calculator
2017-11-29 18:37:07 +09:00
Dean Herbert
bad970d1d1
Add wait steps to ensure the player is completely loaded before continuing
2017-11-29 17:25:55 +09:00
Dean Herbert
d1afbf8055
Load Player-based TestCases asynchronously
2017-11-29 13:10:33 +09:00
smoogipoo
a9cc156d7a
Merge remote-tracking branch 'origin/master' into performance-calculator
2017-11-28 21:38:26 +09:00
Dean Herbert
95fbe6a4a2
Update framework
2017-11-23 23:43:27 +09:00
Dean Herbert
9565a9c352
Fix TestCasePlayer not working as expected
2017-11-23 20:42:07 +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
smoogipoo
f9ad4b6acb
Make categoryDifficulties return doubles to improve decimal accuracy
2017-11-21 19:55:09 +09:00
smoogipoo
5d753427f6
Fix up DT not affecting hitobject densities
2017-11-17 17:28:22 +09:00
smoogipoo
bf44b3d0ef
Cleanups
2017-11-17 16:54:50 +09:00
smoogipoo
1ed2ce324f
Further improvements to TestCasePerformancePoints
2017-11-17 14:37:19 +09:00
smoogipoo
1e023f0419
Implement PerformanceCalculator testcase
2017-11-17 14:37:19 +09:00
smoogipoo
38fe95d94a
Add basic display for pp in TestCasePerformancePoints
2017-11-17 14:37:19 +09:00
Dean Herbert
22b3f5dd19
Merge remote-tracking branch 'upstream/master' into import-test-fixes
2017-10-23 22:03:37 +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
5b2219a692
Add back test cleanup before run
2017-10-22 16:20:04 +09:00
Dean Herbert
f9d5eadd05
Fix TestCase failing in an infinite loop
2017-10-20 12:21:18 +09:00
Dean Herbert
5d5ea5fb2e
Fix all remaining db structure issues
2017-10-19 14:05:11 +09:00
Dean Herbert
0dac770e38
Remove TestCase cleanup temporarily until context disposal is sorted
2017-10-18 19:52:08 +09:00
Dean Herbert
ad54ca9268
Fix TestCasePlaySongSelect
2017-10-17 16:04:54 +09:00
Dean Herbert
cd41862e3b
Add back transaction support for beatmap importing
2017-10-17 15:00:27 +09:00
Dean Herbert
acc299c7b9
Correct and simplify RulesetStore
2017-10-16 17:02:31 +09:00
Dean Herbert
1f4a943f74
Fix test case runs not being correctly isolated on mono
2017-10-16 15:23:28 +09:00
Dean Herbert
8a0b184dd6
Revert "Return back DatabaseBackedStore's query and populate functions"
...
This reverts commit 7cf5d63cd3
2017-10-16 12:59:59 +09:00
TocoToucan
7cf5d63cd3
Return back DatabaseBackedStore's query and populate functions
2017-10-15 00:40:41 +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
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
cd722e4abb
Fix beatmap author being stored in two different places
2017-10-14 11:39:55 +09:00
Dean Herbert
520b806305
Merge remote-tracking branch 'upstream/master' into ranks-section
2017-10-13 18:49:05 +09:00
smoogipoo
a5817e6e75
Add a way to change the IconButton icon colour
2017-10-12 18:17:23 +09:00
smoogipoo
f08f7a4ecb
Merge remote-tracking branch 'smoogipoo/editor-waveform' into editor-waveform-timeline
2017-10-12 17:52:40 +09:00
Dan Balasescu
18c67dd936
Merge branch 'master' into editor-waveform
2017-10-12 17:32:42 +09:00
smoogipoo
622659336d
Merge + update framework
2017-10-12 17:02:39 +09:00
Dean Herbert
00f7007036
Merge remote-tracking branch 'upstream/master' into fix-medal-overlay
2017-10-12 16:56:40 +09:00
smoogipoo
de8f9325a3
Implement TimelineButton and use for the magnification buttons
2017-10-12 16:10:33 +09:00
smoogipoo
6fbf52c3eb
Remove unused usings
2017-10-12 15:32:18 +09:00
smoogipoo
df6409308a
Merge remote-tracking branch 'origin/master' into editor-waveform-timeline
...
# Conflicts:
# osu-framework
2017-10-12 15:32:11 +09:00
TocoToucan
8b01f8671f
Merge from ppy/master
2017-10-10 21:07:36 +03:00
smoogipoo
8cea875f5f
Remove unused using
2017-10-10 18:35:30 +09:00
smoogipoo
c2f3c0e6df
Add TestCaseIconButton to demonstrate IconButton usages
2017-10-10 18:32:09 +09:00
smoogipoo
1cf8c0284a
Re-namespace a few classes
2017-10-10 15:22:39 +09:00
smoogipoo
cb58a1371e
Merge branch 'editor-waveform' into editor-waveform-timeline
...
# Conflicts:
# osu.Game/osu.Game.csproj
2017-10-09 18:10:52 +09:00
Dean Herbert
222d0c8694
Fix visual regressions in MedalOverlay
2017-10-09 17:52:48 +09:00
smoogipoo
b97b575b27
Merge remote-tracking branch 'origin/master' into editor-waveform
...
# Conflicts:
# osu-framework
2017-10-09 17:20:24 +09:00
smoogipoo
fc99860f4e
Remove EditorMenuBarItem
2017-10-07 00:51:20 +09:00
Dean Herbert
55267abe67
Merge branch 'master' into editor-screens
2017-10-06 23:19:16 +08:00
TocoToucan
887aa7496b
Rework EF Core usage in model classes
2017-10-06 00:23:26 +03:00
smoogipoo
7926757898
Remove unneeded parens
2017-10-05 14:33:49 +09:00
smoogipoo
0a9d23b4ba
Update with framework changes (removal of WaveformDisplay)
2017-10-05 14:33:39 +09:00
EVAST9919
2bc8fe027b
Extend the testcase to test short breaks
2017-10-05 06:17:48 +03:00
TocoToucan
6a4198d0d6
Initial EF Core commit
2017-10-04 22:52:12 +03:00
smoogipoo
8427bb44d1
Implement basic layout for the compose screen ScrollableTimeline
2017-10-04 22:00:42 +09:00
smoogipoo
81960c7b48
CI fixes
2017-10-04 19:03:02 +09:00
smoogipoo
01c839eda7
Move WaveformDisplay into separate class and add some commenting
2017-10-04 17:51:28 +09:00
smoogipoo
a37b10d512
Make TestCaseWaveform use invalidations + remove some of the crud
2017-10-04 17:51:28 +09:00
smoogipoo
3eeb36cbd4
Remove now unused class
2017-10-04 17:51:27 +09:00
smoogipoo
319649f446
Make TestCaseWaveform use a custom drawnode instead of boxes
2017-10-04 17:51:27 +09:00
smoogipoo
1a7e3fa09e
Initial implementation of a test case which showcases waveforms
2017-10-04 17:51:27 +09:00
EVAST9919
aafead5057
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-10-03 01:34:42 +03:00
Dean Herbert
66afba6219
Allow TestCasePlayer to instantiate only one ruleset type
2017-10-02 20:48:24 +08:00
smoogipoo
7211dd2015
Remove unnecessary usings
2017-10-02 10:11:43 +09:00
smoogipoo
c2d63eb0bd
Add EditorScreen + screen changing functionality
2017-10-02 09:26:52 +09:00
smoogipoo
2a9edcbb4f
Add test case for the editor
2017-10-02 08:11:02 +09:00
EVAST9919
ac6c323f93
Clear all tasks and transforms when resetting Breaks
2017-10-02 00:44:57 +03:00
EVAST9919
2f852d705e
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-10-01 23:10:49 +03:00
Dean Herbert
eed358a2c1
Merge branch 'master' into editor-screen-selection
2017-09-29 18:24:46 +08:00
EVAST9919
ca1f96208a
Fix TestCaseContextMenu not being updated inline with previous changes
2017-09-28 14:31:02 +03:00
smoogipoo
545c375199
Update design of EditorMenuBar to match flyte's design more closely
2017-09-27 22:01:03 +09:00
EVAST9919
3cd6319ffa
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-09-27 00:32:38 +03:00
Dean Herbert
7c70d3d2cb
Merge branch 'master' into storyboard_integration
2017-09-26 20:19:26 +08:00
smoogipoo
c578509a20
Bind to the screen Beatmap instead of the game-wide Beatmap
2017-09-26 17:58:40 +09:00
Dan Balasescu
b8b54e95a5
Merge branch 'master' into editor-timing-timeline
2017-09-26 15:54:01 +09:00
smoogipoo
5953c1084e
Re-namespace SummaryTimeline
2017-09-26 15:45:27 +09:00
Dean Herbert
5be11f539b
Rename to BeatmapSetOverlay
2017-09-25 17:26:27 +08:00
Damnae
2d4616fd43
Apply beatmap settings when creating the DrawableStoryboard.
2017-09-25 11:03:57 +02:00
Damnae
0996867112
Move StoryboardReplacesBackground and StoryboardAspect properties to Storyboard.
2017-09-25 10:40:22 +02:00
Jorolf
14b8e9fd77
remove some redundant stuff
2017-09-21 22:15:42 +02:00
Jorolf
72141935e8
make pagination work and remove duplication in RanksSection
2017-09-21 22:07:23 +02:00
DrabWeb
cb4818e84e
Merge https://github.com/ppy/osu into online-beatmap-set-overlay
2017-09-21 14:25:34 -03:00
EVAST9919
18a714df74
Move every class to it's own file
2017-09-20 22:33:07 +03:00
EVAST9919
eb93706c26
Remove useless usings
2017-09-20 16:03:31 +03:00
EVAST9919
0f04d8c6a7
Add remaining time container
2017-09-20 15:58:28 +03:00
smoogipooo
58b09a161f
CI fixes
2017-09-20 17:16:12 +09:00
smoogipooo
f9568619e7
Move SummaryTimeline into /Edit/Components/SummaryTimeline
2017-09-20 16:59:03 +09:00
smoogipooo
3da3ef1a50
CI fixes
2017-09-20 16:53:01 +09:00
smoogipooo
5978668d2b
Mini -> Summary
2017-09-20 16:48:30 +09:00
smoogipooo
967bfa404e
Generate a set beatmap instead of using the available beatmaps
2017-09-20 16:40:37 +09:00
smoogipooo
6a9572db6c
Merge branch 'master' into editor-timing-timeline
...
# Conflicts:
# osu-framework
2017-09-20 16:19:08 +09:00
smoogipooo
01d84893a0
Cleanup + commenting
2017-09-20 15:55:23 +09:00
smoogipooo
fd278256ad
EditorTimingTimeline -> EditorMiniTimeline
2017-09-20 15:50:32 +09:00
smoogipooo
252121968d
Actually load a beatmap for TestCaseEditorTimingTimeline
2017-09-20 15:40:42 +09:00
smoogipooo
01c3818ea0
Make EditorTimingTimeline support beatmap changes
2017-09-20 15:40:27 +09:00
Jorolf
5b90f45691
Merge branch 'master' of git://github.com/ppy/osu into ranks-section
2017-09-19 21:26:05 +02:00
Damnae
fcaabf7fdf
Merge branch 'master' into storyboard_integration
2017-09-19 17:36:29 +02:00
EVAST9919
4cf88c72bf
Move testcase to the correct project
2017-09-19 17:37:34 +03:00
smoogipooo
67d3861226
Initial implementation of the EditorTimingTimeline in TestCaseEditorTimingTimeline
...
Will probably rename this to MiniTimeline or something... But the basic structure is there plus most of functionality minus keyboard input.
2017-09-19 23:09:08 +09:00
Dean Herbert
f96875a470
Add a catch specific player test
2017-09-19 21:40:57 +09:00
Dean Herbert
ef210018d9
Run headless tests with a unique name based on the executing assembly
2017-09-19 20:04:37 +09:00
Dean Herbert
51cdff1d9a
Fix TestCasePlaySongSelect incorrectly using live app data
2017-09-19 17:22:45 +09:00
Dean Herbert
6d3d485565
And then everything became one
2017-09-19 16:06:58 +09:00
