Dean Herbert
1e6244afe1
Merge branch 'master' into remove-gamefield-test
2018-04-12 21:37:04 +09:00
smoogipoo
a2484fbf56
Move back to DI-ing adjustable clock into SummaryTimeline
2018-04-12 13:37:02 +09:00
smoogipoo
fbc50d6030
Merge master into editor-clock
2018-04-12 13:35:53 +09:00
DrabWeb
0bede52381
Move the waves portion of WaveOverlayContainer to WaveContainer to allow usage in other places.
2018-04-11 16:22:27 -03:00
smoogipoo
7e78b2e54e
Remove TestCaseGamefield
...
Unused. Unneeded. We already have TestCaseAllPlayers and individual tests in all rulesets. Eventually we probably also want osu.Game.Tests to not reference ruleset projects anyway.
2018-04-09 11:37:03 +09:00
Dean Herbert
6bc319caae
Merge branch 'master' into manual-input-test-case
2018-04-06 20:07:07 +09:00
Dean Herbert
ae2dce254a
Rename TestCase
2018-04-06 19:53:34 +09:00
Endrik
8ef5855e84
Fix typo
2018-04-06 12:38:17 +03:00
Endrik
c7440201fb
Merge branch 'master' into alt-eagerselect
2018-04-06 12:37:16 +03:00
smoogipoo
fdb3227fd7
Fix + cleanup testcases
2018-04-06 18:12:44 +09:00
smoogipoo
c7abd56fc4
Give editor a custom clock to handle seeking
2018-04-06 18:11:37 +09:00
Dean Herbert
768a5e5383
Create ManualInputManagerTestCase
...
A base class for running more input-driven tests.
2018-04-06 15:23:30 +09:00
Dean Herbert
714326b606
Fix TestCase not working with dynamic compilation
2018-04-06 13:16:27 +09:00
smoogipoo
d9e795fb9f
TimelineContainer -> TimelineArea
2018-04-05 19:40:03 +09:00
smoogipoo
f41d31e1db
ScrollableTimeline -> TimelineContainer
2018-04-05 19:33:25 +09:00
smoogipoo
870ce8868c
Make scrollabletimeline use gridcontainer
2018-04-05 16:07:33 +09:00
Dean Herbert
4d71f2084c
Move individual mask selection logic out of MaskSelection
2018-04-04 18:29:53 +09:00
Dean Herbert
788bfde002
Merge branch 'master' into selectionlayer-rewrite
2018-04-04 15:38:27 +09:00
Dan Balasescu
6dfca4b2fa
Merge branch 'master' into osu-tab-strip
2018-04-04 14:20:06 +09:00
Joseph Madamba
ee7db92e6b
Simplify negative equality expression
2018-04-03 21:01:02 -07:00
Dean Herbert
d40ccbd70a
Merge branch 'master' into selectionlayer-rewrite
2018-04-03 12:03:11 +09:00
Dean Herbert
57b4cdaf85
Merge branch 'master' into selectionlayer-rewrite
2018-04-03 03:05:42 +09:00
Endrik Tombak
75f7d43d9d
Testcases for CarouselRoot
2018-04-02 11:56:35 +03:00
smoogipoo
551ba6ac4b
Fix ScalableContainer irrepairably altering content size
2018-04-02 13:06:06 +09:00
Joseph Madamba
1bebda61f8
Use "==" instead of "equals"
2018-03-31 10:51:44 -07:00
Joseph Madamba
ee14ca7cc5
Merge branch 'master' into score-multiplier-edits
2018-03-31 10:43:58 -07:00
Dean Herbert
cf3cafd9a9
Merge branch 'master' into beatmap-set-status
2018-03-30 20:55:36 +09:00
DrabWeb
e3218250d5
Fix tab strip in BreadcrumbControl, allow strip height to be overriden.
2018-03-29 15:41:27 -03:00
smoogipoo
6d4f94756e
Rewrite the way drag + click selections happen
...
The general idea here is that we need the masks to handle mouse down events, as they need to handle the drag (mousedown -> drag immediately).
I've rewritten the editor selections to use events, as there are some 3 different components that handle/trigger selections in different ways.
1. All selections/deselections now propagate through `HitObjectMask.Select()`/`HitObjectMask.Deselect()`.
2. Components that react to changes in the selection bind to the masks' `Selected`/`Deselected` events, and track them/change their states locally.
3. Masks provide a `SingleSelectionRequested` event which is invoked on the mouse-down event. Various components bind to this event to perform state changes locally in this scenario.
4. `DragBox` now handles all drag input locally. It triggers `Select`/`Deselect` on the masks it needs to.
5. `SelectionBox` handles the display of itself locally.
6. `SelectionBox` handles movement of groups of masks locally.
7. `HitObjectMasks` handles movement of itself locally.
2018-03-29 22:07:23 +09:00
smoogipoo
4bdfc9dca9
Fix testcase
2018-03-29 17:19:14 +09:00
Joseph Madamba
af9e3a849f
Merge branch 'master' into score-multiplier-edits
2018-03-28 20:42:35 -07:00
Joseph Madamba
5457f17e79
Clean up code from reviews
2018-03-28 19:53:15 -07:00
Dean Herbert
59df02da00
Update test projects to actually load in visual studio
2018-03-28 16:12:25 +09:00
Dean Herbert
0026b94cd3
Consolidate and move ruleset test projects
2018-03-28 14:41:25 +09:00
Dean Herbert
4907f14dbe
Add back resources
2018-03-28 13:00:18 +09:00
Dean Herbert
94b1d3e4af
Make VisualTests/nUnit work again
2018-03-28 12:33:01 +09:00
DrabWeb
19bc6b9168
Merge https://github.com/ppy/osu into beatmap-set-status
2018-03-27 18:13:58 -03:00
Dean Herbert
d76bc1a8ad
Revert "Move NoWarns"
...
This reverts commit 75a413a40e
.
2018-03-27 21:13:06 +09:00
Dean Herbert
75a413a40e
Move NoWarns
2018-03-27 19:19:09 +09:00
Dean Herbert
1a8aa87469
Make everything better
2018-03-27 18:56:54 +09:00
Dean Herbert
b290d2d039
Move NUnit includes to individual projects
2018-03-27 15:07:09 +09:00
DrabWeb
eb374c5774
Add beatmap set online status and display it in direct panels and the beatmap set overlay.
2018-03-26 21:04:45 -03:00
smoogipoo
dd5bbbbd9f
Define testable projects
2018-03-26 19:11:23 +09:00
smoogipoo
5159127bce
Fix SQLite failing to initialize on test projects
2018-03-26 18:07:09 +09:00
smoogipoo
35ef9d99c6
Only compile with net461 in visual studio
2018-03-26 15:44:55 +09:00
smoogipoo
96901b6498
Add msbuild/dotnet build + launch targets
2018-03-26 10:52:54 +09:00
Joseph Madamba
90d763fda5
Apply review changes and suggestions
2018-03-25 10:00:30 -07:00
Joseph Madamba
78a7564acd
Score multiplier edits
2018-03-24 16:00:18 -07:00
smoogipoo
4dc317d4df
Fix msbuild warnings
2018-03-25 03:38:52 +09:00
smoogipoo
c21e820a45
One more level of nesting (we can do this better in the future)
2018-03-25 02:43:45 +09:00
smoogipoo
d28de89e50
Add net461 target to test projects for nunit discovery
...
Nunit "by design" will not run tests for NETStandard projects (see: https://github.com/nunit/dotnet-test-nunit/issues/122#issuecomment-329531632 ).
2018-03-25 01:35:50 +09:00
smoogipoo
c29f7a4333
Merge remote-tracking branch 'origin/master' into netstandard
2018-03-24 14:49:46 +09:00
Dean Herbert
92d8781bf0
Merge branch 'master' into beat-snap-divisor
2018-03-22 20:14:50 +09:00
Dean Herbert
1b116dd04e
Adjust testcase sizing to match editor
2018-03-22 16:11:56 +09:00
Dean Herbert
c2eb32c0e9
DrawableBeatDivisor -> BeatDivisorControl
2018-03-20 20:10:27 +09:00
Dean Herbert
6fd650777c
Move value change logic to bindable
...
Also add drag support
2018-03-20 20:09:55 +09:00
Dean Herbert
d1c2aa71d0
Add beatmap sample override support
2018-03-20 16:24:06 +09:00
Dean Herbert
9a0fc9e29a
Move combo colours completely out of beatmap
2018-03-20 16:24:06 +09:00
smoogipoo
786e6242e1
Make bdl beat divisor nullable
2018-03-20 14:01:06 +09:00
smoogipoo
50192b21e3
Give DrawableBeatDivisor a ctor
2018-03-20 13:57:25 +09:00
smoogipoo
fa5fd46f85
Clean up + rename testcase
2018-03-19 20:42:42 +09:00
smoogipoo
b1d09500f2
Integrate beat snap divisor into editor seeking
2018-03-19 20:42:06 +09:00
smoogipoo
c5eab7a227
Actually rename to DrawableBeatDivisor...
2018-03-19 20:34:24 +09:00
smoogipoo
5ecbc5612c
Integrate with dependency injection
2018-03-19 20:33:58 +09:00
smoogipoo
46f10b392d
Fix merge errors
2018-03-19 20:23:31 +09:00
smoogipoo
4c0ccffe08
Merge remote-tracking branch 'origin/master' into beat-snap-divisor
2018-03-19 20:23:15 +09:00
smoogipoo
df0b8a24c5
Rename + renamespace
2018-03-19 20:21:19 +09:00
smoogipoo
b25c564ecb
Integrate into editor's compose screen
2018-03-19 20:14:58 +09:00
smoogipoo
070db63157
Privatise tick to TickContainer
2018-03-19 19:52:22 +09:00
smoogipoo
66e4e45882
Offset test case a little bit for dynamic compilation message
2018-03-19 19:49:46 +09:00
smoogipoo
6b035e8c53
Add basic structure/layout for the beat snap visualiser
2018-03-19 19:46:26 +09:00
smoogipoo
193142e901
Fix missed BDL case
2018-03-19 16:44:46 +09:00
smoogipoo
e25d1f6982
Pass down editor clocks through DI
2018-03-19 16:27:52 +09:00
smoogipoo
abb5dcf678
Fix null-refing testcase
...
This would also be fixed with BDL loading children after we're fully loaded ;).
2018-03-16 23:53:55 +09:00
Dean Herbert
4b83278cf4
Merge branch 'master' into fix-editor-clocks
2018-03-16 23:32:54 +09:00
Dean Herbert
e8f7f2c8ab
Merge branch 'master' into editor-wheel-movement
2018-03-16 18:19:42 +09:00
Dean Herbert
bca4b620b6
Merge branch 'master' into editor-wheel-movement
2018-03-16 15:56:51 +09:00
Dean Herbert
23ffee3d38
Merge branch 'master' into drawable-composite-hit-object
2018-03-16 15:38:52 +09:00
Dan Balasescu
cdc61d5f0d
Merge branch 'master' into fix-combo-colours
2018-03-16 14:59:45 +09:00
smoogipoo
8fbaa86e64
Fix testcases
2018-03-15 18:24:57 +09:00
smoogipoo
50f9d810dd
Add more testcases + fix up seeking a bit more
2018-03-15 15:40:52 +09:00
Dean Herbert
a42035f494
Make DrawableHitObject a CompositeDrawable
...
No reason for it to be a container.
2018-03-15 13:41:06 +09:00
Dean Herbert
8d433cb4bf
Merge branch 'master' into cursor-trail
2018-03-15 11:14:21 +09:00
smoogipoo
f693fbf92d
Add forward snapping from inbetween beat test
2018-03-14 23:08:43 +09:00
smoogipoo
0da3ae0944
Add some basic tests + fixes to seek/seekforward functionality
2018-03-14 20:52:48 +09:00
Dean Herbert
a0691168cb
Merge remote-tracking branch 'upstream/master' into editor-hitobject-movement
2018-03-14 15:35:24 +09:00
Dean Herbert
81f82d98a1
Rework a lot of naming and structure
2018-03-14 15:18:21 +09:00
Dean Herbert
13f64a1d12
Merge branch 'master' into cursor-trail
2018-03-14 11:42:40 +09:00
Dean Herbert
c55d70ec13
Merge branch 'master' into fix-combo-colours
2018-03-13 19:19:45 +09:00
Dean Herbert
e43de68ad3
Move colour parsing to LegacyDecoder
2018-03-13 19:13:50 +09:00
smoogipoo
d2859d779d
Create a base TestCaseEditor for rulests to derive
2018-03-12 19:43:52 +09:00
Dean Herbert
ab4c527ebc
Merge branch 'master' into decoders
2018-03-12 13:38:22 +09:00
Dean Herbert
1d0a44a0bb
Merge branch 'master' into fix-login-failure
2018-03-12 12:41:45 +09:00
smoogipoo
6e51b74890
Merge remote-tracking branch 'origin/master' into rewrite-break-overlay
2018-03-12 09:47:05 +09:00
Dean Herbert
487a03d0d7
Merge branch 'master' into cursor-trail
2018-03-11 02:07:05 +09:00
Dean Herbert
9233266fe1
Fix login failure for users with no country rank
...
Closes #2148 .
2018-03-11 00:44:16 +09:00
smoogipoo
4103c66cff
Move selection overlay to HitObjectOverlayLayer for extensibility
2018-03-10 00:48:57 +09:00
naoey
2c0488b1f1
Invert bool, add test, and handle ruleset change.
2018-03-09 19:39:28 +05:30
Dean Herbert
217dd2ecdc
Initial push for better decoders
2018-03-09 21:24:15 +09:00
naoey
d04f47718f
Make song select choose random when initial selection fails.
...
- Revert TestCasePlaySongSelect to master
2018-03-09 17:36:55 +05:30
Dean Herbert
81c1ec2005
Merge branch 'master' into fix-unplayable-beatmaps
2018-03-08 13:02:57 +09:00
Dean Herbert
91c984ed97
Merge branch 'master' into rewrite-break-overlay
2018-03-08 09:31:59 +09:00
Dean Herbert
81b778fdcf
Merge branch 'master' into cursor-trail
2018-03-08 09:31:42 +09:00
Dean Herbert
e55a503f79
Tidy up test case
2018-03-08 00:58:16 +09:00
naoey
983cefbe40
Add VisualTest.
2018-03-07 19:08:26 +05:30
Dean Herbert
6a768e378a
Merge branch 'master' into rewrite-break-overlay
2018-03-07 17:00:34 +09:00
Dean Herbert
c176e309e1
Merge branch 'master' into volume-control
2018-03-07 14:03:09 +09:00
Dean Herbert
7b18e8a5ca
Merge branch 'master' into fix-taiko-conversion
2018-03-06 01:16:47 +09:00
Dean Herbert
792a3ac469
SkipButton -> SkipOverlay
2018-03-06 00:10:53 +09:00
smoogipoo
a6b6c016d6
Fix beatmap decoder tests
2018-03-05 16:14:36 +09:00
Dean Herbert
e46f363fdc
Fix failing unit test
2018-03-04 22:46:50 +09:00
jorolf
0a571278c9
change TestCase to OsuTestCase
2018-03-04 14:03:53 +01:00
jorolf
ec013dbee8
remove blank line and try to get test case working
2018-03-03 21:55:19 +01:00
jorolf
bafcab1349
redo the test case
2018-03-03 20:20:07 +01:00
jorolf
033d066520
blank line
2018-03-03 20:03:24 +01:00
jorolf
ba80cd5f34
OsuColour can't be used in TestCases..?
2018-03-03 20:01:39 +01:00
jorolf
9293ec635a
add license headers and remove blank line
2018-03-03 19:49:38 +01:00
jorolf
9a29c53c5e
Merge branch 'master' of git://github.com/ppy/osu into volume-control
2018-03-03 19:09:08 +01:00
jorolf
3a420ba826
add the volume overlay
2018-03-03 19:08:35 +01:00
Dean Herbert
0e928429d4
Merge branch 'master' into ruleset-replayframes
2018-03-04 01:57:43 +09:00
Dean Herbert
c6c55c40ed
Rewrite BreakOverlay
...
No longer relies on Schedule calls (could not be rewound).
Also no longer sucks.
2018-03-04 00:51:24 +09:00
naoey
a57dc154f9
More specific tests.
2018-03-03 20:34:29 +05:30
jorolf
bd75422d88
Merge branch 'master' of git://github.com/ppy/osu into volume-control
2018-03-03 14:10:50 +01:00
naoey
307147a8a3
Merge remote-tracking branch 'upstream/master' into fix-unplayable-beatmaps
2018-03-03 16:10:22 +05:30
naoey
fb724ca8a7
Make song select ensure current beatmap is always playable in the active ruleset.
...
- Add a to TestCasePlaySongSelect testing this scenario
2018-03-03 16:09:24 +05:30
smoogipoo
3d5fefae8c
Add TestFixtureAttribute to all tests
2018-03-02 15:34:31 +09:00
Dean Herbert
c54c1699bf
Merge branch 'master' into ruleset-replayframes
2018-03-01 22:26:16 +09:00
smoogipoo
91460f27da
Fix incorrect isForCurrentRuleset value
2018-03-01 02:28:14 +09:00
jorolf
46dfb761c5
basic volume meter and testcase
2018-02-28 16:14:52 +01:00
Dean Herbert
36beaffa7a
Merge branch 'master' into editor-hitobject-overlays
2018-02-28 23:48:54 +09:00
Dean Herbert
9b44f447ca
Fix song select iteration when all panels are filtered
...
Resolves #2069 .
2018-02-27 17:52:12 +09:00
Dean Herbert
bdd88303b3
Merge branch 'master' into editor-hitobject-overlays
2018-02-26 17:53:50 +09:00
smoogipoo
1e1df2aaff
Fix up testcases
2018-02-23 21:04:19 +09:00
smoogipoo
07252254eb
Fix post-merge issues
2018-02-22 14:22:04 +09:00
smoogipoo
99e9eb81f2
Merge remote-tracking branch 'origin/master' into editor-hitobject-overlays
2018-02-22 14:16:01 +09:00
smoogipoo
ded2644df8
Merge branch 'master' into editor-hitobject-overlays
2018-02-22 14:08:36 +09:00
Dean Herbert
b74cfffc6f
Merge branch 'master' into editor-hitobject-movement
2018-02-22 13:19:39 +09:00
Dean Herbert
31edcfa35c
Attempt to fix beatmap carousel test failures
...
As seen here: https://ci.appveyor.com/project/peppy/osu/build/master-7260#L1164
Potentially was continuing operation too early.
2018-02-21 16:14:45 +09:00
smoogipoo
6b8b39abc5
Rewrite SelectionLayer testcase to construct an entire HitObjectComposer
2018-02-21 11:07:42 +09:00
smoogipoo
ad2f556133
Add hitobject overlays to selected hitobjects
2018-02-20 18:01:45 +09:00
smoogipoo
2c37a7e19f
Rewrite SelectionLayer testcase to construct an entire HitObjectComposer
2018-02-20 13:50:55 +09:00
Dean Herbert
f41a40be15
Merge branch 'master' into editor-hitobject-movement
2018-02-19 17:59:50 +09:00
smoogipoo
4898c321f8
Merge branch 'osu-rulesetcontainer-aspect' into editor-hitobject-movement
2018-02-19 17:07:03 +09:00
Dean Herbert
58af66bfc0
Merge branch 'master' into editor-hitobject-movement
2018-02-16 13:59:11 +09:00
Dean Herbert
d3dd31dadb
Make deletion and purging logic even more global
2018-02-15 14:22:39 +09:00
Dean Herbert
d340509b1d
Move ArchiveReaders to a more global namespace
...
Also moves delete and action logic to a shared implementation
2018-02-15 14:22:39 +09:00
Dean Herbert
e0d28564d0
Move import logic to shared implementation
2018-02-15 14:22:39 +09:00
Dan Balasescu
9f7736fab3
Merge branch 'master' into restore-ruleset-tests
2018-02-14 22:48:29 +09:00
Dean Herbert
58f20c3723
Merge branch 'master' into editor-hitobject-movement
2018-02-13 18:56:16 +09:00
Dean Herbert
a738664167
Add interface for database context factory
2018-02-12 23:10:05 +09:00
smoogipoo
e10bb2db05
Unify SelectionLayer and HitObjectCapturer, rename SelectionBox
2018-02-12 18:35:01 +09:00
smoogipoo
ee168f9a77
Split out drag selection box from post-capture box
...
Cleans up a lot of code, removes handles for now.
2018-02-12 18:20:05 +09:00
Dean Herbert
edc3638175
DatabaseWriteUsage
2018-02-12 17:55:11 +09:00
smoogipoo
1adbe3585c
HitObjectSelectionBox -> SelectionDragger
2018-02-12 16:03:59 +09:00
smoogipoo
cfb2b3f1e8
Rework SelctionLayer to support click-selections
2018-02-12 16:02:42 +09:00
Dean Herbert
9ed05543d7
Fix post-test conditionals from being inverse of what we want to test
2018-02-12 15:39:00 +09:00
Dean Herbert
264a0f59e2
Fix duplicate test name
2018-02-12 12:22:13 +09:00
Dean Herbert
721bb7e4dd
Add proper handling for OnlineBeatmapSetID conflicts
...
Not yet working
2018-02-09 21:31:33 +09:00
Dean Herbert
541068235d
Test import twice in a row
2018-02-09 18:23:06 +09:00
Dean Herbert
623ba652ed
Share more code between tests
2018-02-09 18:20:18 +09:00
Dean Herbert
981fa379b7
Count() -> Count
2018-02-09 18:02:28 +09:00
Dean Herbert
a771ca4077
Add try-finally to ensure host is exited
2018-02-09 18:02:06 +09:00
Dean Herbert
8140ffea15
Add test for deleting then reimporting
2018-02-09 17:59:27 +09:00
Dean Herbert
a166932468
Add deletion test
2018-02-09 17:51:29 +09:00
smoogipoo
b500b76407
Merge branch 'master' into update-branch
2018-02-08 23:35:48 +09:00
Dean Herbert
d8da68c55f
Disable test again (accidentally re-enabled)
2018-02-08 17:22:23 +09:00
Dean Herbert
789e25069f
Fix non-visual tests not cleaning up previous executions
2018-02-08 17:07:59 +09:00
smoogipoo
86d63c014b
Merge remote-tracking branch 'origin/master' into restore-ruleset-tests
2018-02-08 14:48:01 +09:00
smoogipoo
4f5bfdb888
Remove explicit .Exit on IPC test
2018-02-08 14:03:37 +09:00
smoogipoo
ccc948a0b9
Update framework (testing)
2018-02-08 12:45:51 +09:00
smoogipoo
93f1500278
Merge remote-tracking branch 'origin/master' into fix-import-tests
2018-02-08 12:40:05 +09:00
Dean Herbert
67bd375bfa
Merge remote-tracking branch 'upstream/master' into raw-input-fixes
2018-02-07 22:05:44 +09:00
Dean Herbert
647cc4bdad
Remove in-between properties
2018-02-07 18:04:32 +09:00
smoogipoo
74016a1482
Make sure the import tests exit their hosts
2018-02-07 15:57:16 +09:00
tgi74000
bcd568e607
Check for possible null ranks
2018-02-06 23:00:52 +01:00
Dean Herbert
dfc344b47a
Update OpenTK version
2018-02-06 13:47:54 +09:00
smoogipoo
cf39236fc1
Make NUnit tests run locally again
2018-02-05 18:29:58 +09:00
Dean Herbert
6b35ef7063
Update OpenTK version
2018-02-05 16:13:30 +09:00
Dan Balasescu
c1d5a68e4d
Merge branch 'master' into VisualSettingsOverlay
2018-02-01 16:37:04 +09:00
Dan Balasescu
d332a2dddd
Merge branch 'master' into url-parsing-support
2018-02-01 16:13:32 +09:00
Dean Herbert
2ffe16d3d2
Improve clarity and coverage of unit tests
2018-01-30 18:57:42 +09:00
smoogipoo
58cdb59a27
Fix failing testcase
2018-01-30 18:22:40 +09:00
Dean Herbert
28b67e3d77
Merge branch 'master' into url-parsing-support
2018-01-30 17:47:55 +09:00
Dean Herbert
e5188fd151
Add better channel test cases (testing non-existent channels)
2018-01-30 17:43:19 +09:00
Dean Herbert
1dbaf9b7a7
Add many more tests
2018-01-30 16:38:18 +09:00
Dean Herbert
1920a4e029
Prepare tests for fixing
2018-01-29 18:47:14 +09:00
Dean Herbert
f996acd7e6
Add back old non-visual tests
2018-01-29 18:37:11 +09:00
Dean Herbert
c07a31a484
Add new (failing) tests
2018-01-29 17:45:39 +09:00
Dean Herbert
df221b6786
Remove usage of ValueTuple to allow for dynamic recompilation
2018-01-29 17:45:23 +09:00
Dean Herbert
a5b0d51205
Merge remote-tracking branch 'upstream/master' into url-parsing-support
...
# Conflicts:
# osu.Game/osu.Game.csproj
2018-01-27 14:06:58 +09:00
TocoToucan
615c831069
Merge from ppy/master
2018-01-26 21:56:17 +03:00
FreezyLemon
cff3f25cd7
make all line endings CR LF (windows style)
2018-01-26 12:46:58 +01:00
FreezyLemon
8f0ab2040f
Add Jetbrains.Annotations NuGet package
2018-01-26 12:46:28 +01:00
james58899
fa800f0977
fix storyboard path
2018-01-23 18:18:54 +08:00
smoogipoo
4780c3f8c6
Disable TestCaseWaveform
2018-01-22 13:41:47 +09:00
TocoToucan
e88f514cf4
Resolve merge conflicts
2018-01-21 18:32:21 +03:00
Dan Balasescu
be225eff90
Merge branch 'master' into fix-replays
2018-01-17 18:01:41 +09:00
smoogipoo
da793d91ea
Make a testcase for replay vs autoplay
2018-01-17 17:35:27 +09:00
Dean Herbert
54b0f4b912
Merge branch 'master' into url-parsing-support
2018-01-17 16:16:55 +09:00
smoogipoo
06f0f2093c
Add a sample way to have local cursors move beyond their bounds
2018-01-16 20:35:39 +09:00
smoogipoo
a5415b99ae
Visualise the hovered drawabe
2018-01-16 20:35:13 +09:00
Dean Herbert
5edff5c5fc
Merge branch 'master' into fix-cursor-hiding
2018-01-16 18:15:22 +09:00
smoogipoo
d230fd486e
Add automated cursor testcase
2018-01-16 15:28:00 +09:00
TocoToucan
3c11978cfa
Use local functions
2018-01-15 21:42:17 +03:00
TocoToucan
a81f32a388
PlayerGroup -> PlayerSettingsGroup
2018-01-15 20:52:52 +03:00
TocoToucan
d3afbdaac6
Resolve merge conflict
2018-01-13 22:32:56 +03:00
TocoToucan
43d2ae348a
Rename ReplaySomething -> PlayerSomething
2018-01-13 22:25:09 +03:00
Dean Herbert
45301d07fd
Merge branch 'master' into url-parsing-support
2018-01-12 19:34:44 +09:00
Dean Herbert
29c8400ec7
Merge branch 'master' into scrolling-hitobjects-rewrite
2018-01-12 17:35:24 +09:00
Dean Herbert
8f7c048c4e
Merge branch 'master' into expand-social-tab
2018-01-12 15:54:42 +09:00
smoogipoo
ab762045d6
Move back to using load(), fix testcase
2018-01-11 16:51:46 +09:00
smoogipoo
428f8b6670
Fix up license header
2018-01-11 15:08:56 +09:00
smoogipoo
86b5591583
Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite
2018-01-10 18:02:49 +09:00
Dean Herbert
58626e3b30
Allow rulesets to create their own instantiation info
2018-01-10 17:04:07 +09:00
FreezyLemon
3bf9901dd2
Fixed bugs and added tests
2018-01-09 16:11:45 +01:00
Dean Herbert
1c9e9cb8af
Merge branch 'master' into expand-social-tab
2018-01-09 21:08:26 +09:00
Dean Herbert
72624aea18
Use a better method of link compilation
...
Adds word wrap back, simplifies a lot.
2018-01-09 20:33:20 +09:00
Dean Herbert
1be0569743
Update licence headers
2018-01-09 14:34:52 +09:00
Dean Herbert
b035a92bda
Merge branch 'master' into url-parsing-support
2018-01-09 14:28:20 +09:00
Dean Herbert
722eb2515f
Improve variable names
2018-01-09 12:44:52 +09:00
Dean Herbert
b90b1e326e
Merge branch 'master' into fix-randomizer
2018-01-09 12:00:21 +09:00
smoogipoo
117ab8a26d
Split out scrolling algorithm
2018-01-07 13:23:16 +09:00
Aergwyn
e6b581e259
Merge branch 'master' into expand-social-tab
2018-01-06 10:48:27 +01:00
smoogipoo
7526225282
Use DP for most of the code to avoid unnecessary computations
2018-01-05 20:56:21 +09:00
Dean Herbert
37d393bca0
Update licence headers
2018-01-05 20:21:19 +09:00
smoogipoo
36e9232472
Merge master into netstandard
2018-01-05 00:42:48 +09:00
Aergwyn
038fa682f7
Merge branch 'master' into expand-social-tab
2018-01-04 11:49:35 +01:00
Aergwyn
bf64b8fc69
added hover effects to panels in social
...
at least partially QQ
2018-01-04 11:42:50 +01:00
smoogipoo
a7aab21a29
Re-namespace files
2018-01-04 19:22:15 +09:00
smoogipoo
e0c921ff5c
Split out ScrollingHitObjectContainer into new file
2018-01-04 19:20:43 +09:00
smoogipoo
651e24e3cc
Implement proper scrolling directions
2018-01-04 19:17:40 +09:00
smoogipoo
f34131f8f4
Initial game-wide replacement of scrolling playfields
2018-01-04 18:50:17 +09:00
smoogipoo
b11f4ab834
Implement control points
2018-01-04 18:35:48 +09:00
smoogipoo
90839e6d56
Test case improvements with TimeRange testing
2018-01-04 17:07:33 +09:00
smoogipoo
c067ee5fbe
Move position calculation to UpdateAfterChildren
...
Because we want this to occur after lifetimes have been evaluated.
2018-01-04 16:38:43 +09:00
smoogipoo
210fd290e5
Use the new AliveObjects
2018-01-04 16:38:20 +09:00
smoogipoo
b968040963
General improvements to testcase
2018-01-04 16:38:07 +09:00
smoogipoo
7beb4c3507
Initial implementation of a new scrolling hitobject container
2018-01-04 16:21:15 +09:00
Aergwyn
988f6ac901
fix SortDirection default to descending when retrieved data is ascending
2018-01-03 17:53:50 +01:00
Endrik Tombak
1a8471bc37
Replace not Filtered with Visible
2018-01-03 15:58:09 +02:00
Endrik Tombak
843e9c53c0
Add test cases for new randomizer behaviour
2018-01-03 15:38:43 +02:00
smoogipoo
823a430d30
Nothing to see here, move along
2018-01-03 22:02:54 +09:00
smoogipoo
da5bc959ad
Fix testcase
2018-01-03 21:46:39 +09:00
Dan Balasescu
2a6068f8e7
Merge branch 'master' into fix-play-song-select-tests
2018-01-03 14:12:49 +09:00
Dean Herbert
31b875b7cd
Add test for unranked mod using mania random
2018-01-03 13:42:09 +09:00
Dean Herbert
faf1181fc3
Merge branch 'master' into url-parsing-support
2018-01-02 17:51:50 +09:00
Dean Herbert
3a7098340a
Add test for unimplemented mod
2018-01-02 16:58:22 +09:00
Dean Herbert
f10a19ada1
Update tests to only use implemented mods
2018-01-02 16:55:15 +09:00
Dean Herbert
2079b7239c
Merge branch 'master' into result-page-date-order
2017-12-31 13:11:55 +09:00
Dean Herbert
02514d4228
Update tests to account for correct beatmap displaying on details area
2017-12-31 12:54:27 +09:00