Dean Herbert
|
4a04b434a9
|
Merge branch 'master' into remove-current-item
|
2020-02-13 21:41:23 +09:00 |
|
Dean Herbert
|
28ca1a5bcc
|
Merge branch 'master' into participants-bindable
|
2020-02-13 19:31:50 +09:00 |
|
smoogipoo
|
bce9c8f3f3
|
Make room participants into a bindable list
|
2020-02-13 18:59:15 +09:00 |
|
smoogipoo
|
75bef15583
|
Remove "current" multiplayer room item
|
2020-02-13 18:48:28 +09:00 |
|
smoogipoo
|
91edadfe9d
|
Make playlist beatmap and ruleset into bindables
|
2020-02-13 18:12:47 +09:00 |
|
Dean Herbert
|
fd71a53717
|
Fix test regression
|
2020-02-06 14:28:09 +09:00 |
|
Dean Herbert
|
a84386ba01
|
Merge branch 'simplify-mp-subscreen-disables' into lounge-ruleset-filtering
|
2020-02-06 14:22:52 +09:00 |
|
Dean Herbert
|
81cadb7875
|
Simplify the way multiple subscreens handle their disable states via a custom stack
|
2020-02-06 14:22:01 +09:00 |
|
Dean Herbert
|
114fd967c1
|
Revert "Remove leasing at a Multiplayer screen level"
This reverts commit 304a071e39.
|
2020-02-06 13:47:34 +09:00 |
|
Dean Herbert
|
e548a4b8dd
|
Fix missing bind causing regression in filter
|
2020-02-06 13:36:49 +09:00 |
|
Dean Herbert
|
061b8c389f
|
Fix null search string causing an exception
|
2020-02-06 13:03:04 +09:00 |
|
Dean Herbert
|
1dc7fc4a33
|
Fix case where playlist is empty
|
2020-02-06 13:01:48 +09:00 |
|
Dean Herbert
|
a79d6ff27a
|
Change transition to better handle mass filter cases
|
2020-02-06 12:17:20 +09:00 |
|
Dean Herbert
|
304a071e39
|
Remove leasing at a Multiplayer screen level
|
2020-02-06 12:17:20 +09:00 |
|
Dean Herbert
|
50c4e34c92
|
Add ruleset to multiplayer filter criteria
|
2020-02-06 12:17:20 +09:00 |
|
Dean Herbert
|
00edc7e66f
|
Fix RoomsContainer test scene not displaying
|
2020-02-06 12:14:17 +09:00 |
|
recapitalverb
|
9898a926b2
|
Use ScoreInfo.DisplayAccuracy everywhere
|
2020-02-03 22:11:36 +07:00 |
|
Dean Herbert
|
19f516e710
|
Ensure OsuScreen level leases are taken out synchronously
|
2020-01-31 19:10:44 +09:00 |
|
smoogipoo
|
76af8bea5d
|
Fix percentage-formatted displays containing a space
|
2020-01-29 19:51:24 +09:00 |
|
Dean Herbert
|
36224dca13
|
Fix multiplayer aggregate score inheriting from ScoreInfo
|
2019-12-05 01:45:28 +09:00 |
|
Huo Yaoyuan
|
818553027b
|
Merge branch 'master' into sharpen
|
2019-11-21 23:42:46 +08:00 |
|
Dean Herbert
|
2325f0382c
|
Cancel a potentially pending filter update when an update occurs
|
2019-11-21 13:46:45 +09:00 |
|
smoogipoo
|
0cbe29dbec
|
Refactor / cleanup debouncing
|
2019-11-21 11:05:18 +09:00 |
|
smoogipoo
|
10287eb66d
|
Add debounce logic in several places
|
2019-11-15 17:58:47 +09:00 |
|
smoogipoo
|
1b4bcb81c8
|
Fix filtering breaking on secondary filters
|
2019-11-15 17:49:02 +09:00 |
|
smoogipoo
|
f0b7b2e1c4
|
Fix broken test case
|
2019-11-15 11:07:16 +09:00 |
|
smoogipoo
|
956fb9912d
|
Hook up multiplayer search filter
|
2019-11-15 08:23:56 +09:00 |
|
Huo Yaoyuan
|
f3f5094c26
|
Convert delegate to local function.
|
2019-11-12 20:14:22 +08:00 |
|
Huo Yaoyuan
|
ccc8aa6fa4
|
Apply brace style.
|
2019-11-11 20:13:13 +08:00 |
|
Dean Herbert
|
5127b52c25
|
Merge remote-tracking branch 'upstream/master' into game-handles-links
|
2019-11-03 13:04:18 +09:00 |
|
Dean Herbert
|
898520935e
|
Move link handling code to OsuGame
This allows for future calls from arguments / associations
|
2019-11-01 11:40:51 +09:00 |
|
Dean Herbert
|
5b405abc52
|
Schedule forcefullyExit call for safety
Screen state may have changed at an inopportune moment. Run on local scheduler, not API scheduler to avoid any weirdness.
|
2019-10-31 13:43:25 +09:00 |
|
Dean Herbert
|
32dabf80a6
|
Ensure forceful exit completely exits from mutliplayer
Previously it may have gotten blocked by being in a sub screen.
|
2019-10-31 13:42:28 +09:00 |
|
smoogipoo
|
f56d9fe50c
|
Forcefully part room when multiplayer exits
|
2019-10-30 14:42:14 +09:00 |
|
smoogipoo
|
b6457f0ce9
|
Cancel room joins on part
|
2019-10-30 14:41:54 +09:00 |
|
smoogipoo
|
95ff48c123
|
Don't log cancelled join requests
|
2019-10-30 14:38:06 +09:00 |
|
Joehu
|
5f700f2ae9
|
Simplify exit logic of screens with textboxes using back button receptor
|
2019-10-01 08:26:34 -07:00 |
|
Dean Herbert
|
48716f8f2b
|
Update framework
|
2019-08-21 13:29:50 +09:00 |
|
smoogipoo
|
e356cc8d9e
|
Refactor MatchBeatmapPanel for thread safety
|
2019-08-13 17:57:16 +09:00 |
|
smoogipoo
|
7c9c9f1ce1
|
Simplify caching
|
2019-08-13 17:38:21 +09:00 |
|
smoogipoo
|
92c2dafa12
|
Tighten accessibility
|
2019-08-13 17:34:16 +09:00 |
|
smoogipoo
|
6b57c9801d
|
Cull some unnecessary whitespace
|
2019-08-13 17:32:43 +09:00 |
|
Andrei Zavatski
|
982066dfdf
|
Convert to method group
|
2019-08-12 10:38:34 +03:00 |
|
Andrei Zavatski
|
cb910a6518
|
Replace if/else statement
|
2019-08-12 10:02:45 +03:00 |
|
Andrei Zavatski
|
5b68a2f34a
|
Rename trackManager to previewTrackManager
|
2019-08-12 09:50:49 +03:00 |
|
Andrei Zavatski
|
520924b440
|
Don't create a new request if onlineId is null
|
2019-08-12 09:45:21 +03:00 |
|
Andrei Zavatski
|
9ab132520c
|
Testcase improvements
|
2019-08-08 12:25:46 +03:00 |
|
Andrei Zavatski
|
e9b5c91690
|
Fade out existing panel on beatmap change
|
2019-08-08 12:08:51 +03:00 |
|
Andrei Zavatski
|
08a92c38d7
|
adjust naming
|
2019-08-08 12:04:44 +03:00 |
|
Andrei Zavatski
|
1b559c1585
|
Use async loading
|
2019-08-08 12:01:33 +03:00 |
|
Dean Herbert
|
a3dbaef4ca
|
Adjust background gradient
|
2019-08-08 17:29:50 +09:00 |
|
Andrei Zavatski
|
8668bce25d
|
Fix preview can be played on start
|
2019-08-08 09:52:42 +03:00 |
|
Andrei Zavatski
|
cbcdc28900
|
Fix hard crash when clicking on a preview button
|
2019-08-08 09:04:24 +03:00 |
|
Andrei Zavatski
|
a4459972b6
|
Remove ViewBeatmapButton
|
2019-08-08 07:15:30 +03:00 |
|
Andrei Zavatski
|
ffed642929
|
Implement MatchBeatmapPanel
|
2019-08-08 07:08:51 +03:00 |
|
Joehu
|
0082695cd8
|
Choose default category sorting instead of being always first
|
2019-08-02 13:22:58 -07:00 |
|
David Zhao
|
26fc782de9
|
Don't exit if screenstack is null
|
2019-07-29 10:35:51 +09:00 |
|
Dean Herbert
|
e76b3e2b40
|
User property instead of method
|
2019-07-21 10:42:40 +09:00 |
|
iiSaLMaN
|
842417cf42
|
Check if selected scope requires API
|
2019-07-21 03:07:27 +03:00 |
|
Dean Herbert
|
c34f6180e6
|
Merge branch 'master' into generic-download-model-manager
|
2019-06-26 20:37:56 +09:00 |
|
Dan Balasescu
|
f06aabad5f
|
Merge branch 'master' into toolbar-rulesets-refactor
|
2019-06-26 18:33:45 +09:00 |
|
Dean Herbert
|
9e1cb90dd8
|
Remove existing argument for ItemAdded event
For all usages, it looks like this was unnecessary.
|
2019-06-26 11:40:41 +09:00 |
|
smoogipoo
|
531b107a98
|
Exit match before exiting multiplayer
|
2019-06-25 18:33:26 +09:00 |
|
Andrei Zavatski
|
9dedd62d9a
|
Revert a hotfix in multi screen
since it's been fixed in a framework
|
2019-06-24 22:57:18 +03:00 |
|
Andrei Zavatski
|
35516e7304
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor
|
2019-06-24 22:52:24 +03:00 |
|
smoogipoo
|
8d6fc3edf0
|
Fix multiplayer create button appearing in match song selection
|
2019-06-24 11:54:41 +09:00 |
|
Andrei Zavatski
|
bbdb114f04
|
Add missing blank line
|
2019-06-24 02:09:00 +03:00 |
|
Andrei Zavatski
|
94e819578e
|
Finally fix the problem when we can't apply a ruleset in the multi screen
because it's disabled
|
2019-06-24 01:55:35 +03:00 |
|
Dan Balasescu
|
c79c4641f3
|
Merge branch 'master' into use-modelbackeddrawable
|
2019-06-21 14:26:07 +09:00 |
|
Dean Herbert
|
6426983de0
|
Move logic out of update (and simplify, hopefully)
|
2019-06-19 13:15:58 +09:00 |
|
KingLuigi4932
|
fec0db8fe1
|
Merge UpdateableAvatar.cs and Avatar.cs + Rename Avatar to DrawableAvatar
|
2019-06-17 21:55:07 +03:00 |
|
KingLuigi4932
|
d665f1fe4b
|
Seperate drawable and updateable flag from Country + Use UpdateableFlag
|
2019-06-17 20:57:57 +03:00 |
|
smoogipoo
|
c1d2fff651
|
Use RestartPoint
|
2019-06-17 12:44:19 +09:00 |
|
smoogipoo
|
bc35a30a25
|
Fix audio being dimmed during multiplayer
|
2019-06-17 12:27:53 +09:00 |
|
Dean Herbert
|
bc574520bf
|
Update ScrollContainer usages in line with framework changes
|
2019-06-14 15:55:32 +09:00 |
|
smoogipoo
|
cea353975f
|
Update with further framework-side changes
|
2019-06-04 11:04:28 +09:00 |
|
Dean Herbert
|
4ca34bd5e8
|
Update osu! in line with audio subsystem refactor
|
2019-05-28 17:06:01 +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
|
f26a1cff6c
|
Fix beatmap import crashing during room creation
|
2019-05-07 12:14:57 +09:00 |
|
Dean Herbert
|
6bdaca1e3b
|
Fix mod equality checks not working as intended
|
2019-05-03 10:09:47 +09:00 |
|
Dean Herbert
|
fa340a9eff
|
Merge branch 'master' into profile-header-update
|
2019-04-27 23:48:23 +09:00 |
|
Dean Herbert
|
d40177f97c
|
Merge branch 'master' into drawnode-composability
|
2019-04-27 18:41: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 |
|
Joehu
|
0838206ddd
|
Shorten multiplayer header to multi
|
2019-04-22 22:44:43 -07:00 |
|
smoogipoo
|
414d555484
|
Fix possible exit from non-current screen
|
2019-04-22 19:24: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
|
56496d28ba
|
Reset mods when exiting match
|
2019-04-09 12:59:32 +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 |
|
smoogipoo
|
772bef91fa
|
Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
# osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
|
2019-04-08 23:01:12 +09:00 |
|
smoogipoo
|
15fbb6f176
|
Use common AddUserLink method
|
2019-04-05 14:15:36 +09:00 |
|
jorolf
|
ccc804a9b2
|
get everything working again
|
2019-04-04 00:24:42 +02:00 |
|
Dean Herbert
|
f1952c0816
|
Update font awesome usage
|
2019-04-02 19:55:24 +09:00 |
|
smoogipoo
|
a56e29347f
|
Adjust namespaces
|
2019-04-02 14:51:28 +09:00 |
|
Dean Herbert
|
612db31c38
|
Apply newline additions
|
2019-04-01 12:16:32 +09:00 |
|
Dean Herbert
|
de47e0a8e8
|
Merge remote-tracking branch 'upstream/master' into screen-title-class
|
2019-03-29 14:01:08 +09:00 |
|
Dean Herbert
|
2f5668f4e7
|
Fix remaining framework changes
|
2019-03-29 00:29:14 +09:00 |
|
Dean Herbert
|
de80fc0eac
|
Update icon usage to match framework changes
|
2019-03-27 19:29:27 +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
|
9a11a08acc
|
Update textbox usages
|
2019-03-23 02:00:27 +09:00 |
|
jorolf
|
7873022a8b
|
Merge branch 'master' of git://github.com/ppy/osu into screen-title-class
|
2019-03-21 22:18:59 +01:00 |
|
jorolf
|
454c82c49e
|
Don't go outside of the container bounds
|
2019-03-21 22:18:45 +01:00 |
|
Dean Herbert
|
acbcca4462
|
Merge branch 'master' into multi-background-stack
|
2019-03-20 19:11:27 +09:00 |
|
Dean Herbert
|
baea7230bc
|
Rename RulesetContainer to DrawableRuleset
|
2019-03-19 23:47:31 +09:00 |
|
Dean Herbert
|
392a0a1d74
|
Merge branch 'master' into update-framework
|
2019-03-18 11:34:59 +09:00 |
|
Dean Herbert
|
c496f6e56b
|
Fix usages of OnLoadComplete
|
2019-03-17 13:44:20 +09:00 |
|
Dean Herbert
|
f0114d776d
|
Use interface to access API
Allows for better testability.
|
2019-03-13 12:58:18 +09:00 |
|
jorolf
|
f91e4a1fdd
|
make ScreenTitle abstract and properties protected
|
2019-03-11 19:10:37 +01:00 |
|
jorolf
|
f3ab5070b9
|
apply suggestions
|
2019-03-11 18:37:36 +01:00 |
|
David Zhao
|
63b9fa58ef
|
Cleanup
|
2019-03-11 19:52:28 +09:00 |
|
David Zhao
|
6a1e600099
|
Create new OsuScreenStack for use in Multiplayer
|
2019-03-11 19:48:07 +09:00 |
|
David Zhao
|
aeae6143c1
|
Remove unnecessary variable
|
2019-03-11 17:47:03 +09:00 |
|
David Zhao
|
0b64af5e02
|
Put multiplayer background inside a parallax container
|
2019-03-11 16:51:43 +09:00 |
|
David Zhao
|
0d95511222
|
Merge branch 'master' into multi-background-stack
|
2019-03-11 11:19:08 +09:00 |
|
David Zhao
|
2df57c3a29
|
Give Multiplayer its own background stack
|
2019-03-11 11:08:04 +09:00 |
|
Joehu
|
0fc6fa7245
|
Fix file naming on ParticipantCountDisplay
|
2019-03-09 20:29:56 -08:00 |
|
jorolf
|
af1c54d995
|
add ScreenTitle class
|
2019-03-08 23:44:01 +01:00 |
|
Jamie Taylor
|
c34e110a2c
|
Merge remote-tracking branch 'upstream/master' into fix-roomstate-on-cancel
|
2019-03-07 17:01:24 +09:00 |
|
Jamie Taylor
|
50c1b3a576
|
Move room resetting logic from MatchSubScreen to LoungeSubScreen
|
2019-03-07 16:49:48 +09:00 |
|
Jamie Taylor
|
ee076bbbe3
|
Fix chat channel ids not being updated on room creation
|
2019-03-07 15:35:57 +09:00 |
|
Jamie Taylor
|
6e5ea78ca2
|
Fix some nullref crashes when escaping out of new room creation
|
2019-03-06 20:03:37 +09:00 |
|
Jamie Taylor
|
5de6e29294
|
Reset currentRoom state when cancelling room creation
|
2019-03-06 20:03:37 +09:00 |
|
David Zhao
|
89987210c3
|
Merge remote-tracking branch 'upstream/master' into LobbyList
|
2019-03-05 18:59:38 +09:00 |
|
David Zhao
|
34b2553b95
|
Remove redundant boolean
|
2019-03-05 18:59:25 +09:00 |
|
Dan Balasescu
|
fd147dae21
|
Merge branch 'master' into fix-disabled-set-crash
|
2019-03-05 17:25:13 +09:00 |
|
David Zhao
|
166a8c8bbb
|
Add back fallback behavior for match creation
|
2019-03-05 16:41:59 +09:00 |
|
David Zhao
|
11e353c152
|
Use local class instead of having a separate file
|
2019-03-05 15:55:37 +09:00 |
|
David Zhao
|
aecbc31ffa
|
Use BeatmapSetCoverType.List for lobby listing
|
2019-03-05 12:08:14 +09:00 |
|
Dan Balasescu
|
a37445a938
|
Merge branch 'master' into better-mp-songselect-deletion-handling
|
2019-02-28 17:35:08 +09:00 |
|
smoogipoo
|
921346d303
|
Rename a few more members
|
2019-02-28 17:27:28 +09:00 |
|
Jamie Taylor
|
4c8aa65200
|
private + renaming
|
2019-02-28 17:02:45 +09:00 |
|
Dan Balasescu
|
3a1066ff02
|
Merge branch 'master' into toquantity-1
|
2019-02-28 15:57:51 +09:00 |
|
Jamie Taylor
|
cf2feec7df
|
Fix multiplayer enabled mods check
|
2019-02-28 15:02:22 +09:00 |
|
Joehu
|
2241e1af9d
|
Use ToQuantity for words with number prefixes
|
2019-02-27 21:55:45 -08: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 |
|
Jamie Taylor
|
c59d84fd21
|
Add sanity check to prevent TimeshiftPlayer from starting with incorrect beatmap/ruleset/mods
|
2019-02-27 16:21:14 +09:00 |
|
Jamie Taylor
|
7c2ffb1826
|
Fix MatchSongSelect not handling beatmapset deletions
|
2019-02-27 14:34:39 +09:00 |
|
Dean Herbert
|
80737b9ef8
|
Remove "silent" parameter; consolidate import logic
|
2019-02-25 18:24:06 +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 |
|
Dean Herbert
|
3fe4b8fd1c
|
Update variable names
Also cleans up some weird code
|
2019-02-22 17:51:39 +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
|
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 |
|
smoogipoo
|
4db5531e4b
|
Replace copy-constructor/method with extension method
|
2019-02-20 19:32:30 +09:00 |
|