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
|
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 |
|
KingLuigi4932
|
fec0db8fe1
|
Merge UpdateableAvatar.cs and Avatar.cs + Rename Avatar to DrawableAvatar
|
2019-06-17 21:55:07 +03: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 |
|
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 |
|
smoogipoo
|
0bd35ab7bb
|
Turn on warnings, resolve issues
|
2019-04-25 17:36:17 +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 |
|
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
|
15fbb6f176
|
Use common AddUserLink method
|
2019-04-05 14:15:36 +09:00 |
|
Dean Herbert
|
f1952c0816
|
Update font awesome usage
|
2019-04-02 19:55:24 +09:00 |
|
Dean Herbert
|
612db31c38
|
Apply newline additions
|
2019-04-01 12:16:32 +09:00 |
|
Dean Herbert
|
de80fc0eac
|
Update icon usage to match framework changes
|
2019-03-27 19:29:27 +09:00 |
|
Dean Herbert
|
9a11a08acc
|
Update textbox usages
|
2019-03-23 02:00:27 +09:00 |
|
Dean Herbert
|
c496f6e56b
|
Fix usages of OnLoadComplete
|
2019-03-17 13:44:20 +09: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 |
|
Dan Balasescu
|
fd147dae21
|
Merge branch 'master' into fix-disabled-set-crash
|
2019-03-05 17:25:13 +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 |
|
Dean Herbert
|
26d53d06a9
|
Fix remaining issues
|
2019-02-28 13:31:40 +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
|
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 |
|
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
|
d5cce850a8
|
Revert some unnecessary complications in logo logic
|
2019-02-12 13:29:41 +09:00 |
|
Dean Herbert
|
272584eb79
|
Improve file layouts
|
2019-02-12 13:02:33 +09:00 |
|
Dean Herbert
|
78b47f9fe3
|
Fix starting matches not working
|
2019-02-12 11:19:42 +09:00 |
|
Dean Herbert
|
e4422167b6
|
Fix starting gameplay
|
2019-02-11 19:13:57 +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 |
|
Dean Herbert
|
a30d3739cf
|
Merge remote-tracking branch 'upstream/master' into cmc-rooms
|
2019-02-08 18:45:39 +09:00 |
|
Dean Herbert
|
f52cac966b
|
Fix multiple blank lines
|
2019-02-08 18:45:32 +09:00 |
|
Dean Herbert
|
6c4d289901
|
Pass item rather than ID
|
2019-02-08 18:33:49 +09:00 |
|
Dan Balasescu
|
7ec0b4ba77
|
Fix nullref during room creation (#4228)
|
2019-02-08 17:53:01 +09:00 |
|
smoogipoo
|
5643dc2e99
|
Remove redundant qualifiers
|
2019-02-08 15:44:05 +09:00 |
|
smoogipoo
|
43240ea85e
|
Fix playlist issues with room creation
|
2019-02-08 15:23:03 +09:00 |
|
smoogipoo
|
17fdfc15d9
|
Fix room title in the breadcrumbs
|
2019-02-07 20:09:49 +09:00 |
|
smoogipoo
|
4f86fe92ea
|
Fix match settings not showing
|
2019-02-06 18:50:43 +09:00 |
|
smoogipoo
|
594dffba41
|
Fix a few cases of missed instant invocation
|
2019-02-05 19:11:20 +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 |
|
Dean Herbert
|
f85518b175
|
Don't expose padding
|
2019-01-31 18:16:28 +09:00 |
|
smoogipoo
|
b5d187c4af
|
Fix post-merge errors
|
2019-01-29 21:27:32 +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 |
|
smoogipoo
|
60cc2314ef
|
Fix ruleset + beatmap being changeable in match
|
2019-01-25 21:02:30 +09:00 |
|
smoogipoo
|
b3403c78da
|
Fix a few potential crashes
|
2019-01-25 20:47:37 +09:00 |
|
smoogipoo
|
e1e7759e0f
|
Re-implement MultiplayerSubScreen
|
2019-01-25 19:32:37 +09:00 |
|
smoogipoo
|
da135346b2
|
Fix screen titles
|
2019-01-25 18:38:48 +09:00 |
|
smoogipoo
|
15100632f1
|
Remove MultiplayerSubScreen and fix multiplayer crashes
|
2019-01-25 18:26:04 +09:00 |
|
Dean Herbert
|
787d4da153
|
Combine constant
|
2019-01-25 14:10:59 +09:00 |
|
ProgrammaticNajel
|
4cae9bae83
|
Merge branch 'master' into fix-multiplayer-parallax-overflow
|
2019-01-24 20:41:10 +08:00 |
|
ProgrammaticNajel
|
593e0b36f5
|
Add overflow padding in other multiplayer screen components
Added padding to Room Creation and Beatmap Selection in Multiplayer.
|
2019-01-24 19:42:35 +08:00 |
|
smoogipoo
|
8ea7ec6445
|
Convert everything to use IScreen
|
2019-01-24 19:47:44 +09:00 |
|
ProgrammaticNajel
|
e4084b7d5d
|
Add overflow padding in other multiplayer screen components
Added overflow padding in room selection screen (Header, Room Info, Leaderboards, and Room Chat)
|
2019-01-24 17:40:48 +08:00 |
|
Dean Herbert
|
8617aaa2a7
|
Update licence header (and remove year)
|
2019-01-24 17:43:03 +09:00 |
|
Dean Herbert
|
491537b8ba
|
Add fade duration
Not really visible in the existing usage, but once we enable the settings tab it will be required. Tested by manually enabling it.
|
2019-01-17 18:13:05 +09:00 |
|
ekrctb
|
2bc3464802
|
Hide Room tab when Settings tab is active
|
2019-01-17 17:27:34 +09:00 |
|
smoogipoo
|
122fc2de58
|
Show room leaderboard instead in the lounge
|
2019-01-08 19:24:55 +09:00 |
|
Dean Herbert
|
2d405bfc43
|
Add back options for 3 and 7 day long rooms
|
2019-01-02 16:33:52 +09:00 |
|
Dean Herbert
|
2d1736e477
|
Merge pull request #3936 from smoogipoo/fix-multi-mods
Ensure mods are set prior to starting play
|
2018-12-27 22:04:35 +09:00 |
|
smoogipoo
|
101fdf993e
|
Ensure mods are set prior to starting play
|
2018-12-27 21:59:43 +09:00 |
|
Dean Herbert
|
5977fc838f
|
Limit available durations for the time being
|
2018-12-27 21:59:08 +09:00 |
|
smoogipoo
|
eaba9e1378
|
Fix mode icon not being updated for correct ruleset
|
2018-12-27 18:16:30 +09:00 |
|
smoogipoo
|
9a5630b3d5
|
Fix working beatmap not being updated
|
2018-12-27 18:16:30 +09:00 |
|
smoogipoo
|
f70e60747f
|
Remove option for 1-minute duration
|
2018-12-27 16:54:14 +09:00 |
|
smoogipoo
|
8e031325dd
|
CI fixes
|
2018-12-27 16:28:17 +09:00 |
|
smoogipoo
|
50201e602e
|
Combine implementations of status + end date info
|
2018-12-27 16:19:00 +09:00 |
|
Dean Herbert
|
8cf30bdb6a
|
Play with delegate
|
2018-12-26 22:16:35 +09:00 |
|
Dean Herbert
|
a1fa914c66
|
Participants
|
2018-12-26 21:58:14 +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 |
|
Dean Herbert
|
26834abd33
|
Fade and no schedule
|
2018-12-26 21:18:55 +09:00 |
|
smoogipoo
|
940d4a16bb
|
Add error message when creation fails
|
2018-12-26 21:18:44 +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
|
532a970c0f
|
Give leaderboard and chat more breathing room
|
2018-12-26 19:20:54 +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 |
|
Dean Herbert
|
6e8c46f00b
|
Fix padding and use grid container for more correctness
|
2018-12-26 15:23:57 +09:00 |
|
Dean Herbert
|
755c6b9243
|
Make room settings scroll
|
2018-12-26 15:03:35 +09:00 |
|
Dean Herbert
|
e9556afe22
|
Don't use all uppercase (is applied automatically)
|
2018-12-26 14:26:35 +09:00 |
|
smoogipoo
|
1dd2a4e368
|
Fix host info not working
|
2018-12-25 18:07:19 +09:00 |
|
smoogipoo
|
d4f5a8507c
|
Exit from match screen on escape
|
2018-12-25 17:14:56 +09:00 |
|
smoogipoo
|
91b83cd4b8
|
Fix leaderboard being queried on room creation
|
2018-12-25 13:57:25 +09:00 |
|