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
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
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
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
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
smoogipoo
cadfe41f83
Merge remote-tracking branch 'origin/master' into external_link_warning
2018-11-23 15:19:52 +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
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
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
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
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
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
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
