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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|