smoogipoo
53a39e9142
Merge remote-tracking branch 'origin/master' into audio-refactor-update
2019-06-04 10:50:33 +09:00
Dean Herbert
a5a025de68
Add proper tests
2019-06-04 10:26:35 +09:00
Dean Herbert
1eab4e179d
Add sample action to test so hover effect is visible
2019-06-03 17:10:33 +09:00
Dean Herbert
e32f62db5b
Add missing file
2019-06-03 16:48:44 +09:00
Dean Herbert
17d04545fa
Localise GridTestScene as an OsuGridTestScene
2019-06-03 16:45:18 +09:00
Dean Herbert
e55f5efa82
Merge branch 'osu-clickable-container' into settings-footer-show-changelog-current-build
2019-06-03 13:55:23 +09:00
Dean Herbert
3ef17a54f6
Fix sizing of OsuAnimatedButton and OsuClickableContainer
...
Was incorrect under some combinations of relative and autosize usage.
2019-06-03 13:53:24 +09:00
Dean Herbert
b249fb3544
Update test scene to support dynamic compilation
2019-06-03 13:37:29 +09:00
Dean Herbert
115a75e4c6
Use a constant for lazer variables
2019-06-03 13:16:05 +09:00
Dean Herbert
dff7053a07
Merge branch 'master' into more_button_update
2019-06-03 11:48:05 +09:00
Dean Herbert
2d15e02406
Merge branch 'master' into selection-update
2019-06-03 11:47:30 +09:00
EVAST9919
6957b20309
Merge remote-tracking branch 'refs/remotes/ppy/master' into underscored_link
2019-06-03 03:13:46 +03:00
Lucas A
b3f6640d11
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-31 12:41:26 +02:00
Dean Herbert
a2fbcb2bd3
Fix rebase regressions
2019-05-31 15:58:46 +09:00
Dean Herbert
d1d1c4ee7a
Add lead-in tests
2019-05-31 15:50:46 +09:00
Dean Herbert
b52276c489
Pass individual components to DummyWorkingBeatmap, not game
2019-05-31 14:51:12 +09:00
Dean Herbert
f33a5bc54c
Centralise and update WorkingBeatmap creation in test cases
2019-05-31 14:40:53 +09:00
smoogipoo
c211f1d0fe
Merge remote-tracking branch 'Joehuu/master' into changelog-overlay
2019-05-31 12:28:28 +09:00
EVAST9919
cfa0ef6fd9
convert field to a local variable
2019-05-30 23:22:08 +03:00
EVAST9919
fe9e53e383
Add a testcase
2019-05-30 23:07:04 +03:00
RedMindZ
41305dc6e1
Merge branch 'master' into autopilot
2019-05-30 16:04:58 +03:00
EVAST9919
52fad723a2
Implement DrawableMostPlayedBeatmap
2019-05-29 19:51:59 +03:00
Dean Herbert
a1cc8c448f
Update TrackVirtual consumption
2019-05-29 16:43:27 +09:00
Dean Herbert
08ab1e5df7
Use new ITrackStore interface
2019-05-29 16:43:15 +09:00
Dean Herbert
a20eda7b5f
Fix remaining cases to work without things
2019-05-28 23:54:42 +09:00
David Zhao
1a871af552
Fix hide selection, add test
2019-05-28 19:15:29 +09:00
Dean Herbert
4ca34bd5e8
Update osu! in line with audio subsystem refactor
2019-05-28 17:06:01 +09:00
David Zhao
436760de96
Change test name
2019-05-28 14:34:52 +09:00
David Zhao
e59a00ac6e
Remove excessive selection updating
2019-05-28 14:04:33 +09:00
Dean Herbert
601b25f05e
Merge remote-tracking branch 'upstream/master' into tournament-tools
2019-05-25 19:10:44 +09:00
Lucas A
a819dd764f
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-25 11:02:19 +02:00
EVAST9919
cda97a61fa
Add a bit of smoothness to the rank graph
2019-05-24 19:43:53 +03:00
RedMindZ
63d2f41ea7
Merge branch 'master' into autopilot
2019-05-23 14:33:30 +03:00
Dean Herbert
0bce7241d2
Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay
2019-05-23 17:54:13 +09:00
smoogipoo
edfe47fb02
Rename button
2019-05-23 13:37:25 +09:00
RedMindZ
0fb823fe4a
Merge branch 'master' into autopilot
2019-05-22 15:43:35 +03:00
Dean Herbert
b588638740
Use TabControl instead of custom logic
2019-05-22 19:51:16 +09:00
Dean Herbert
9f9e86f18c
Rename classes and fix back-to-front state
2019-05-22 17:04:21 +09:00
Dean Herbert
1d5b7cdec0
Add ExpandingBar UI element
2019-05-22 16:44:47 +09:00
Dean Herbert
92c991494d
Fix (and rename) ExpandingBar
2019-05-22 16:38:15 +09:00
Dean Herbert
555822a68d
Remove unnecessary brackets
2019-05-22 13:28:41 +09:00
Dean Herbert
8025a97b2b
Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay
2019-05-21 17:18:23 +09:00
Dean Herbert
7169eb67d2
Merge branch 'master' into abstract-profile-header
2019-05-21 15:33:47 +09:00
Dean Herbert
e8f64247c5
Merge branch 'master' into consolidate-loader-testcase
2019-05-21 15:12:44 +09:00
smoogipoo
aed4634fe0
Consolidate loader animation tests
2019-05-21 14:48:14 +09:00
Dean Herbert
a18e0b3b2f
Fix test scene
2019-05-21 14:46:12 +09:00
Dean Herbert
d1616e09b6
Merge branch 'fix-spritetext-usage' into HoutarouOreki-changelog-overlay
2019-05-21 14:18:01 +09:00
Dean Herbert
4ac2acbfc0
Fix usages of SpriteText (instead of OsuSpriteText)
2019-05-21 14:13:52 +09:00
Dean Herbert
aba945934d
Move OverlayHeaderTabControl to correct namespace
2019-05-21 13:58:12 +09:00
Dean Herbert
5a9c3ab9fa
Move UserProfileOverlay's header into an abstract implementation
2019-05-21 13:58:03 +09:00
Dean Herbert
340b207fa0
Delete breadcrumb implementation
2019-05-21 13:37:35 +09:00
Dean Herbert
9a769c9f15
Move OverlayHeaderTabControl to correct namespace
2019-05-21 13:36:31 +09:00
Dean Herbert
a5bd3262be
Move UserProfileOverlay's header into an abstract implementation
2019-05-20 18:02:13 +09:00
Dean Herbert
3fa1545ea4
Huge refactor pass focusing on ChangelogContent
2019-05-19 02:09:08 +09:00
Dean Herbert
e93fea7dc3
Merge remote-tracking branch 'upstream/master' into tournament-tools
2019-05-18 19:20:44 +09:00
Dean Herbert
5d6c599129
Merge remote-tracking branch 'upstream/master' into changelog-overlay
2019-05-18 15:45:40 +09:00
smoogipoo
ccbf3ff812
Update framework
2019-05-17 22:35:23 +09:00
Tav TaOr
7575af6f42
Merged master into autopilot
2019-05-17 14:15:30 +03:00
Dean Herbert
2d56413e35
Update namespaces
2019-05-17 19:15:59 +09:00
Dean Herbert
c41ec20236
Improve load and switch logic between views
2019-05-17 18:31:53 +09:00
Dean Herbert
e94b9feebd
Fix dynamic recompilation in TestSceneChangelogOverlay
2019-05-17 18:31:53 +09:00
David Zhao
fcffad6553
Merge remote-tracking branch 'upstream/master' into buttonsystem-entermode
2019-05-17 11:35:35 +09:00
David Zhao
5bf513eba8
Don't track immediately when entering mode
2019-05-17 11:24:34 +09:00
Lucas A
5a72d509f2
Resolve merge conflicts
2019-05-16 18:48:15 +02:00
Dean Herbert
5d33a742c6
Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay
2019-05-16 18:55:28 +09:00
Dean Herbert
1ccef61f7b
Fix some missed instances of TestCase
2019-05-15 18:32:29 +09:00
Dean Herbert
19a179db92
Bring up-to-date with master
2019-05-15 18:30:02 +09:00
Dean Herbert
a717970e11
Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay
2019-05-15 18:27:51 +09:00
Dean Herbert
60d244d2d6
Clean up events and states
2019-05-15 18:08:19 +09:00
Dean Herbert
f49b0dc16d
Initial clean-up pass of breadcrumb and header
2019-05-15 17:55:26 +09:00
smoogipoo
5f56c38475
Merge remote-tracking branch 'origin/master' into rename_test_case
2019-05-15 15:52:06 +09:00
Dean Herbert
88528e797f
Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay
2019-05-15 14:24:45 +09:00
Dean Herbert
e7409a28a3
Merge branch 'move-screen-dependencies' into tournament-tools
2019-05-15 13:05:12 +09:00
Dean Herbert
1fd44d7945
Move OsuScreenDependencies to GameBase
2019-05-15 13:00:11 +09:00
Dean Herbert
7b56180b8b
Merge remote-tracking branch 'upstream/master' into tournament-tools
2019-05-15 12:08:23 +09:00
Roman Kapustin
459a285cd8
Rename test cases to test scenes inline with the framework change
2019-05-14 22:37:25 +03:00
Lucas A
2d966682dc
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-14 18:09:58 +02:00
Dean Herbert
2200959dd0
Merge branch 'master' into remember-fps-display-state
2019-05-14 19:19:46 +09:00
Dean Herbert
4c221e43a9
Apply minimal changes to make framework compile
2019-05-14 18:39:56 +09:00
smoogipoo
d5e25c05b3
Increase loader animation test wait
2019-05-14 18:39:03 +09:00
Dan Balasescu
d3d20773ee
Merge branch 'master' into fullscreen-overlay
2019-05-14 17:40:20 +09:00
Dean Herbert
0fc43afd34
Merge branch 'master' into HoutarouOreki-changelog-overlay
2019-05-14 17:35:14 +09:00
Dean Herbert
aff239a4fb
Merge branch 'fullscreen-overlay' into HoutarouOreki-changelog-overlay
2019-05-14 17:33:30 +09:00
Dean Herbert
a765f2502d
Add simple test case for FullscreenOverlay
2019-05-14 15:14:00 +09:00
Dean Herbert
ca2662e941
Rename incorrectly named test cases
2019-05-14 14:58:36 +09:00
Dean Herbert
cc558cf073
Merge branch 'add-new-colours' into HoutarouOreki-changelog-overlay
2019-05-14 13:36:17 +09:00
Dan Balasescu
157ba01d60
Merge branch 'master' into tidy-osu-game
2019-05-14 12:19:39 +09:00
Dean Herbert
a98accb4d4
Add tests for cached types in OsuGame and OsuGameBase
2019-05-14 11:05:53 +09:00
Dean Herbert
7553e2da25
Fix incorrect DI reference and update naming of SettingsOverlay classes
2019-05-14 10:45:05 +09:00
Dean Herbert
d18504bfe0
Attempt to fix pause test failures by reducing steps
2019-05-13 19:23:38 +09:00
Dean Herbert
8ecd1912e1
Split out web response classes into own files
2019-05-13 17:24:33 +09:00
Dean Herbert
4b8a9bae34
Remove unused test case
2019-05-13 17:17:20 +09:00
Dean Herbert
27ca094421
Update outdated licence headers
2019-05-13 17:14:52 +09:00
Lucas A
1fe4d20d9b
Fix references to UserActivities in Tests
2019-05-12 17:47:02 +02:00
Dean Herbert
31b72f168d
Fix deprecated calls and code styling (partly)
2019-05-13 00:46:22 +09:00
Lucas A
18fc965d7a
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-12 17:39:13 +02:00
Dean Herbert
34f54aa945
Resolve compile-time issues
2019-05-13 00:36:05 +09:00
Dean Herbert
943e1574a4
Merge branch 'master' into changelog-overlay
2019-05-13 00:24:18 +09:00
RedMindZ
a3daefe668
Merge branch 'master' into autopilot
2019-05-12 16:27:31 +03:00
Tav TaOr
fca1b9325d
Deleted the assistMods variable since it is never used
2019-05-12 16:18:27 +03:00
Tav TaOr
dfd7b11114
Changed the unimplemented mod test to use OsuModSpunOut instead of OsuModAutopilot since Autopilot is implemented now.
2019-05-12 16:04:37 +03:00
Dean Herbert
82599127fd
Merge branch 'master' into patch-1
2019-05-12 20:30:25 +09:00
Paul Teng
7adaa09263
Move tab channel class into tab item class
2019-05-12 06:31:11 -04:00
Paul Teng
d53fb9a5c8
Check against type instead of channel name
2019-05-12 06:11:16 -04:00
Lucas A
5ac6bd8204
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-12 11:53:30 +02:00
Dean Herbert
3566da73cc
Merge branch 'master' into fix-more-pause-cases
2019-05-12 15:57:45 +09:00
Dean Herbert
f5d7330a20
Fix player loader testcase potentially failing ( #4720 )
...
Fix player loader testcase potentially failing
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-05-12 13:18:38 +09:00
smoogipoo
bde2d552b6
Merge remote-tracking branch 'origin/master' into fix-more-pause-cases
...
# Conflicts:
# osu.Game.Tests/Visual/Gameplay/TestCasePause.cs
2019-05-10 22:16:59 +09:00
smoogipoo
3352252e00
Fix testcase regression
2019-05-10 18:21:07 +09:00
Dean Herbert
97796a8578
Attempt to fix failing tests by delaying starting of the gameplay clock
2019-05-10 18:10:07 +09:00
smoogipoo
7c105fd99f
Fix testcase players pausing on window unfocus
2019-05-10 15:39:25 +09:00
Dean Herbert
3c796bcfda
Merge branch 'master' into fix-player-testcase
2019-05-10 13:20:22 +09:00
Dean Herbert
3bcfc86b9c
Allow custom MaxCatchUpFrames to be specified
...
Also adjusts the default to allow for smoother seeking.
2019-05-09 16:39:03 +09:00
Dean Herbert
66594b7a1b
Pass GameplayStartTime to FrameStabilityContainer to allow bypassing prior to start
2019-05-09 16:39:03 +09:00
Dan Balasescu
22940373a0
Merge branch 'master' into zoomablescrollcontainer-fix
2019-05-09 13:54:21 +09:00
Dean Herbert
5b1ae1210a
Add more asserts to pause test in an attempt to track down intermittent test failures
2019-05-09 11:31:40 +09:00
Dean Herbert
5dbf57046e
Fix regression from removing unused variable
2019-05-09 10:38:22 +09:00
smoogipoo
9c01f6793e
Remove unused variable
2019-05-08 23:52:44 +09:00
smoogipoo
9b279f324f
Adjust testcase to avoid random failures
2019-05-08 23:40:01 +09:00
Dean Herbert
29fdfefafc
Merge branch 'master' into fix-player-testcase
2019-05-08 17:30:03 +09:00
David Zhao
ff3c226596
Give ZoomableScrollContainer an initial width
2019-05-08 13:37:03 +09:00
Lucas A
a5f758b977
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-07 18:27:14 +02:00
smoogipoo
a00e2b18a9
Fix background unloading/reloading sometimes crashing
2019-05-07 17:24:05 +09:00
smoogipoo
1d2db85866
Improve background sprite testcase
2019-05-07 17:23:44 +09:00
Dean Herbert
8bc313fb33
Merge branch 'master' into fix-new-inspections
2019-05-07 14:14:40 +09: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
3661ddbff6
Fix player loader testcase potentially failing
2019-05-07 13:02:19 +09:00
Lucas A
a50bbf7f42
Make appveyor happy.
2019-05-05 21:32:23 +02:00
Lucas A
3d8b56fe57
Fix user status related unit tests
2019-05-05 21:11:52 +02:00
Lucas A
8beb2f6e90
Remove hackery from unit tests.
2019-05-05 21:01:35 +02:00
Dean Herbert
3e3f12f277
Use more local bindables
2019-05-04 17:53:17 +09:00
Lucas A
a4a2ce5ec0
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-02 21:36:28 +02:00
Lucas A
5d4aa5a12e
Add ScreenStatus property to change the OsuScreen's status + Renamed old ScreenStatus property to InitialScreenStatus
2019-05-02 20:51:19 +02:00
Lucas A
84b41b3886
Split out setUserStatus() logic to multiple lines. +
...
Make UserStatusDoNotDisturb inherit from UserStatus
2019-05-02 19:44:07 +02:00
Lucas A
e02def58f3
Fix tests failing
2019-05-01 19:20:18 +02:00
iiSaLMaN
3b03ca802a
Merge branch 'master' into sh-xh-grading-2
2019-04-30 18:55:35 +03:00
Lucas A
7e42068a14
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-04-28 19:48:35 +02:00
Dean Herbert
754bebadbe
Merge branch 'master' into improve-waveform-test
2019-04-28 23:38:24 +09:00
iiSaLMaN
b08fb5136e
Merge branch 'master' into sh-xh-grading-2
2019-04-26 10:38:10 +03:00
smoogipoo
2f4bf423a4
Renamespace
2019-04-26 13:51:39 +09:00
smoogipoo
838325fed4
Remove HasTooltipContainer, use separate composites
2019-04-26 11:58:45 +09:00
KingLuigi4932
4e0f21102b
Merge branch 'sh-xh-grading-2' of https://github.com/iiSaLMaN/osu into sh-xh-grading-2
2019-04-25 14:04:12 +03:00
KingLuigi4932
c6b3197dd0
Add AdjustRank and use it in Hidden Mod
2019-04-25 13:56:57 +03:00
smoogipoo
9d5b81165e
Adjust button stylings
2019-04-25 19:51:05 +09:00
smoogipoo
0eca9b9683
Center -> centre
2019-04-25 18:43:29 +09:00
smoogipoo
b33c0e9a93
Cleanup bottom header container
2019-04-25 18:42:19 +09:00
smoogipoo
3b0d4c1bad
Merge branch 'turn-on-warnings' into profile-header-update
2019-04-25 17:43:10 +09:00
smoogipoo
0bd35ab7bb
Turn on warnings, resolve issues
2019-04-25 17:36:17 +09:00
Dan Balasescu
9fa8f62077
Merge branch 'master' into update-framework
2019-04-25 12:25:17 +09:00
Dean Herbert
f273f5daae
Remove unnecessary using statement
2019-04-24 15:55:51 +09:00
Dean Herbert
3b36a4982d
Fix tests running under nUnit and running multiple times in concession
2019-04-24 15:46:49 +09:00
Dean Herbert
a3e7ec0a14
Add tests for FrameStabilityContainer
2019-04-24 15:25:53 +09:00
smoogipoo
a47f5040af
Improve waveform graph testing
2019-04-22 13:58:05 +09:00
Lucas A
fe8c705f1b
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-04-20 09:42:32 +02:00
smoogipoo
489929d25c
Fix PlayerLoader testcase being completely broken
2019-04-19 20:38:38 +09:00
smoogipoo
d3920d652d
Fix loader animation test case
2019-04-19 20:38:38 +09:00
Dean Herbert
2d7b3094ba
Merge branch 'master' into player-mod-reinstantiation
2019-04-17 16:42:57 +08:00
smoogipoo
c145ce2d00
Remove usings
2019-04-17 17:19:55 +09:00
smoogipoo
09568be270
Merge remote-tracking branch 'origin/master' into facade-container
...
# Conflicts:
# osu.Game/Screens/Play/PlayerLoader.cs
2019-04-17 17:17:33 +09:00
smoogipoo
106e77c3d7
Cleanup testcase
2019-04-17 17:15:23 +09:00
smoogipoo
5a3d6a0258
Fix post-merge errors
2019-04-17 16:11:59 +09:00
Dean Herbert
bb539af1a0
Merge branch 'master' into player-mod-reinstantiation
2019-04-16 22:35:21 +08:00
Lucas A
5887008fb3
Merge branch 'master' into user-status-wiring
2019-04-15 11:43:53 +02:00
Lucas A
361c0ec9f2
Allow UserStatusSoloGame to provide metadata such as the ruleset the current beatmap is played in
2019-04-13 13:18:44 +02:00
Lucas A
5ab278f9ea
Add missing user statuses to tests
2019-04-12 23:01:11 +02:00
smoogipoo
1db2d49696
Fix testcases
2019-04-10 17:54:57 +09:00
smoogipoo
0222424aef
Make mods IReadOnlyList<Mod> gamewide
...
Prevents potential multiple evaluations of enumerable.
2019-04-10 17:20:36 +09:00
smoogipoo
4310f07a5c
Rename SelectedMods -> Mods
2019-04-10 12:03:57 +09:00
jorolf
c1db635933
Merge branch 'master' of git://github.com/ppy/osu into profile-header-update
2019-04-09 20:42:39 +02:00
smoogipoo
aa2c97b859
Add mod reinstantiation testcase
2019-04-09 15:05:03 +09:00
smoogipoo
d8ec1e73a3
Cleanup TestCasePlayerLoader
2019-04-09 13:50:54 +09:00
smoogipoo
cbb3fdaca8
Fix various crashes due to bindable being disabled
2019-04-09 12:59:32 +09:00
smoogipoo
c584967eb1
Remove mods from workingbeatmap
2019-04-09 12:59:32 +09:00
David Zhao
a690302d00
Apply reviews
2019-04-08 15:24:09 +09:00
Dean Herbert
46ecaf3d6c
Merge branch 'master' into facade-container
2019-04-05 21:14:21 +09:00
David Zhao
c693d1fad8
Further condense steps
2019-04-05 15:48:48 +09:00
David Zhao
37ffe47e4b
Add back exception tests with better descriptions
2019-04-05 15:30:09 +09:00
David Zhao
e06fe7950b
Cleanup
2019-04-05 15:06:37 +09:00
David Zhao
5fa93f4a05
Add test for checking exception
2019-04-05 15:05:11 +09:00
David Zhao
7047f305a1
Apply reviews, add safety for multiple facades
2019-04-05 12:02:47 +09:00
smoogipoo
e13fffaca3
Make ScoreTable use TableContainer
2019-04-04 17:53:23 +09:00
David Zhao
456459cafa
Give flow container test long enough to finish
2019-04-04 13:25:24 +09:00
David Zhao
b2e932dc74
Clean up tests, xmldoc
2019-04-04 13:13:03 +09:00
David Zhao
f2bbde83bf
Use precision almost equals
2019-04-04 13:05:34 +09:00
David Zhao
15b2b6af7d
Clean up remaining assignments of logo relativePositionAxes
2019-04-04 11:28:36 +09:00
David Zhao
6b5458a625
Clean up test cases
2019-04-04 11:22:05 +09:00
jorolf
ba87136451
add gradient and fix remaining error
2019-04-04 00:57:15 +02:00
jorolf
ccc804a9b2
get everything working again
2019-04-04 00:24:42 +02:00
jorolf
5bc6042309
Merge branch 'master' of git://github.com/ppy/osu into profile-header-update
2019-04-03 22:59:27 +02:00
David Zhao
8a40b27e8f
Remove need for logo relativePositionAxes none
2019-04-03 20:32:53 +09:00
David Zhao
2ed945605e
Fix Axes.None requirement for FacadeContainer
2019-04-03 19:57:22 +09:00
Dean Herbert
5d37851d34
Rename and move test to correct location
2019-04-03 18:14:59 +09:00
smoogipoo
3b7d26cca8
Remove custom styled text
2019-04-03 17:49:01 +09:00
smoogipoo
f8596e055a
Separate into multiple files
2019-04-03 16:38:54 +09:00
Dean Herbert
1ef2a4c46f
Merge remote-tracking branch 'upstream/master' into tournament-tools
2019-04-03 16:23:33 +09:00
smoogipoo
2c18b6df1c
Fix score table using 300/100/50
2019-04-03 16:09:19 +09:00
smoogipoo
ab4be3b75f
General refactoring
2019-04-03 15:20:38 +09:00
smoogipoo
0d127c21f1
Merge remote-tracking branch 'Aergwyn/master' into update-beatmap-scores-design
2019-04-03 14:52:13 +09:00
Dean Herbert
f1952c0816
Update font awesome usage
2019-04-02 19:55:24 +09:00
David Zhao
020be50f03
Merge remote-tracking branch 'upstream/master' into facade-container
2019-04-02 11:28:44 +09:00
Dean Herbert
c39c37a18d
Apply more missed cases
2019-04-01 12:44:46 +09:00
Dean Herbert
612db31c38
Apply newline additions
2019-04-01 12:16:32 +09:00
Dean Herbert
7d6a08d6da
Fix a few new inspections in latest Rider EAP
2019-04-01 11:39:02 +09:00
smoogipoo
772545dd22
Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design
2019-03-29 18:21:20 +09:00
David Zhao
352b4b20d9
Correct the sizes of TestCaseLogoFacadeContainer
2019-03-29 16:28:25 +09:00
Dean Herbert
81585a8283
Merge branch 'master' into resume-cursor-2
2019-03-29 15:56:46 +09:00
smoogipoo
2967c876ea
Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design
...
# Conflicts:
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs
# osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
# osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
2019-03-29 15:11:00 +09:00
Dean Herbert
6949c233bf
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
2019-03-29 15:02:12 +09:00
smoogipoo
cabec85544
Rework TestCaseLoaderAnimation to avoid timing issues
2019-03-29 14:15:57 +09:00
Dean Herbert
202a0086cc
Merge branch 'master' into better-player-flags
2019-03-29 13:45:45 +09:00
Dean Herbert
a71e9fdb0e
Merge branch 'master' into convert-ranking-statistics
2019-03-29 12:42:49 +09:00
Dean Herbert
fed58fba3a
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
2019-03-29 12:14:28 +09:00
Dan Balasescu
d410054ec8
Merge branch 'master' into key-counter-display
2019-03-29 11:22:59 +09:00
Dean Herbert
7715606188
Merge branch 'master' into sprite-icon-compatibility
2019-03-29 11:15:34 +09:00
Dan Balasescu
4c038e7f67
Merge branch 'master' into testability-improvements
2019-03-29 10:23:12 +09:00
Dan Balasescu
900c00ba59
Merge branch 'master' into drawable-clear-safety
2019-03-29 10:14:41 +09:00
Dean Herbert
176b4ecc38
Merge branch 'master' into sprite-icon-compatibility
2019-03-28 23:47:44 +09:00
David Zhao
bfe44eb33d
Remove SizeForFlow magic number
2019-03-28 15:40:58 +09:00
Dean Herbert
253b18b92f
Merge remote-tracking branch 'upstream/master' into better-player-flags
2019-03-28 11:18:54 +09:00
Dean Herbert
cd65ea4865
Fix TestCaseDrawings regression
2019-03-28 01:24:48 +09:00
Dean Herbert
5c4f2cefea
Fix Loader and TestCaseLoaderAnimation
2019-03-27 22:28:25 +09:00
Dean Herbert
a14701619e
Update icon test case
2019-03-27 21:44:13 +09:00
David Zhao
061527a260
Add new automated tests for logofacade, reset interpolation
2019-03-27 20:04:01 +09:00
Dean Herbert
de80fc0eac
Update icon usage to match framework changes
2019-03-27 19:29:27 +09:00
David Zhao
2c059efbab
Rename to BlockLoad
2019-03-27 17:34:58 +09:00
David Zhao
34a33b335d
oops
2019-03-27 17:29:38 +09:00
David Zhao
ca7a20585d
Apply reviews, delete playerloader test
2019-03-27 17:28:53 +09:00
smoogipoo
012dcc25c9
Rename APIScoreInfo -> APILegacyScoreInfo
2019-03-27 17:08:40 +09:00
David Zhao
be62cd9d72
Fix TestCaseBackgroundsScreenBeatmap
2019-03-27 14:33:50 +09:00
David Zhao
4b1e564df2
Fix test cases potentially getting stuck after 4th run
2019-03-27 14:31:07 +09:00
David Zhao
384eee3395
Remove DI requirement for the Facade in PlayerLoader
2019-03-27 11:32:26 +09:00
smoogipoo
adab31fd58
Cleanup + fix up score table layout
2019-03-26 17:38:56 +09:00
David Zhao
3fe52be77f
Better tests, add documentation
2019-03-26 17:22:36 +09:00
Dean Herbert
a88f23e555
Convert remaining two flags to ctor parameters
2019-03-26 16:53:44 +09:00
Dean Herbert
83863d35c3
Remove AllowLeadIn flag
2019-03-26 16:35:00 +09:00
Dean Herbert
8658de5108
Rename KeyCounterCollection -> KeyCounterDisplay
...
Also fix not working
2019-03-26 13:52:48 +09:00
Dean Herbert
868367511e
Add ManualInputManager to screen tests
...
Also sanitises content init order (ctor for content; bdl for other)
2019-03-26 13:26:55 +09:00
Dean Herbert
85c63f14f2
Add comprehensive player resume testing
2019-03-26 13:18:33 +09:00
Dean Herbert
c403dede20
Add ManualInputManager to screen tests
...
Also sanitises content init order (ctor for content; bdl for other)
2019-03-26 13:16:46 +09:00
Dean Herbert
4c0121a112
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
2019-03-26 11:31:23 +09:00
Dean Herbert
b75ea295db
Rename KeyCounterCollection -> KeyCounterDisplay
...
Also fix not working
2019-03-26 11:28:43 +09:00
David Zhao
be9ac39f54
Cleanup
2019-03-26 11:11:27 +09:00
David Zhao
35bf262d19
Merge remote-tracking branch 'upstream/master' into facade-container
2019-03-26 11:11:13 +09:00
David Zhao
a0f6718145
Better tests and implementation
2019-03-26 10:48:29 +09:00
smoogipoo
f4aeb390ef
Initial re-layout of score table
2019-03-26 10:21:34 +09:00
smoogipoo
6a9f005ed4
Merge remote-tracking branch 'Joehuu/master' into update-beatmap-scores-design
...
# Conflicts:
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
2019-03-25 15:21:29 +09:00
Dean Herbert
39df8cce19
Fix incorrect usage of InternalChildren
...
Could cause overwriting of components added by base DrawableHitObjcet class (such as samples)
2019-03-25 13:48:55 +09:00
Dean Herbert
9a6576c0a1
Merge remote-tracking branch 'upstream/master' into multi-background-stack
2019-03-25 12:40:31 +09:00
Dean Herbert
371166955e
Apply a few minor refactors
2019-03-25 12:39:40 +09:00
Dean Herbert
a1c5eda05b
Add grouping of visual tests
2019-03-25 01:02:36 +09:00
David Zhao
d37968d88d
Add better test for facade containers
2019-03-24 15:18:38 +09:00
Dean Herbert
1e0027e4f2
Fix test
2019-03-24 12:09:18 +09:00
David Zhao
6e98a8dd7c
Initial implementation
2019-03-22 20:01:58 +09:00
Dean Herbert
db89796752
Merge remote-tracking branch 'upstream/master' into multi-background-stack
2019-03-22 16:05:39 +09:00
Dean Herbert
670c25d5e8
Refactor test
2019-03-22 16:03:08 +09:00
David Zhao
c43b1afa30
Use is loaded instead
2019-03-22 15:23:18 +09:00
David Zhao
8fb4de101f
Wait for screen current
2019-03-22 15:20:06 +09:00
Dan Balasescu
b4954c5a7f
Merge branch 'master' into pause-logic-simplification
2019-03-22 15:11:34 +09:00
David Zhao
9a466d97ed
Add texts to make test more visually confirmable, add no parallax screen.
2019-03-22 15:08:47 +09:00
David Zhao
dcae86e39a
Add a new test for OsuScreenStack, fix parallax
2019-03-22 14:10:38 +09:00
Dean Herbert
dc004910d7
Fix AccountCreationOverlay tests and better complete dummy api's behaviour
2019-03-22 11:55:35 +09:00
Dean Herbert
aa1dfdd663
Extract logic shared between tests
2019-03-21 16:33:34 +09:00
Dean Herbert
b17c5c0bb3
Add more tests for exitability
2019-03-21 16:12:14 +09:00
Dean Herbert
15f9a6b9df
Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
2019-03-21 16:04:18 +09:00
David Zhao
ee0d7b6c6d
Merge remote-tracking branch 'upstream/master' into multi-background-stack
2019-03-21 15:35:14 +09:00
Dean Herbert
67a65b80fc
Merge branch 'master' into visual-settings-container
2019-03-20 20:48:30 +09:00
Dean Herbert
6a7ab6a001
Do less import work in [SetUp] step
2019-03-20 20:47:25 +09:00
Dean Herbert
01f795b046
Make restart public rather than reimplementing
2019-03-20 19:45:04 +09:00
Dean Herbert
acbcca4462
Merge branch 'master' into multi-background-stack
2019-03-20 19:11:27 +09:00
David Zhao
b5e8eb2a4a
Wait for dim
2019-03-20 17:31:06 +09:00
David Zhao
fbfef844de
Add test case for resuming PlayerLoader
2019-03-20 17:18:42 +09:00
smoogipoo
f7016e1d2c
Rename DrawableScore
2019-03-20 17:15:38 +09:00
smoogipoo
ce57bdb8db
Merge branch 'timed-difficulty-attributes' into update-beatmap-scores-design
...
# Conflicts:
# osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
2019-03-20 17:12:34 +09:00
Dean Herbert
f43e7a880c
Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
2019-03-20 15:27:06 +09:00
Dean Herbert
6f1610be79
Merge branch 'master' into ruleset-container-refactor
2019-03-20 14:55:58 +09:00
David Zhao
15637f9c4a
Rework instant blur logic such that updateVisuals doesn't need to be public
2019-03-20 14:17:35 +09:00
Dean Herbert
5b6ac7abdc
Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
2019-03-20 10:31:42 +09:00
Dean Herbert
baea7230bc
Rename RulesetContainer to DrawableRuleset
2019-03-19 23:47:31 +09:00
Dean Herbert
9ca6699c64
Merge remote-tracking branch 'upstream/master' into player-test-flexibility
2019-03-19 20:33:39 +09:00
David Zhao
3af3baf5e6
Fix merge
2019-03-19 20:22:21 +09:00
David Zhao
a1000524ee
Merge branch 'master' into visual-settings-container
2019-03-19 20:17:12 +09:00
David Zhao
a8e2072286
Make blurtarget private, improve documentation
2019-03-19 20:15:28 +09:00
Dean Herbert
8f5e02cbe5
Fix a couple of missed cases
2019-03-19 17:41:22 +09:00
Dean Herbert
def15645f7
Update framework
2019-03-19 17:32:36 +09:00
Dean Herbert
83f3d3abde
Merge remote-tracking branch 'upstream/master' into disclaimer-support-text
2019-03-19 16:02:34 +09:00
David Zhao
27a92e017c
rename back to UserDimContainer
2019-03-19 13:06:14 +09:00
David Zhao
f1b2073bf6
Merge remote-tracking branch 'upstream/master' into visual-settings-container
2019-03-19 13:01:05 +09:00
Dean Herbert
f56e8d9bfe
Make tests better
2019-03-18 20:33:56 +09:00
Dean Herbert
4f075f4740
Add more comprehensive testing
2019-03-18 20:33:43 +09:00
Dean Herbert
536b5e0dab
Remove PausableGameplayContainer
2019-03-18 20:33:43 +09:00
Dean Herbert
bcaff9f7b4
Add basic pause tests
2019-03-18 20:33:43 +09:00
Dean Herbert
8df47bc23e
Increase flexibility of player test cases
2019-03-18 17:09:48 +09:00
Dan Balasescu
e0b3149e32
Merge branch 'master' into api-testability
2019-03-18 10:59:06 +09:00
Dean Herbert
300cb70859
Merge branch 'master' into multi-background-stack
2019-03-18 09:54:27 +09:00
David Zhao
3208f1dde8
Fix potential transitiontest failure on local unit tests
2019-03-14 16:40:25 +09:00
David Zhao
8cdfb1fd61
Remove BlurrableBackgroundScreen, rework tests
2019-03-14 16:09:17 +09:00
David Zhao
de6d8fc637
Move user blurring into VIsualSettingsContainer
2019-03-13 18:25:22 +09:00
Jamie Taylor
04b88cdd11
Add required types for BeatmapDetailArea test case
2019-03-13 14:13:42 +09:00
Dean Herbert
b1f18481e0
Show text to supporters telling them they're cool
...
Also adds better tests for disclaimer screen.
2019-03-13 12:58:42 +09:00
Dean Herbert
f0114d776d
Use interface to access API
...
Allows for better testability.
2019-03-13 12:58:18 +09:00
David Zhao
e6a55cd674
Fix TestCaseEditor as well
2019-03-12 17:45:16 +09:00
David Zhao
921c4ce242
Make tests use new OsuScreenStack
2019-03-12 16:33:35 +09:00
jorolf
2525f5bcb7
Apply most suggestions
2019-03-09 23:58:14 +01:00
jorolf
bb6e57169f
Merge branch 'screen-title-class' of github.com:Jorolf/osu into profile-header-update
2019-03-09 20:22:33 +01:00
Dean Herbert
9df27f3a5f
Merge branch 'master' into prevent-null-lookup
2019-03-09 11:14:54 +09:00
Jamie Taylor
192c257aac
Add test steps for BeatmapDetailArea
2019-03-08 18:35:49 +09:00
smoogipoo
a40ffcc692
Apply formatting adjustments
2019-03-08 16:44:39 +09:00
smoogipoo
8c0e325d8b
Reduce + make beatmap scores testcase work
2019-03-08 16:41:37 +09:00
smoogipoo
a7ad29ca9d
Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design
2019-03-08 16:32:46 +09:00
smoogipoo
e00702f4e4
Merge remote-tracking branch 'origin/master' into fix-non-async-load
2019-03-08 15:14:14 +09:00
Dean Herbert
345c7f4fa8
Fix test regression
2019-03-08 12:30:52 +09:00
Dean Herbert
30a0bb4a25
Merge branch 'master' into fix-duplicate-bg-sprites
2019-03-08 12:25:23 +09:00
smoogipoo
30c6a7c3c5
Merge remote-tracking branch 'nekodex/master' into update-beatmap-scores-design
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseBeatmapScoresContainer.cs
# osu.Game/Overlays/BeatmapSet/Scores/ClickableUserContainer.cs
# osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs
# osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
2019-03-07 18:48:23 +09:00
Dean Herbert
1f44dde96b
Fix autoplay tests not working
2019-03-07 18:34:56 +09:00
Jamie Taylor
8a69fc5534
Use AddUntilStep instead of AddWaitStep
2019-03-06 19:57:09 +09:00
smoogipoo
22423f60d4
Fix DI not working
2019-03-06 19:27:42 +09:00
Jamie Taylor
b5e89e2f3b
Add additional testing to check for extra children in the future
2019-03-06 19:13:25 +09:00
smoogipoo
ee1f9d4981
Merge remote-tracking branch 'origin/master' into profile-header-update
...
# Conflicts:
# osu-resources
# osu.Game/Overlays/Profile/Components/GradeBadge.cs
# osu.Game/Overlays/Profile/Header/BadgeContainer.cs
# osu.Game/Overlays/Profile/Header/RankGraph.cs
# osu.Game/Overlays/Profile/Header/SupporterIcon.cs
# osu.Game/Overlays/Profile/ProfileHeader.cs
2019-03-06 15:53:30 +09:00
Dean Herbert
8a6fa0915e
Merge branch 'master' into simplify-gameplay-clock
2019-03-05 20:22:46 +09:00
Dean Herbert
76ce3954a0
Rename PauseContainer
2019-03-05 19:30:55 +09:00
Dean Herbert
5aaa2511eb
Merge pull request #4374 from Joehuu/status-direct-list
...
Add beatmap status on direct list panels
2019-03-05 18:22:56 +09:00
smoogipoo
896088bc02
Remove using
2019-03-05 17:23:11 +09:00
smoogipoo
4764a771d0
Add testcase
2019-03-05 17:14:30 +09:00
Dean Herbert
01f1018d02
Tidy up clock logic using DI and a GameplayClock
2019-03-05 13:37:51 +09:00
Dean Herbert
ec7842dd5a
Merge remote-tracking branch 'upstream/master' into tournament-tools
2019-03-04 12:06:56 +09:00
Dean Herbert
5487b011d6
Fix some inspections rider isn't able to deal with automatically
2019-03-02 14:34:56 +09:00
Dean Herbert
796f6c3092
Merge remote-tracking branch 'upstream/master' into tournament-tools
2019-03-02 13:13:51 +09:00
David Zhao
e3338e94d1
Make test cases more compact, add two way toggles
2019-02-28 20:01:15 +09:00
David Zhao
19d529c1c8
Move test steps into setup
2019-02-28 18:26:41 +09:00
Dean Herbert
b2872b47d0
Merge branch 'master' into UserDimLogic
2019-02-28 17:18:04 +09:00
David Zhao
69b1c76dce
Actually implement blurring fix
2019-02-28 16:51:17 +09:00
David Zhao
dbe5887f7e
Fix issue for user hover blur for now by checking for current screen, fix test.
2019-02-28 16:18:46 +09:00
Dean Herbert
774116923b
A few fixes
2019-02-28 14:45:59 +09:00
David Zhao
4ceafef79c
Add missing reference
2019-02-28 14:40:31 +09:00
David Zhao
e5607d7711
Add back "THIS IS A STORYBOARD" storyboard
2019-02-28 14:33:29 +09:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections
2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1
Use expression body for property get/set where possible
2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9
Fix remaining issues
2019-02-28 13:31:40 +09:00
Dean Herbert
3e1f283281
Merge remote-tracking branch 'upstream/master' into more-inspections
2019-02-28 13:09:18 +09:00
Dean Herbert
83e9dfda75
Merge branch 'master' into fix-osugame-test-case
2019-02-28 12:33:00 +09:00
Dean Herbert
5f6ad51e7e
Merge branch 'master' into fix-osugame-test-case
2019-02-27 22:36:13 +09:00
Dean Herbert
c8793911a8
Enable more stringent inspectcode style inspections
2019-02-27 21:25:40 +09:00
Dean Herbert
9f8d03e1b6
Remove excess newlines
2019-02-27 21:03:35 +09:00
Dean Herbert
5c6db17865
Merge remote-tracking branch 'upstream/master' into fix-square-graph-overhead
2019-02-27 21:02:28 +09:00
Dean Herbert
3af7d4939c
Add debounce testing
2019-02-27 19:11:09 +09:00
Dean Herbert
f942515fcd
Add licence header
2019-02-27 18:59:45 +09:00
Dean Herbert
b555f793d9
Fix whitespace
2019-02-27 18:57:27 +09:00
Dean Herbert
a8bc87f5d8
Add basic skin tests
...
Should be expanded in the future. Bare minimum for now to test fail case.
2019-02-27 18:52:39 +09:00
David Zhao
246240e936
Remove unused includes
2019-02-27 18:04:33 +09:00
David Zhao
882fff1631
Assert storyboard visibilty at both steps of toggle
2019-02-27 17:56:44 +09:00
David Zhao
14ffd9efe8
Add fake storyboard to visually assess storyboard dim
2019-02-27 17:02:04 +09:00
David Zhao
ebec944bb8
Use actual song select for test case with beatmap import
2019-02-27 14:15:45 +09:00
Dean Herbert
bf6815b2a7
Fix OsuGame test case not working
2019-02-26 18:02:24 +09:00
David Zhao
59fca568c9
Remove null checks for synchronous loads
2019-02-26 17:56:42 +09:00
David Zhao
d23f399375
Add back song select wait
2019-02-26 17:43:42 +09:00
David Zhao
60ecb99dfb
Have test cases create a new screen stack each time
2019-02-26 17:31:21 +09:00
Dean Herbert
5b88c2ea0f
Add visual test
2019-02-26 16:12:40 +09:00
Dean Herbert
3549369822
Restore previous wait time
...
For whatever reason, this is required?
2019-02-26 10:27:54 +09:00
Dean Herbert
217f692798
Extract wait logic into separate method
...
Also reduces the required wait time.
2019-02-26 10:11:36 +09:00
Dean Herbert
c58d305fc6
private goes after public
2019-02-26 09:56:22 +09:00
Dean Herbert
14e427fed7
Rename some methods (they weren't Asserting)
2019-02-26 09:54:28 +09:00
David Zhao
a7585dea21
Make screen stack readonly
2019-02-25 22:17:51 +09:00
David Zhao
d750023c52
Fix TestCasePlayerLoader not having a background stack
2019-02-25 22:05:49 +09:00
David Zhao
af4606f3d2
Create new test for StoryboardReplacesBackground
2019-02-25 12:35:01 +09:00
David Zhao
24f5bc7a75
Add documentation and move storyboard init logic
2019-02-24 20:03:24 +09:00
David Zhao
f4acd6e48f
Move PlayerLoader tests out of constructor, Improve Documentation
2019-02-24 18:10:59 +09:00
David Zhao
f56f1fc4f7
Clean up left over test code
2019-02-23 15:06:04 +09:00
David Zhao
bb01948283
Use .Value with new bindable changes
2019-02-22 20:44:02 +09:00
David Zhao
ab3fa91a2f
Merge branch 'master' into UserDimLogic
2019-02-22 20:38:10 +09:00
David Zhao
76de39a344
Put user dim logic in yet another container inside UserDimContainer
2019-02-22 20:34:51 +09:00
Dean Herbert
367bc53a06
Revert some more instances of 'e' variable names
2019-02-22 20:15:25 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage
2019-02-22 18:09:23 +09:00
David Zhao
a4162a69fb
Remove leftover usage of dimlevel in BackgroundScreenBeatmap
2019-02-22 18:01:50 +09:00
Dean Herbert
3fe4b8fd1c
Update variable names
...
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
David Zhao
6bf831b96f
Fix TransitiouOutTest getting stuck on pause
2019-02-22 17:15:05 +09:00
Dean Herbert
2c9e6adfd4
Merge branch 'master' into bindable-valuechanged
2019-02-22 17:14:05 +09:00
Dean Herbert
452caabd40
Apply suggestions from code review
...
Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>
2019-02-22 17:06:49 +09:00
smoogipoo
d4bdae4b04
Disable TestInstantPolling
2019-02-22 16:59:52 +09:00
David Zhao
918a60ebbf
Create a new player every time a test is performed.
2019-02-22 16:56:03 +09:00
David Zhao
65cdac60c3
Add tests to make sure the background is always the same through screen transitions
2019-02-22 14:43:05 +09:00
David Zhao
94bc552282
Fix backgrounds not fading out when replaced by storyboard, add test for this
2019-02-22 11:41:28 +09:00
smoogipoo
d99eaa3fce
Simplify expression
2019-02-21 19:25:08 +09:00
smoogipoo
d8c55bc729
Adjust namespaces
2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f
Update with framework bindable changes
2019-02-21 18:56:34 +09:00
David Zhao
bf06674e87
Clean up test case
2019-02-21 18:19:50 +09:00
David Zhao
ad5e81f0cd
Add test case for background preview, fix unit tests
2019-02-21 15:24:26 +09:00
smoogipoo
cc33f230b4
Merge remote-tracking branch 'origin/master' into osu-fontusage
2019-02-20 20:37:48 +09:00
David Zhao
49c5a9fc30
Merge branch 'master' into UserDimLogic
2019-02-20 17:30:34 +09:00
David Zhao
5bf405f949
Fix bindable name in tests
2019-02-20 16:56:57 +09:00
David Zhao
1bd1b6b099
Move user dim logic into UserDimContainer instead
2019-02-20 16:53:57 +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
Dean Herbert
f2ad2931c7
Merge remote-tracking branch 'upstream/master' into test-working-beatmap-clock
2019-02-20 11:37:33 +09:00
David Zhao
87717dcf9e
Remove redundant constructors
2019-02-19 19:57:55 +09:00
David Zhao
2e375a9186
Add test cases for upwards traversal of screen stack
2019-02-19 19:44:26 +09:00
Dean Herbert
4504aee089
Unnecessary using
2019-02-19 16:50:56 +09:00
Dean Herbert
618455f7ba
Remove exit step (needs login to show properly)
2019-02-19 16:47:59 +09:00
Dean Herbert
0609fcf7d4
Fix TestCaseMultiScreen intermittent failures
2019-02-19 15:52:53 +09:00
Dean Herbert
0fce23a36b
Fix test regression
2019-02-19 12:38:45 +09:00
Dean Herbert
f8033a3b35
Give TestWorkingBeatmap a reference clock
2019-02-19 12:27:30 +09:00
David Zhao
af049004dd
Add test cases for transitioning into pause overlay and into results
2019-02-18 19:53:55 +09:00
David Zhao
b353b69587
Use a bindable for updating dim status instead
2019-02-18 18:58:34 +09:00
David Zhao
4e07aba548
Make it so visual tests only load the osu ruleset
2019-02-18 18:12:45 +09:00
David Zhao
af30aefe77
Merge branch 'master' into UserDimLogic
2019-02-18 16:56:16 +09:00
David Zhao
79b12ef085
Fix test build failure
2019-02-18 15:29:39 +09:00
David Zhao
df148f8787
Fix background dim not being disabled on playerloader exit
2019-02-18 12:55:42 +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
aceb8c4cb0
Fix TestCasePlaySongSelect
2019-02-15 21:50:40 +09:00
Dean Herbert
fc583590d3
Fix OsuGame testcase
2019-02-15 17:40:49 +09:00
David Zhao
8693d6a76b
Merge branch 'master' into UserDimLogic
2019-02-15 17:11:21 +09:00
Dean Herbert
65721a01ab
Fix regressed screen test cases
2019-02-15 17:01:06 +09:00
David Zhao
0a60f6dacd
Documentation for tests and changes
2019-02-15 16:50:37 +09:00
David Zhao
ad9dae975d
Add visual test for background dimming
2019-02-15 16:46:29 +09:00
David Zhao
6da9f94ae3
Fix regression with background dim
2019-02-15 16:17:01 +09:00
Dean Herbert
b967b93b88
Fix regressions in tests
2019-02-12 19:53:08 +09:00
Dean Herbert
88ffc78103
Restructure
2019-02-11 19:11:34 +09:00
Dean Herbert
e2e615cc5c
Merge branch 'master' into leased-bindables-dont-work
2019-02-11 16:30:12 +09:00
EVAST9919
0bd8fdb56d
Merge remote-tracking branch 'refs/remotes/ppy/master' into update-beatmap-scores-design
2019-02-10 04:46:11 +03:00
EVAST9919
105053e91b
TestCase fix
2019-02-09 00:56:41 +03:00
smoogipoo
7aca0f4a1d
Fix failing test cases
2019-02-08 16:08:23 +09:00
smoogipoo
ee5ff283d1
Remove compiler warnings
2019-02-08 16:02:00 +09:00
EVAST9919
c85dc1a236
update another scores design
2019-02-05 19:32:33 +03:00
smoogipoo
aac371ba6e
Use CMC for all of multiplayer
2019-02-05 19:00:08 +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
ca5c8d37d1
Use leased bindables
2019-02-01 16:44:06 +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
Dean Herbert
1404ba6625
Remove unnecessary changes
2019-01-28 15:56:55 +09:00
jorolf
648ed0e467
update license headers
2019-01-27 23:45:00 +01:00
jorolf
54d8e4043f
Merge branch 'master' of git://github.com/ppy/osu into profile-header-update
2019-01-27 23:32:48 +01:00
Dean Herbert
014ea972d9
Merge remote-tracking branch 'origin/master' into samah-ios
2019-01-25 11:51:44 +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
Shane Woolcock
728c744e4d
Merge branch 'master' into samah-ios
2019-01-23 22:19:49 +10:30
Dean Herbert
f107a922b4
Add tests for key counter inside player heirarchy
2019-01-23 14:51:25 +09:00
Shane Woolcock
fbed8c3242
Pass GameHost to BeatmapManager in visual tests
2019-01-22 22:07:41 +10:30
Shane Woolcock
10b91e18bd
Merge branch 'master' into samah-ios
...
# Conflicts:
# osu.Game/osu.Game.csproj
2019-01-19 18:03:58 +10:30
Shane Woolcock
f26a551e95
Revert audio changes
2019-01-19 17:40:37 +10:30
Dan Balasescu
75113db438
Merge branch 'master' into fix-skip-button-scaling
2019-01-16 16:37:37 +09:00
Shane Woolcock
a6c54a9675
Merge branch 'master' into samah-ios
2019-01-12 00:16:09 +10:30
Unknown
6eff79913b
remove blank lines
2019-01-11 10:34:56 +01:00
Dean Herbert
e2dd025225
Fix scaling of SkipOverlay when UI scale is adjusted
...
Closes #4040 .
2019-01-11 16:54:42 +09:00
jorolf
6ba7e2b670
split the profile header into several components
2019-01-11 01:12:19 +01:00
Dean Herbert
2c2ed1ae47
Merge branch 'master' into profile-header-update
2019-01-10 18:34:39 +09:00
Dean Herbert
aa68bbc1d9
Merge branch 'master' into fix-match-select-crash
2019-01-10 15:40:03 +09:00
smoogipoo
3dc3d4cb40
Add test
2019-01-10 15:25:12 +09:00
smoogipoo
122fc2de58
Show room leaderboard instead in the lounge
2019-01-08 19:24:55 +09:00
Shane Woolcock
19693c3e51
Use TrackManager CreateWaveform to fix editor crashes
2019-01-08 17:10:31 +10:30
Dean Herbert
49ba4e5a14
Merge branch 'master' into update-framework
2019-01-07 18:51:54 +09:00
Dean Herbert
f6018294b5
Update framework
2019-01-07 18:50:27 +09:00
Roman Kapustin
469a64a7cd
The code must not contain multiple blank lines in a row
2019-01-05 21:03:03 +03:00
Roman Kapustin
4b5fc85875
Use Find instead of FirstOrDefault
2019-01-05 19:35:33 +03:00
Dean Herbert
01f6199c49
Merge branch 'master' into profile-header-update
2019-01-04 16:38:42 +09:00
Dean Herbert
b6dc6c4a74
Merge branch 'master' into do_not_use_local_user_for_autoplay_score
2019-01-04 13:11:17 +09:00
smoogipoo
a7db0bbb91
Sort rooms based on their API position
2018-12-28 01:45:19 +09:00
smoogipoo
c614505b7c
Revert unnecessary change to testcase
2018-12-27 16:20:37 +09:00
Dean Herbert
67e200e1b2
Leaderboard design updates
2018-12-27 15:52:40 +09:00
smoogipoo
1e71c5c9c4
Add + set ended room status
2018-12-27 13:32:44 +09:00
Dean Herbert
8cf30bdb6a
Play with delegate
2018-12-26 22:16:35 +09:00
Dean Herbert
bf9954aede
Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs
# osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs
# osu.Game/Screens/Multi/IRoomManager.cs
# osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
# osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
# osu.Game/Screens/Multi/RoomManager.cs
2018-12-26 21:32:12 +09:00
smoogipoo
152f3b1da3
Add processing overlay to lounge screen
2018-12-26 21:20:53 +09:00
smoogipoo
0c384417f1
Add processing overlay to room creation process
2018-12-26 21:19:02 +09:00
smoogipoo
2e5cd8b4e3
Fix post-rebase errors
2018-12-26 21:18:44 +09:00
smoogipoo
940d4a16bb
Add error message when creation fails
2018-12-26 21:18:44 +09:00
Dean Herbert
171287591c
Merge branch 'updateable-beatmap-sprite' into timeshift-wip
...
# Conflicts:
# osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
# osu.Game/Graphics/Containers/LinkFlowContainer.cs
2018-12-26 20:52:36 +09:00
Dean Herbert
ae47eb61ca
Fix test not working when not logged in
2018-12-26 20:42:47 +09:00
smoogipoo
23d412e3ff
Fix post-rebase errors
2018-12-26 20:33:49 +09:00
smoogipoo
be9ba78d47
Add error message when creation fails
2018-12-26 20:33:19 +09:00
Dean Herbert
2353c204ee
Renaming
2018-12-26 20:05:57 +09:00
Dean Herbert
c6c8c472bb
Split class out
2018-12-26 16:50:50 +09:00
Dean Herbert
9b2575cc20
RoomSettingsOverlay -> MatchSettingOverlay
2018-12-26 16:50:50 +09:00
smoogipoo
a8d0ff67a9
Add automated match settings overlay tests
2018-12-26 16:34:38 +09:00
Dean Herbert
b2fb027097
Remove old testcase
2018-12-26 15:26:46 +09:00
Dean Herbert
c902c1587a
Add tests and modify fallback logic
2018-12-25 19:17:32 +09:00
smoogipoo
96c9e5f209
Make DefaultBeatmap readonly
2018-12-25 18:34:45 +09:00
smoogipoo
1dd2a4e368
Fix host info not working
2018-12-25 18:07:19 +09:00
smoogipoo
23d21a45e5
More automated tests
2018-12-25 11:59:08 +09:00
smoogipoo
6712a68797
Create IRoomManager interface, add test for RoomsContainer
2018-12-25 11:45:50 +09:00
jorolf
2fe80d5568
Update ProfileHeader to the new design
2018-12-22 21:50:25 +01:00
jorolf
15ae0cd70a
Merge branch 'master' of git://github.com/ppy/osu into profile-header-update
2018-12-22 16:54:39 +01:00
jorolf
b4fa2d9049
WIP
2018-12-22 16:51:24 +01:00
smoogipoo
02365ee5ba
Merge remote-tracking branch 'origin/master' into timeshift-wip
2018-12-22 23:23:21 +09:00
smoogipoo
d9b8df1595
Merge remote-tracking branch 'origin/master' into user-registration
2018-12-22 17:19:28 +09:00
smoogipoo
bb08bf10a0
Fix post-merge issues
2018-12-22 16:26:27 +09:00
smoogipoo
c2a00b84c7
Merge remote-tracking branch 'peppy/modular-results-screen' into timeshift-wip
...
# Conflicts:
# osu.Game/Screens/Multi/IMultiplayerScreen.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/Screens/Play/SoloResults.cs
# osu.Game/Screens/Ranking/IResultPageInfo.cs
# osu.Game/Screens/Ranking/ResultMode.cs
# osu.Game/Screens/Ranking/ResultModeButton.cs
# osu.Game/Screens/Ranking/ResultModeTabControl.cs
# osu.Game/Screens/Ranking/Results.cs
2018-12-22 16:22:02 +09:00
Dean Herbert
7e97d37df5
Merge remote-tracking branch 'upstream/master' into modular-results-screen
2018-12-22 16:20:39 +09:00
Dan Balasescu
2c97409e2e
Merge branch 'master' into rewrite-standalone-chat
2018-12-22 16:07:27 +09:00
smoogipoo
baed0ef3ba
Rename variable
2018-12-22 15:46:04 +09:00
smoogipoo
b9ec179713
Split out more requests + responses
2018-12-22 15:45:16 +09:00
smoogipoo
daa6292e08
Split results screen to allow for extensibility
2018-12-22 15:39:06 +09:00
smoogipoo
0e9991b81a
Merge remote-tracking branch 'origin/master' into timeshift-wip
2018-12-22 15:36:36 +09:00
Dean Herbert
e3308010c0
Merge pull request #3898 from peppy/leaderboard-modularity
...
Leaderboard modularity
2018-12-22 15:36:12 +09:00
smoogipoo
6afd2f7263
Adjust styling of disabled settings
2018-12-22 15:00:35 +09:00
smoogipoo
34fc740e1f
Implement testcase for room settings
2018-12-22 14:48:15 +09:00
smoogipoo
e657f13c15
Separate out Leaderboard into BeatmapLeaderboard
2018-12-22 14:44:36 +09:00
smoogipoo
dbd391825a
Rework+fix TestCaseMultiHeader
2018-12-22 14:30:08 +09:00
Dean Herbert
621480af02
Add simple (non-automated) test
2018-12-22 14:21:21 +09:00
smoogipoo
21cfe5a3e6
Decouple header from matchscreen
2018-12-22 14:12:27 +09:00
smoogipoo
f1a9a352fc
Cleanup bindable handling
2018-12-22 14:01:06 +09:00
smoogipoo
7e9cc4e876
Seed the results screen
2018-12-21 18:37:33 +09:00
smoogipoo
4149734f89
Add room leaderboard to results
2018-12-21 18:22:13 +09:00
Dean Herbert
81104f4803
Make standalone chat reuse more code from main chat overlay
2018-12-21 17:54:12 +09:00
smoogipoo
8a2cc64bfa
Split results screen to allow for extensibility
2018-12-21 16:34:03 +09:00
smoogipoo
5d59a1ffca
Merge remote-tracking branch 'origin/master' into timeshift-wip
...
# Conflicts:
# osu.Game.Tests/Visual/TestCasePollingComponent.cs
# osu.Game/Online/API/APIRequest.cs
# osu.Game/osu.Game.csproj
2018-12-21 12:51:31 +09:00
Dean Herbert
bc8b0485d8
Add textbox/posting support
2018-12-20 18:49:03 +09:00
smoogipoo
1701af61d6
Add host avatar+username to match screen
2018-12-20 18:04:22 +09:00
Dean Herbert
3a13899ce1
Add stand-alone chat component
2018-12-20 16:54:49 +09:00
Dean Herbert
bb4b54799f
Merge remote-tracking branch 'upstream/master' into tournament-tools
2018-12-20 15:57:20 +09:00
smoogipoo
2e28f378de
Move beatmap + mod info to header
2018-12-20 15:17:33 +09:00
smoogipoo
2c000a9a1d
Disallow starting gameplay if there's not enough time in the room
2018-12-19 10:52:15 +09:00
smoogipoo
8d640cdc25
Fix leaderboard not being refreshed when finishing gameplay
2018-12-18 12:56:16 +09:00
smoogipoo
cc68cf2f95
Implement duration
2018-12-17 14:44:54 +09:00
smoogipoo
e8007ac37f
Implement multiplayer room leaderboard
2018-12-14 21:08:55 +09:00
smoogipoo
d9fc7c7d66
Separate out Leaderboard into BeatmapLeaderboard
2018-12-14 19:51:27 +09:00
Dean Herbert
fc5d5a7752
Merge branch 'master' into user-registration
2018-12-14 19:45:27 +09:00
Dean Herbert
3fda40c4ac
Ignore annoying tests for now
2018-12-14 17:42:47 +09:00
smoogipoo
b83f99d90a
Fix up header sizing + styling
2018-12-14 14:30:39 +09:00
Dean Herbert
ebd9375780
Add more tests
2018-12-12 20:31:58 +09:00
smoogipoo
450e4cd223
Hook up API
2018-12-12 19:04:11 +09:00
smoogipoo
9af2b49c01
Merge remote-tracking branch 'peppy/polling-component' into timeshift-api-integration
...
# Conflicts:
# osu.Game/osu.Game.csproj
2018-12-12 16:22:14 +09:00
Dean Herbert
7dc1f5b771
Add more tests
2018-12-11 20:12:30 +09:00
smoogipoo
497f431366
Implement RoomManager and RoomsContainer
...
Reduces logic from LoungeScreen
2018-12-11 19:07:40 +09:00
Dean Herbert
ea4dce8454
Add a polling component model
2018-12-10 21:08:14 +09:00
smoogipoo
1ac615b490
Renamespace
2018-12-10 19:27:25 +09:00
smoogipoo
77193eeea4
Move from lobby into match for creation process
2018-12-10 18:00:57 +09:00
Roman Kapustin
2d0fdc8204
Create ReplayPlayer using Score from the dummy RulesetContainer
2018-12-09 17:39:35 +03:00
smoogipoo
29263d7154
Refactor bindable shenanigans in Match
2018-12-07 16:20:05 +09:00
Dean Herbert
d42c45c87e
Add full tests
2018-12-07 14:01:51 +09:00
smoogipoo
c02150a19b
Make match header not fade when beatmap changes
2018-12-06 18:31:12 +09:00
smoogipoo
42817b98f9
Hide max participants box
2018-12-06 18:16:17 +09:00
Dean Herbert
9689c4fa17
Merge branch 'master' into user-registration
2018-12-06 17:06:43 +09:00
smoogipoo
eadbe4c470
Make beatmap selection work
2018-12-06 12:21:30 +09:00
Dean Herbert
e56f4cc8a5
Add remaining steps to registration screen
2018-12-06 11:58:09 +09:00
Dean Herbert
94045413ce
Change statistics to be int for now
2018-12-05 19:44:01 +09:00
Dean Herbert
1a974f64de
Initial design for user registration dialog
2018-12-05 12:57:26 +09:00
smoogipoo
ec83790734
Add timeshift game type
2018-12-04 18:58:45 +09:00
smoogipoo
f2a57ce270
Fix room host not being set
2018-12-04 17:23:58 +09:00
smoogipoo
6e5716c3f3
Adjust transition
2018-12-04 15:32:12 +09:00
smoogipoo
d8739d9dee
Fix creating a new room re-using the existing model
2018-12-04 15:25:48 +09:00
Roman Kapustin
c6c255718b
Handle ModAutoplay during score construction in the Player
2018-12-03 22:37:26 +03:00
Dean Herbert
bc9290bfcb
Schedule cross thread access in test case
2018-12-03 18:43:51 +09:00
smoogipoo
53a54f8634
Renamespace room settings
2018-12-03 17:54:10 +09:00
smoogipoo
51c16867d5
Remove type conversion from LoungeTab to RoomAvailability
2018-12-03 17:50:39 +09:00
Dean Herbert
03e416cda9
Merge remote-tracking branch 'upstream/master' into tournament-tools
2018-12-01 10:03:31 +09:00
smoogipoo
8eff49bccd
Remove User from Replay
2018-11-30 18:25:14 +09:00
Dean Herbert
d97a15a504
Add IMod and change ShortenedName to Acronym
2018-11-30 17:16:00 +09:00
Dean Herbert
271dcded3c
Merge branch 'master' into scoredatabase
2018-11-30 14:59:58 +09:00
Dean Herbert
5254b07680
Merge remote-tracking branch 'upstream/master' into inter-column-movements
2018-11-30 11:57:53 +09:00
smoogipoo
219929eb47
Score -> ScoreInfo
2018-11-28 18:33:01 +09:00
smoogipoo
09b79d736b
Remove unused usings
2018-11-28 16:33:42 +09:00
smoogipoo
5fd6e6ca77
Re-namespacing
2018-11-28 16:12:57 +09:00
Dean Herbert
da79292250
Merge branch 'master' into fix_idle_tracker
2018-11-26 17:41:45 +09:00
Dean Herbert
77090500e8
Merge branch 'fix_idle_tracker' of https://github.com/UselessToucan/osu into fix_idle_tracker
2018-11-26 17:41:22 +09:00
Dean Herbert
bf2ecef6d8
Add comprehensive tests
2018-11-26 17:40:25 +09:00
Dan Balasescu
38ef1d1f03
Merge branch 'master' into multiplayer-room-settings
2018-11-26 16:46:27 +09:00
smoogipoo
dea387c31e
Fix post-merge issues
2018-11-26 16:29:56 +09:00
smoogipoo
dcf740e5d3
Merge remote-tracking branch 'origin/master' into multiplayer-room-settings
2018-11-26 16:27:22 +09:00
smoogipoo
efdad3a3a7
Merge remote-tracking branch 'origin/master' into ChatManager_with_BindableCollection
2018-11-26 16:12:55 +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
Dean Herbert
0bc4a01a6b
Merge remote-tracking branch 'upstream/master' into tournament-tools
2018-11-24 20:03:25 +09:00
smoogipoo
cadfe41f83
Merge remote-tracking branch 'origin/master' into external_link_warning
2018-11-23 15:19:52 +09:00
Dean Herbert
f91d2e2e07
Merge remote-tracking branch 'upstream/master' into tournament-tools
2018-11-22 10:25:30 +09:00
miterosan
7f1f7300d3
Add channels to chatManager.AvailableChannels by using a hack.
2018-11-21 23:15:44 +01:00
smoogipoo
39e9c61e24
OpenTK -> osuTK
2018-11-21 23:11:08 +01:00
smoogipoo
f27bd3ef3e
OpenTK -> osuTK
2018-11-20 17:14:59 +09:00
smoogipoo
55edeb095d
SelectionBox -> SelectionHandler
2018-11-19 16:58:11 +09:00
Roman Kapustin
376e76e00d
Resolve merge conflicts
2018-11-18 16:10:36 +03:00
Dean Herbert
b574a07f23
Merge remote-tracking branch 'upstream/master' into tournament-tools
2018-11-15 13:31:34 +09:00
Dan Balasescu
e9b47c6233
Merge branch 'master' into hold-for-menu-back
2018-11-14 18:22:34 +09:00
Dean Herbert
a1dd1057ce
Merge branch 'master' into more-global-scrollalgo
2018-11-14 17:15:24 +09:00
Dean Herbert
fb22fc11f6
Merge remote-tracking branch 'upstream/master' into Private_Messages
2018-11-14 13:59:17 +09:00
Dean Herbert
8b190edde0
Merge branch 'master' into more-global-scrollalgo
2018-11-14 13:32:14 +09:00
Dean Herbert
396a5b3cd0
Merge branch 'master' into Private_Messages
2018-11-14 12:49:54 +09:00
Dean Herbert
3caf0cb0d9
Merge branch 'master' into no-drawable-speedchangevis
2018-11-13 19:42:04 +09:00
Dean Herbert
82ebc74eee
Fix testcase
2018-11-13 15:36:36 +09:00
Dean Herbert
f241fcdba1
Add back support for new API and private messages
2018-11-13 15:20:59 +09:00
Dean Herbert
4b1282235a
Merge remote-tracking branch 'upstream/master' into Private_Messages
2018-11-12 20:41:10 +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
ad45bc7666
Move scroll direction to scrollinginfo
2018-11-12 17:34:35 +09:00
smoogipoo
7f0f143a1b
Move IScrollAlgorithm to ScrollingRulesetContainer + use DI
2018-11-12 17:34:35 +09:00
smoogipoo
54ab256c8e
Instantiate a new path rather than setting properties on it
...
# Conflicts:
# osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
# osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
# osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
# osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/SliderPath.cs
2018-11-12 13:50:19 +09:00
smoogipoo
8583fd1380
Fix testcase never working
2018-11-08 14:04:20 +09:00
Dean Herbert
a8b1e509e7
Merge remote-tracking branch 'upstream/master' into tournament-tools
2018-11-07 17:30:52 +09:00
smoogipoo
2612fd3099
Adjust ruleset-specific namespaces
2018-11-07 16:10:21 +09:00
smoogipoo
e9e50f41fb
Use Name/NameScreen format
2018-11-07 13:04:17 +09:00
Dean Herbert
7f73fc2d39
Require holding back button to quit gameplay
...
Avoids accidental presses and streamlines logic with on-screen element.
2018-11-07 01:49:21 +09:00
smoogipoo
52f4923c8e
Remove intermediate Screens namespace
2018-11-06 18:28:22 +09:00
smoogipoo
ac25718c5a
Renamespace compose-mode components
2018-11-06 18:14:46 +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
ad2836a61e
MaskSelection -> SelectionBox
2018-11-06 17:52:47 +09:00
smoogipoo
26c9390c16
HitObjectMaskLayer -> BlueprintContainer
2018-11-06 17:36:10 +09:00
smoogipoo
faab744cbd
DragLayer -> DragBox
2018-11-06 17:24:57 +09:00
Dean Herbert
0f1ffe392f
Merge remote-tracking branch 'upstream/master' into tournament-tools
2018-11-01 17:52:24 +09:00
smoogipoo
f674fcf2c8
Merge branch 'mask-separation' into editor-mask-placement
...
# Conflicts:
# osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
# osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
# osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
2018-10-26 14:05:30 +09:00
smoogipoo
e14719e440
Mask -> Piece for non-mask components
2018-10-25 18:28:10 +09:00
smoogipoo
d19f80835b
Adjust namespaces
2018-10-25 18:26:28 +09:00
Roman Kapustin
b4c68f4cf7
Show a warning prior to opening external links
2018-10-22 23:16:57 +03:00
Hōtarō Oreki
b8ac328ae9
Rename APIChangelog to APIChangelogBuild
2018-10-18 21:04:21 +02:00
Jarosław Zgierski
7cc5128353
Merge branch 'master' into changelog-overlay
2018-10-18 20:26:56 +02:00
smoogipoo
0e841628b6
Implement hitobject deletion
2018-10-18 16:36:06 +09:00
Dean Herbert
cd718812b2
Merge branch 'master' into tighten-diffcalc-tolerances
2018-10-18 14:01:47 +09:00
Dean Herbert
1a62283cb4
Merge branch 'master' into tournament-tools
2018-10-18 00:29:29 +09:00
smoogipoo
969477dadd
Remove placement events, make everything pass top-down
2018-10-17 17:43:16 +09:00
smoogipoo
4ea4ec0d25
Move placement handling events to a higher level
2018-10-17 15:46:30 +09:00
smoogipoo
70f1d17b7e
Merge remote-tracking branch 'origin/master' into editor-mask-placement
...
# Conflicts:
# osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
# osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
# osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
# osu.Game/Rulesets/UI/RulesetContainer.cs
2018-10-16 17:28:16 +09:00
smoogipoo
5095fbcdf7
Merge remote-tracking branch 'origin/master' into optimise-diffcalc
2018-10-16 10:27:18 +09:00
smoogipoo
2f943e77aa
Make Velocity and TickDistance private set
2018-10-15 12:31:52 +09:00
Dean Herbert
77055f6d5c
Merge remote-tracking branch 'upstream/master' into tournament-tools
2018-10-12 18:49:47 +09:00
smoogipoo
83fd251c7b
Pass sub-controlpoints as span slices
2018-10-11 17:44:25 +09:00
smoogipoo
ff559a3a1b
Merge remote-tracking branch 'origin/master' into playfield-scaling-rework
...
# Conflicts:
# osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
# osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-10-05 10:40:16 +09:00
smoogipoo
e931aa3d9e
Move positional modifications to HitCirclePlacementMask
2018-10-04 13:43:50 +09:00
smoogipoo
10d0e2fef1
Fix up testcase
2018-10-03 14:35:32 +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
smoogipoo
a8f156584b
Update framework with positional/non-positional changes
2018-09-26 14:01:15 +09:00
Dean Herbert
51dcfeee92
Move existing tournament resources to new project
2018-09-21 18:18:28 +09:00
smoogipoo
368ceec47c
Simplify creation of a playfield
2018-09-21 14:35:50 +09:00
ekrctb
b790e16217
Use Click instead of now removed TriggerOnClick
2018-09-19 11:42:32 +09:00
ekrctb
a3e6973b41
Replace usage of now removed TriggerKeyPress and similar methods.
2018-09-19 11:36:55 +09:00
Dean Herbert
7b57439976
Add proper testing
2018-09-15 16:25:37 +09:00
Dean Herbert
e636cfe79e
Fix dynamic compilation not working
2018-09-15 16:24:06 +09:00
Dean Herbert
3c8c7a0459
Move ChannelManager to OsuGame
...
There's no reason for it to exist at OsuGameBase
2018-09-14 13:31:25 +09:00
Dean Herbert
e6d5bbd886
Merge branch 'master' into multiplayer-room-settings
2018-09-09 22:40:08 +09:00
Dean Herbert
93e2d8f309
Allow testing of all chat-related classes dynamically
2018-09-06 15:56:27 +09:00
Dean Herbert
5aff19eaea
Merge branch 'master' into replay_keycounter
2018-09-05 08:53:02 +09:00
Dean Herbert
4376ad107e
Merge branch 'master' into Private_Messages
2018-08-24 17:26:33 +09:00
smoogipoo
1a2c3715c7
Fix testcase dodginess
2018-08-24 15:50:39 +09:00
Jarosław Zgierski
5256f3ed31
Merge branch 'master' into changelog-overlay
2018-08-21 13:55:02 +02:00
Dean Herbert
ed2a642666
Fix info wedge test case failing randomly
2018-08-16 10:05:34 +09:00
DrabWeb
e65bb5b54b
Remove unused usings, remove unused icon variable.
2018-08-14 12:34:05 -03:00
DrabWeb
7d8c0aca72
Order usings, use inline out variable declaration.
2018-08-14 12:25:35 -03:00
DrabWeb
af31845c83
Fix naming conflicts in RoomSettingsOverlay.
2018-08-14 11:31:20 -03:00
DrabWeb
52b157d072
Merge https://github.com/ppy/osu into multiplayer-room-settings
2018-08-14 11:16:25 -03:00
smoogipoo
78258e2fe2
Prefix some methods with "Test"
2018-08-14 14:19:26 +09:00
smoogipoo
15bd7e4f1f
Test that changing ruleset resets mods
2018-08-14 14:18:46 +09:00
Dean Herbert
4cb7063801
Add automated testing of mod preservation/removal
2018-08-07 16:45:18 +09:00
Dean Herbert
7b8bd7f21c
Fix mod selection not restoring when re-entering song select
2018-08-07 14:49:44 +09:00
miterosan
b414bff864
Fix the testcase
2018-08-04 01:00:46 +02:00
miterosan
358c346923
Use TabItem.Items.Count
2018-08-04 00:44:16 +02:00
miterosan
cc640893c2
Merge branch 'master' into Private_Messages
2018-08-04 00:33:46 +02:00
Dean Herbert
042e4e3966
Merge branch 'master' into add-loading-animation
2018-08-03 21:50:02 +09:00
Dean Herbert
b1afcf0e5d
Add loading animation to player loader to make it more obvious when loading is complete
2018-08-02 19:47:50 +09:00
Dean Herbert
3c06655672
Split out Special mods into Automation and Conversion
2018-07-31 18:00:42 +09:00
Dean Herbert
49b2d8c355
Merge branch 'master' into open-downloaded-beatmas
2018-07-31 16:41:09 +09:00
smoogipoo
ae8bf34fd1
Fix breadcrumb testcase failures
2018-07-31 13:48:21 +09:00
miterosan
8bccecc2e5
Add some more testing.
2018-07-30 00:13:32 +02:00
miterosan
b1e9a4fd24
Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
2018-07-29 23:28:34 +02:00
miterosan
95cb21299a
Remove chatTabControl and transfer the logic into ChannelTabControl.
2018-07-29 21:18:37 +02:00
Roman Kapustin
3134e14b37
Test KeyCounter.RestoreState
2018-07-28 23:24:03 +03:00
Dean Herbert
b7de922896
Merge branch 'master' into open-downloaded-beatmas
2018-07-28 12:44:34 +09:00
HoutarouOreki
a8b0e23ed6
Merge remote-tracking branch 'upstream/master' into changelog-overlay
2018-07-26 15:41:33 +02:00
HoutarouOreki
0f263e2cca
Delete ClickableText class, use OsuHoverContainer instead
2018-07-26 14:19:58 +02:00
Dean Herbert
ee0522ad84
Ignore failing test
2018-07-25 16:45:07 +02:00
HoutarouOreki
2906f4b401
Change initial chart colour
2018-07-25 14:31:41 +02:00
AlFasGD
c4b1ba2979
Remove padding, fix corner radiuses
2018-07-25 15:14:40 +03:00
Dean Herbert
95cca046fb
Merge branch 'master' into open-downloaded-beatmas
2018-07-25 12:38:49 +02:00
HoutarouOreki
3b36288185
Rename TestCaseChangelog to TestCaseChangelogOverlay
2018-07-24 20:13:53 +02:00
HoutarouOreki
fa6074925e
Remove unused variable
2018-07-24 17:02:24 +02:00
AlFasGD
cd37b0df23
Merge branch 'master' into labelled-text-box
2018-07-24 09:19:22 +03:00
HoutarouOreki
24bb44a152
Add TextBadgePair test case
2018-07-24 04:04:18 +02:00
Dean Herbert
0aacde836a
Move private channel constructor to own class
2018-07-23 20:46:44 +02:00
HoutarouOreki
f685c5ba58
Fix typos; remove outdated comments; minor order changes
2018-07-23 18:38:20 +02:00
HoutarouOreki
e27292fef8
Rewrite LineBadge.cs
...
+ update all its references
2018-07-23 17:49:42 +02:00
miterosan
9f43e0c900
Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
...
# Conflicts:
# osu.Game/Overlays/Chat/ChatTabControl.cs
# osu.Game/Overlays/ChatOverlay.cs
2018-07-23 15:45:54 +02:00
AlFasGD
dd56a2d95f
Apply proposed changes (untested)
2018-07-23 15:44:10 +03:00
Dean Herbert
82ea4456e4
Fix testing regression
2018-07-23 10:33:10 +02:00
Jarosław Zgierski
f26c2f6123
Merge branch 'master' into changelog-overlay
2018-07-23 09:47:04 +02:00
HoutarouOreki
24abec43c1
Show on test case
2018-07-22 21:00:29 +02:00
HoutarouOreki
23309b3b00
Strip test case
2018-07-22 20:27:20 +02:00
HoutarouOreki
421c95156b
Fix ClickableText test case
2018-07-22 15:16:42 +02:00
HoutarouOreki
2b7f657f2c
Place HTML messages in a TextFlowContainer
...
Add missing accessibility modifier in ClickableText test case and fix disposal
2018-07-22 14:44:11 +02:00
HoutarouOreki
7e327fd084
Use using
2018-07-22 12:02:45 +02:00
HoutarouOreki
50b6f88a4e
Merge branch 'changelog-overlay' of https://github.com/HoutarouOreki/osu into changelog-overlay
2018-07-22 10:58:47 +02:00
Jarosław Zgierski
44bdd0dbb6
Merge branch 'master' into changelog-overlay
2018-07-22 10:57:30 +02:00
HoutarouOreki
2ea5a97784
Fix ClickableText test case
2018-07-22 09:31:51 +02:00
HoutarouOreki
2982fe3587
Compress Test Case; Remove empty summary
2018-07-22 09:19:26 +02:00
HoutarouOreki
9586ef7b0a
ClickableText changes
2018-07-22 08:28:12 +02:00
Dean Herbert
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
Dean Herbert
a2f744b05e
Merge remote-tracking branch 'upstream/master' into open-downloaded-beatmas
2018-07-21 00:03:17 +09:00
AlFasGD
6dd5c7e5ab
Add test case
2018-07-20 14:28:39 +03:00
Dean Herbert
7cc999027d
Merge branch 'master' into pause-input-fixes
2018-07-20 17:20:19 +09:00
Dean Herbert
241437c819
Remove unnecessary counting change logic
2018-07-20 17:08:25 +09:00
Dean Herbert
64ead0fdf7
Add more tests and fix one remaining issue case
2018-07-20 11:55:17 +09:00
HoutarouOreki
a857999950
Refactor3
2018-07-20 00:52:50 +02:00
HoutarouOreki
bcd132e87f
API1
2018-07-19 19:07:24 +02:00
Dean Herbert
d7f1766ee2
wip
2018-07-19 18:51:08 +09:00
Dean Herbert
7be3a5d466
Centralise test storage logic
2018-07-19 14:07:55 +09:00
Dean Herbert
3e738c607a
Add more song select tests
2018-07-19 13:39:42 +09:00
HoutarouOreki
11e0732a27
Refactor1, UX1
2018-07-18 19:32:15 +02:00
HoutarouOreki
837747e35f
Streams3
2018-07-18 15:17:20 +02: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
1d52231d4f
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.
2018-07-18 16:44:47 +09:00
Dean Herbert
9611292f4e
FilterTask -> PendingFilter
2018-07-18 13:18:50 +09:00
HoutarouOreki
6baa761b9c
Streams2
2018-07-18 03:26:08 +02:00
HoutarouOreki
523d47e815
Streams1
2018-07-18 01:35:06 +02:00
HoutarouOreki
3c1e445fdf
Header3
2018-07-17 18:32:11 +02:00
HoutarouOreki
b4bb97fba8
Header2
2018-07-17 15:01:53 +02:00
smoogipoo
827c5c4939
Remove scroll direction from ScrolingPlayfield constructor
2018-07-17 15:14:03 +09:00
HoutarouOreki
be977e2541
Header1
2018-07-16 23:50:22 +02:00
Dean Herbert
ee2c7c50ad
Tidy up button hierarchy
2018-07-13 16:28:18 +09:00
Dan Balasescu
e20cdccf05
Merge branch 'master' into update-disclaimer
2018-07-12 23:41:55 +09:00
Dean Herbert
fbc5250bf1
Update framework
2018-07-11 17:12:01 +09:00
Dean Herbert
4638ac902c
Remove pointless rate adjust slider from TestCaseOsuGame
2018-07-11 16:31:00 +09:00
Dean Herbert
8bc7c4c9a2
Add TestCase and update disclaimer screen
2018-07-11 16:30:51 +09:00
Dan Balasescu
40ec486152
Merge branch 'master' into improve-button-system
2018-07-10 16:44:55 +09:00
Dan Balasescu
282a99fb88
Merge branch 'master' into fix-spelling
2018-07-10 16:32:14 +09:00
miterosan
ad96338af7
Merge branch 'Private_Messages' of https://github.com/miterosan/osu into Private_Messages
2018-07-09 22:47:34 +02:00
miterosan
ea597916ca
Code cleanups
2018-07-09 22:41:53 +02:00
miterosan
ae093d2619
Merge branch 'master' into Private_Messages
2018-07-09 22:15:36 +02:00
miterosan
290b6e5f1d
Fix the crash in the visual testcase
2018-07-09 22:09:27 +02:00
Dean Herbert
974c4f5185
ToolbarMode* -> ToolbarRuleset*
2018-07-10 01:20:21 +09:00
Dean Herbert
1670f4fe31
Merge branch 'master' into fix-osd-fade-in
2018-07-09 19:10:57 +09:00
Dean Herbert
df67c0498d
Fix OSD fade-in not correctly debouncing
...
It could potentially never fade in on quick presses.
2018-07-09 17:53:39 +09:00
HoutarouOreki
10aae3b0ee
Remove age from User class
2018-07-09 10:33:46 +02:00
DrabWeb
6b240280d0
Merge https://github.com/ppy/osu into multiplayer-room-settings
2018-07-07 01:10:27 -03:00
Dean Herbert
1d6609d9f3
Add common custom words to dotsettings dictionary
...
Also fixes some typos and reduces spelling suggestions to hints.
2018-07-05 15:54:41 +09:00
Dean Herbert
2aae528e1c
Improve code quality of main menu button system
2018-07-03 18:23:41 +09:00
miterosan
d791216505
Merge branch 'master' into Private_Messages
2018-07-03 07:58:15 +02:00
smoogipoo
90d90370c2
Use testcase ruleset
2018-07-02 15:25:37 +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
miterosan
884ac71874
Merge branch 'master' into Private_Messages
2018-06-28 21:04:02 +02:00
Dean Herbert
c44a81bdf5
Add word wrap support
2018-06-28 13:04:39 +09:00
smoogipoo
ede59f63f6
Merge remote-tracking branch 'origin/master' into make-loading-more-visible
2018-06-27 12:52:06 +09:00
Dean Herbert
ac1bf3b092
Merge branch 'master' into editor-seek-snapping-fix
2018-06-27 11:08:19 +09:00
Dean Herbert
018dcc98b4
Fix failing tests
2018-06-26 19:17:34 +09:00
Dean Herbert
594cc0d21d
Merge branch 'master' into mania-playfield-inversions
2018-06-25 18:36:23 +09:00
Dean Herbert
e75ff1145c
Merge branch 'master' into editor-seek-snapping-fix
2018-06-25 18:27:03 +09:00
Dean Herbert
b0cd227e81
Fix race condition in TestCaseLounge (attempt 2)
2018-06-25 14:10:54 +09:00
miterosan
6049303c40
Merge branch 'master' into Private_Messages
2018-06-23 20:44:43 +02:00
Dan Balasescu
d77ba64a73
Merge branch 'master' into fix-test-case-lounge
2018-06-22 17:36:40 +09:00
Dean Herbert
fccd4f965c
Merge remote-tracking branch 'upstream/master' into make-loading-more-visible
2018-06-22 14:21:01 +09:00
Dean Herbert
eb6d6dc2de
Improve the visibility of the global loading animation
...
Updates design to match new `osu-web` design.
Adds TestCase for visual testing.
2018-06-22 13:14:43 +09:00
Dean Herbert
73e13e2d63
Rename Stop to StopAnyPlaying for clarity
2018-06-22 12:35:43 +09:00
smoogipoo
15bb301d14
Remove unused field
2018-06-21 19:37:45 +09:00
smoogipoo
1932399521
Add testcases
2018-06-21 19:31:07 +09:00
Dean Herbert
c60b8bba35
Fix race condition in TestCaseLounge
2018-06-21 17:04:57 +09:00
Dean Herbert
df0083e3d9
Add tests for ParallaxContainer
2018-06-21 12:48:57 +09:00
Dean Herbert
5157a069bc
Merge branch 'master' into Private_Messages
2018-06-21 11:37:19 +09:00
Dean Herbert
2697579448
Give TestLounge a background to make transitions work correctly
2018-06-21 09:54:13 +09:00
Dean Herbert
b8f9caf418
Merge branch 'master' into multiplayer-match
2018-06-19 17:18:33 +09:00
smoogipoo
01b909eaa7
Add testfixture annotation
2018-06-18 17:06:21 +09:00
smoogipoo
ffc5d7bd43
Fix some incorrect test case values
2018-06-18 17:05:04 +09:00
smoogipoo
0d154621b6
Cleanup testcase
2018-06-18 16:09:38 +09:00
Dean Herbert
1d9d240454
Merge branch 'master' into mania-playfield-inversions
2018-06-18 04:41:17 +09:00
Dean Herbert
d58ef96a23
Merge branch 'master' into timeline-markers
2018-06-18 03:14:04 +09:00
Dean Herbert
ae160baa6e
Merge branch 'master' into timeline-input-adjustment
2018-06-18 02:54:25 +09:00
Dean Herbert
48613ea1f6
Merge branch 'master' into timeline-markers
2018-06-18 02:09:20 +09:00
miterosan
1f04dd9ada
Cache the dependencies using the static method of the class Dependencies.
2018-06-17 15:08:13 +02:00
miterosan
cd0fe6a09e
Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseChatLink.cs
2018-06-17 14:15:14 +02:00
Dean Herbert
a20ec0d4cc
Merge branch 'master' into timeline-audio-scrolling
2018-06-17 19:01:21 +09:00
smoogipoo
08f172ba98
Make testcase work on appveyor (no BASS)
2018-06-17 19:01:18 +09:00
smoogipoo
0695615c6a
Remove MusicController from compose timeline testcase
2018-06-17 19:01:14 +09:00
smoogipoo
6c100caba7
Use existing instance of beatmap rather than adding more resources
2018-06-17 19:00:58 +09:00
smoogipoo
4eda017fa5
Fix CI error
2018-06-17 17:54:05 +09:00
Dean Herbert
b318b770d4
Fix pixellation of volume meter progress bars
2018-06-13 19:22:39 +09:00
Dan Balasescu
ac1990c093
Remove unused using
2018-06-12 16:36:46 +09:00
smoogipoo
93d2b5c4de
Adjust precision for failing test
2018-06-12 16:20:38 +09:00
smoogipoo
34f23359bb
Fix unit tests
2018-06-12 16:20:31 +09:00
smoogipoo
7dfe171869
Fix rebase error
2018-06-12 14:34:28 +09:00
smoogipoo
6ceac8ab0a
Add a centre marker to the timeline
2018-06-12 14:34:28 +09:00
smoogipoo
b90cdfbfd1
Remove unused variable
2018-06-12 14:33:33 +09:00
Dan Balasescu
f71b0456e8
Merge branch 'master' into timeline-audio-scrolling
2018-06-12 14:23:05 +09:00
smoogipoo
30b7b7961f
Merge remote-tracking branch 'origin/master' into timeline-audio-scrolling
...
# Conflicts:
# osu-framework
# osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
# osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs
2018-06-12 14:22:27 +09:00
Dan Balasescu
0a35a81c2d
Merge branch 'master' into populate-missing-online-ids
2018-06-12 13:11:21 +09:00
Dean Herbert
37ea4c273b
Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework
2018-06-11 20:17:41 +09:00
Dean Herbert
8092d70402
Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework
2018-06-11 20:17:33 +09:00
Dean Herbert
955a78e76d
Remove OnlineBeatmapSetID from BeatmapInfo
...
It should now be retrieved via the linked BeatmapSetInfo
2018-06-08 15:26:27 +09:00
DrabWeb
0815e0ba83
Merge https://github.com/ppy/osu into multiplayer-room-settings
2018-06-08 01:16:22 -03:00
Dean Herbert
8220e0c79a
Remove OnlineBeatmapSetID from BeatmapMetadata
2018-06-08 12:46:34 +09:00
Dean Herbert
8cc31aca54
Reorganise API requests and response classes
...
They were previously breaking the two-class-per-file rule.
2018-06-08 11:42:35 +09:00
DrabWeb
ed97d35ef7
Test steps.
2018-06-06 23:30:17 -03: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
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
DrabWeb
d6e3dc10e9
Fix RoomSettingsOverlay not being updated when the rooms values are.
2018-06-06 05:38:43 -03:00
DrabWeb
8c97999de9
Add empty RoomSettingsOverlay.
2018-06-06 00:29:52 -03:00
DrabWeb
b8e403f38a
Merge https://github.com/ppy/osu into multiplayer-room-settings
2018-06-06 00:19:23 -03:00
Dan Balasescu
b2cc7b9a5c
Merge branch 'master' into fix-beatmap-info-wedge-async
2018-06-04 20:29:29 +09:00
Dan Balasescu
566470e852
Merge branch 'master' into better-loading-logo
2018-06-04 20:06:22 +09:00
Dean Herbert
4b604bf055
Merge branch 'master' into disallow-beatmap-change
2018-06-04 10:53:04 +09:00
ekrctb
ed1918cd43
Wait for loading beatmaps
2018-06-03 23:11:45 +09:00
Dean Herbert
5c2a2e394e
Fix incorrect async logic in BeatmapInfoWedge
...
Closes #2653 .
Alternative to #2657 .
2018-06-01 20:31:29 +09:00
DrabWeb
9989517ff0
Merge https://github.com/ppy/osu into multiplayer-match
2018-06-01 04:01:14 -03:00
miterosan
6e0099d2b1
Fix webexception due to invalid user ids
2018-05-31 22:56:12 +02:00
Dean Herbert
a6f2561be8
Fix automated testing
2018-05-31 20:07:55 +09:00
Dean Herbert
dfbcf4d7b7
Add tests
2018-05-31 17:29:59 +09:00
Dean Herbert
49a683e386
Merge remote-tracking branch 'upstream/master' into miterosan-Private_Messages
2018-05-31 14:50:20 +09:00
Dean Herbert
319faf12f7
Fix incorrect naming of label
2018-05-31 12:39:56 +09:00
Dean Herbert
2f21b9c4ea
Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits
2018-05-31 12:36:37 +09:00
DrabWeb
9a7e5a3e2c
Update TestCaseMatch.
2018-05-29 04:16:19 -03:00
DrabWeb
7edb82eb85
Add TestCaseMatchParticipants.
2018-05-29 03:53:30 -03:00
DrabWeb
8595c821b4
Add TestCaseMatchHeader.
2018-05-29 03:34:02 -03:00
DrabWeb
b4b4a8a157
Add TestCaseMatchInfo.
2018-05-29 03:24:38 -03:00
DrabWeb
3915cb7f2f
Add Match Participants, change Room.Users to IEnumerable.
2018-05-29 02:42:52 -03:00
DrabWeb
c8ce34b6d4
Add Match Info.
2018-05-29 01:51:04 -03:00
DrabWeb
98819880c4
Add match screen header.
2018-05-29 01:16:39 -03:00
DrabWeb
ab3ac49a2d
Add empty Match screen.
2018-05-29 01:16:39 -03: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
Dean Herbert
02c37ebc1f
Move screen titles to OsuScreen
2018-05-28 13:30:24 +09:00
Dean Herbert
3c3412791c
Merge remote-tracking branch 'upstream/release' into multiplayer-lounge
2018-05-28 13:30:04 +09:00
Dean Herbert
12b5ca1b0d
Merge branch 'master' into multiplayer-lounge
2018-05-27 11:15:03 +09:00
Dean Herbert
975ce82177
Ensure autoplay tests actually increase score above zero
2018-05-26 14:46:05 +09:00
Dean Herbert
79442ad238
Merge branch 'master' into CursorOverrideContainer-rename
2018-05-26 12:19:47 +09:00
HoutarouOreki
e2d840c2de
Rename CursorOverrideContainer to MenuCursorContainer
2018-05-25 21:13:40 +02:00
Dean Herbert
adeb23d54b
Merge branch 'master' into fix-failing-tests
2018-05-25 19:36:05 +09:00
Dean Herbert
8977670088
Update framework
2018-05-25 19:21:49 +09:00
Dean Herbert
7d06a08c3a
Fix quit button test occasionally failing
2018-05-25 17:44:56 +09:00
smoogipoo
f1ac84d95b
Fix base.CreateLocalDependencies sometimes not being called
2018-05-24 13:03:25 +09:00
smoogipoo
8004b8af4d
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
2018-05-23 17:38:02 +09:00
smoogipoo
49f893d5e4
Couple the timeline to the audio
2018-05-23 12:00:11 +09:00
jorolf
8fbda5bc59
add license header
2018-05-22 15:41:10 +02:00
jorolf
b324337fa1
Add icon next to beatmap title/username to open in browser
2018-05-22 15:29:52 +02:00
smoogipoo
1dfa3ff995
Merge remote-tracking branch 'origin/master' into editor-timeline-rework
2018-05-22 18:30:29 +09:00
DrabWeb
0b19b7d9e5
Fix test case.
2018-05-22 02:08:50 -03:00
DrabWeb
fba79a4de6
Test typo.
2018-05-22 01:31:01 -03:00
DrabWeb
662559d3c9
More test steps.
2018-05-22 01:22:23 -03:00
DrabWeb
f7a4a4eeef
Add Lounge FilterControl.
2018-05-22 00:24:39 -03:00
DrabWeb
cae09492c3
Basic Lounge functionality.
2018-05-22 00:07:04 -03:00
Dean Herbert
ebda287e81
Share code with HoldToConfirm implementations elsewhere
2018-05-22 01:44:06 +09:00
Dean Herbert
841336a181
Merge branch 'master' into exit_replay_button
2018-05-21 23:45:06 +09:00
Dean Herbert
92668f07e0
Merge branch 'master' into drawable-room-improvements
2018-05-21 11:09:12 +09:00
DrabWeb
136c57b824
Don't set size in ctor.
2018-05-19 02:27:33 -03:00
DrabWeb
ad878003f7
Add null room support to RoomInspector.
2018-05-19 02:23:09 -03:00
smoogipoo
757f898718
Add testcase for zoomable scroll container
2018-05-18 17:53:19 +09:00
smoogipoo
3f365c6621
Merge branch 'master' into editor-timeline-rework
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
# osu.Game/Screens/Edit/Screens/Compose/Compose.cs
# osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollableTimeline.cs
# osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs
2018-05-16 18:04:24 +09:00
DrabWeb
8e053f2166
Add multiplayer screen test steps.
2018-05-15 21:20:34 -03:00
DrabWeb
1a78ac3d10
Add Multiplayer screen.
2018-05-15 21:14:10 -03:00
DrabWeb
1450bf64f5
Add multiplayer screen header.
2018-05-15 20:34:14 -03:00
DrabWeb
dda253758b
Cleanup test step wording.
2018-05-15 19:56:47 -03:00
DrabWeb
f67ad7b8e8
Add exit test.
2018-05-15 19:52:28 -03:00
Dean Herbert
28df77e838
Simplify code and remove generic
2018-05-15 21:10:26 +09:00
Dean Herbert
0def847f60
Merge branch 'master' into screen-breadcrumbs
2018-05-15 19:39:03 +09:00
Dean Herbert
fc192c8998
Merge remote-tracking branch 'upstream/master' into smoogipoo-disable-mouse-buttons
2018-05-15 19:23:51 +09:00
smoogipoo
9536c324fa
Rename aborted -> fired
2018-05-14 19:08:00 +09:00
Dean Herbert
f14948c022
Merge branch 'master' into exit-hold-confirmation
2018-05-14 18:13:40 +09:00
DrabWeb
518dec0c68
Merge https://github.com/ppy/osu into drawable-room-improvements
2018-05-11 13:41:50 -03:00
Dean Herbert
f1fd2ae7be
Merge branch 'master' into modmouseup
2018-05-11 21:41:14 +09:00
Dean Herbert
7cb0d328e6
Make mods screen dynamically testable
2018-05-11 21:40:48 +09:00
Dean Herbert
c19432dc6d
Merge branch 'master' into ruleset-beatmap-statistics
2018-05-11 17:37:50 +09:00
DrabWeb
fa403e4e2a
Add test step to test pushing after a previous screen is made current.
2018-05-11 04:49:40 -03:00
smoogipoo
73465c35fa
Merge remote-tracking branch 'origin/master' into ruleset-beatmap-statistics
...
# Conflicts:
# osu.Game/Beatmaps/Beatmap.cs
2018-05-11 14:05:40 +09:00
DrabWeb
ec53927d8e
Add selection to DrawableRoom.
2018-05-10 22:48:07 -03:00
DrabWeb
6f7d0c19ef
Remove redundant default value.
2018-05-10 22:02:27 -03:00
DrabWeb
a294f187ee
Add steps and asserts to TestCaseScreenBreadcrumbs.
2018-05-10 21:52:26 -03:00
DrabWeb
b9adeeb063
Add ScreenBreadcrumbControl.
2018-05-10 21:35:26 -03:00
DrabWeb
a86843ccc9
Remove unused usings caused by multiplayer folder restructuring.
2018-05-10 20:49:42 -03:00
DrabWeb
2d206d258a
Move multiplayer screen components to osu.Game/Screens/Multi/Components
2018-05-10 20:44:24 -03:00
DrabWeb
c35760fdef
Rename osu.Game/Screens/Multiplayer to Multi.
2018-05-10 20:39:05 -03:00
Dean Herbert
8a6ef0dabb
Merge branch 'master' into beatmap-conversion-rework
2018-05-10 19:10:07 +08:00
Dean Herbert
9e26bcd571
Merge remote-tracking branch 'upstream/master' into smoogipoo-i-beatmap
2018-05-10 19:51:52 +09:00
smoogipoo
c03ab9014f
Improve TestCaseOnScreenDisplay
...
Now doesn't rely on framesync.
2018-05-10 18:48:48 +09:00
Dean Herbert
fadb1a5e0b
Add tests and expand functionality to ensure single fire
2018-05-10 17:31:16 +09:00
smoogipoo
c7bc79bce3
Remove explicit clock in TestCaseBreakOverlay
2018-05-09 12:40:04 +09:00
smoogipoo
09c70a9362
Add info label tests to TestCaseBeatmapInfoWedge
2018-05-07 15:51:08 +09:00
smoogipoo
6a9f139d9b
Instantiate convertible hitobjects for beatmap info wedge
2018-05-07 15:51:08 +09:00
smoogipoo
9128e64c9a
Rename OriginalBeatmap back to Beatmap
2018-05-07 10:29:38 +09:00
smoogipoo
4ecdea8b2e
Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer
2018-05-07 10:17:54 +09:00
smoogipoo
27c8591d48
Fix reference to old name
2018-05-07 10:07:50 +09:00
smoogipoo
77e661489d
Merge branch 'i-beatmap' into beatmap-conversion-rework
2018-05-07 10:00:24 +09:00
smoogipoo
20509b1cc2
Fix non-IBeatmap usage
2018-05-07 09:59:45 +09:00
smoogipoo
1aefd71b65
Merge remote-tracking branch 'origin/master' into i-beatmap
2018-05-07 09:58:53 +09:00
miterosan
ba5861b527
Merge remote-tracking branch 'origin/master' into Private_Messages
...
# Conflicts:
# osu.Game/Online/API/Requests/GetMessagesRequest.cs
# osu.Game/Overlays/Chat/ChatTabControl.cs
2018-05-06 19:45:33 +02:00
Roman Kapustin
b0e556d83f
Actualize QuitButton visual test
2018-05-04 00:01:00 +03:00
Roman Kapustin
39db1e8cbb
Rename HoldToQuit to QuitButton
2018-05-03 23:50:30 +03:00
Roman Kapustin
f8630115d6
Do not expose HoldToQuit.HoldToQuitButton
2018-05-03 23:29:58 +03:00
TocoToucan
3b84ce7c9f
Remove redundant test step
2018-05-01 03:56:01 +03:00
UselessToucan
d18a8ec9f5
Merge branch 'master' into exit_replay_button
2018-04-28 20:48:16 +03:00
TocoToucan
b3cf381c5d
Add TestCaseHoldToQuit
2018-04-28 19:24:49 +03:00
Dean Herbert
57219ae9c6
Fix clashing variable name
2018-04-24 02:07:16 +09:00
Dean Herbert
f4c2d6b1a3
Fix wedge load test again
...
Initial load was not being waited on for long enough.
2018-04-24 00:51:33 +09:00
Dean Herbert
9551b6914b
Fix UserProfile test failing when not logged in
2018-04-23 21:41:51 +09:00
Dean Herbert
7d09a39262
Fix remaining broken test
2018-04-23 20:50:16 +09:00
Dean Herbert
8bf25542cb
Add PlayerLoader TestCase and fix dummy beatmap load procedure
2018-04-20 17:30:27 +09:00
smoogipoo
03a5df84c6
Initial rework of beatmap conversion process
2018-04-19 22:04:12 +09:00
Dean Herbert
77af8ce556
Add back online load test for BeatmapScoresContainer
2018-04-19 21:11:16 +09:00
smoogipoo
66b3b295e7
Use IBeatmap wherever possible
2018-04-19 20:44:38 +09:00
miterosan
3b68dda23e
Merge remote-tracking branch 'origin/master' into Private_Messages
2018-04-18 20:55:12 +02:00
miterosan
29e8c70ed7
Only use one tabControl (channeltabcontrol). Fix that the Channel messages did not refresh.
2018-04-18 20:46:42 +02:00
Dean Herbert
1be2571d33
Make BeatmapSetOverlay accept nulls everywhere
2018-04-18 16:08:45 +09:00
jorolf
de9f15f620
add new test case and fix rotation not working
2018-04-16 19:22:11 +02:00
jorolf
2a18b4c3f8
add a DRAWABLE_BADGE_SIZE const and center badges
2018-04-16 18:51:35 +02:00
jorolf
6ca714d93b
add badges to ProfileHeader
2018-04-15 23:49:45 +02:00
Dean Herbert
ae77c010e2
Merge remote-tracking branch 'upstream/master' into wave-container
2018-04-15 21:03:18 +09:00
miterosan
142e1b8587
update the line endings
2018-04-14 13:32:48 +02:00
miterosan
5bfb386226
Merge remote-tracking branch 'origin/master' into Private_Messages
2018-04-14 13:31:03 +02:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
Endrik Tombak
d9f587edff
Merge remote-tracking branch 'upstream/master' into alt-eagerselect
2018-04-13 11:55:35 +03:00
miterosan
e39f5a1adf
Rename var chatmanager -> channelManager
...
Apply requested changes
2018-04-12 23:19:13 +02:00
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
miterosan
b997f0f3fa
Remove not needed using
2018-04-11 21:09:38 +02:00
miterosan
a5e0311253
Trim whitespaces
2018-04-11 20:53:35 +02:00
miterosan
499ecd3843
Fix the warnings
2018-04-11 20:44:35 +02:00
miterosan
2056258def
Fix code sanity
2018-04-11 20:31:16 +02:00
miterosan
3860594f40
Rename everything into channel and remove everything chat
2018-04-11 20:01:57 +02:00
miterosan
39ecc3d31d
Add Test Case, improve displaying the avatar, use a chatTabControl instead of putting both in ChatOverlay, readd shadow.
...
Requires osu-framework for a fix
2018-04-11 18:23:09 +02:00
miterosan
96bacaf13f
Allow the ChatLinkTestcase to work again
2018-04-09 21:06:28 +02:00