Dean Herbert
59f7c5a26e
Fix room inspector cover not resetting when no room selected
2019-01-17 18:44:22 +09:00
Dean Herbert
ba9cdf2ce2
Add null check to fix crash on deselecting multiplayer room
2019-01-17 18:17:47 +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
Dean Herbert
c1f5c0edc9
Merge branch 'master' into hide-multiplayer-match-room-tab
2019-01-17 18:02:17 +09:00
Dean Herbert
4082c0e8e0
Merge branch 'master' into fix-slider-bar-tooltip-not-shown-until-value-is-changed
2019-01-17 17:34:04 +09:00
ekrctb
2bc3464802
Hide Room tab when Settings tab is active
2019-01-17 17:27:34 +09:00
ekrctb
6bfae52305
Fix sliders don't show tooltip until first change
2019-01-17 17:03:53 +09:00
ekrctb
f982b6da55
Don't hide 'hold for menu' even hud is hidden
2019-01-17 16:49:04 +09:00
Dean Herbert
99c963c56a
Merge branch 'master' into cancel-request-on-disposal
2019-01-17 15:29:49 +09:00
ekrctb
b6fb3a5c05
Cancel request on disposal for RoomInspector
2019-01-17 15:14:30 +09:00
Dean Herbert
2ab0c4632e
Merge branch 'master' into menu-background-skinning
2019-01-17 14:23:03 +09:00
Dan Balasescu
824fff5c85
Merge branch 'master' into fix-sticking-cursor
2019-01-17 12:06:00 +09:00
Dean Herbert
7bcf056872
Merge branch 'master' into update-framework
2019-01-16 19:16:53 +09:00
Dean Herbert
5ff58870b8
Update framework
2019-01-16 19:05:46 +09:00
Dean Herbert
3abfaea7ac
Stop cursor from sticking to edges of scaled game window
2019-01-16 17:21:26 +09:00
Dan Balasescu
75113db438
Merge branch 'master' into fix-skip-button-scaling
2019-01-16 16:37:37 +09:00
Dean Herbert
bfb18b4ffb
Update framework and other nuget packages
2019-01-16 10:14:37 +09:00
Dean Herbert
7ef127a3bf
Merge branch 'master' into update_tab_item_font
2019-01-15 18:31:16 +09:00
Shane Woolcock
6c35393d1a
Fix TrackManager usage
2019-01-13 23:10:16 +10:30
Shane Woolcock
f70cb81a3f
Update framework
2019-01-13 23:07:35 +10:30
Shane Woolcock
d80138d20d
Ensure beatmap textures are loaded via CreateTextureLoaderStore
2019-01-12 23:05:49 +10:30
Shane Woolcock
8f2ce6d048
Update framework
2019-01-12 15:55:03 +10:30
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
Min
29e8c21c46
Merge branch 'master' into menu-background-skinning
2019-01-11 11:36:20 +09:00
Dean Herbert
c1656a7608
Update framework
2019-01-10 21:22:42 +09:00
Dean Herbert
0a24d188b4
Remove TryGetValue as it won't work
2019-01-10 19:01:41 +09:00
Dean Herbert
1ff9203f9e
Merge branch 'master' into fix-idle-weirdness
2019-01-10 18:38:48 +09:00
Dean Herbert
8cd058ed9a
Merge branch 'master' into moreOptionsFromSkin.ini
2019-01-10 18:38:20 +09:00
Dean Herbert
aa68bbc1d9
Merge branch 'master' into fix-match-select-crash
2019-01-10 15:40:03 +09:00
Dean Herbert
930d6382c7
Merge pull request #4016 from smoogipoo/fix-link-flow
...
Fix links not working in partially masked text flow
2019-01-10 15:19:58 +09:00
smoogipoo
4578d36a67
Add comment
2019-01-10 14:55:36 +09:00
Dean Herbert
e04da7de1e
Merge pull request #4017 from smoogipoo/lounge-leaderboard
...
Show match participants in the lounge
2019-01-10 14:36:26 +09:00
Dean Herbert
a264b67d58
Merge branch 'master' into moreOptionsFromSkin.ini
2019-01-10 14:33:34 +09:00
Dan Balasescu
bb36f457fe
Merge branch 'master' into add-ui-scale
2019-01-10 14:25:38 +09:00
Dan Balasescu
e6c2d29a8e
Merge branch 'master' into moreOptionsFromSkin.ini
2019-01-10 14:01:52 +09:00
Dean Herbert
5e4bea9d99
Fix extra newline
2019-01-10 12:11:14 +09:00
Dean Herbert
4f5c208672
Add UI scale
...
Limited to (relatively) sane values until we eventually get around to adjusting UI to allow higher extermities.
2019-01-09 19:01:33 +09:00
Dean Herbert
045ed741b0
Fix API getting stuck in eternal failing state if login request fails
2019-01-09 15:29:27 +09:00
Dean Herbert
2dc185f249
Display avatars rather than full scores
2019-01-09 15:27:08 +09:00
Dean Herbert
0bf9e9b86b
Merge branch 'master' into lounge-leaderboard
2019-01-09 10:28:55 +09:00
Dean Herbert
e4ff36a5bc
Merge pull request #4013 from smoogipoo/beatmap-scores-foreignkey
...
Add explicit beatmap -> scores deletions rather than relying on FK cascades
2019-01-08 21:39:15 +09:00
Dean Herbert
415df52c69
Update framework
2019-01-08 21:26:24 +09:00
Dean Herbert
958840fe17
Merge branch 'master' into fix-sliderbar
2019-01-08 21:23:34 +09:00
Dean Herbert
6ce08312b2
Merge branch 'master' into fix-match-select-crash
2019-01-08 20:29:55 +09:00
Dan Balasescu
8214faeacc
Merge branch 'master' into fix-over-inclusive-channel-search
2019-01-08 19:54:31 +09:00
smoogipoo
2a4c91a6ab
Remove unused using
2019-01-08 19:26:24 +09:00
smoogipoo
122fc2de58
Show room leaderboard instead in the lounge
2019-01-08 19:24:55 +09:00
smoogipoo
da98915c0c
Fix links not working in partially masked text flow
2019-01-08 18:59:01 +09:00
smoogipoo
b17b88d071
Fix null beatmap possibly being selected
2019-01-08 18:06:46 +09:00
smoogipoo
cf8bcb7ba2
Add explicit beatmap -> scores relationship rather than relying on cascades
2019-01-08 17:53:43 +09:00
Shane Woolcock
d74aa52e69
Revert to old behaviour if no TrackManager available
2019-01-08 18:35:23 +10:30
smoogipoo
2c44b928d3
Remove unused references
2019-01-08 16:38:34 +09:00
smoogipoo
daeba63242
Remove more unused code
2019-01-08 16:37:18 +09:00
smoogipoo
38a3ccc817
Use value where applicable
2019-01-08 16:31:44 +09:00
smoogipoo
8692be9de3
Fix sliderbar not working correctly with TransferValueOnCommit = true
2019-01-08 16:07:54 +09:00
Shane Woolcock
19693c3e51
Use TrackManager CreateWaveform to fix editor crashes
2019-01-08 17:10:31 +10:30
Shane Woolcock
a267a1a085
Merge branch 'master' into samah-ios
2019-01-08 17:09:26 +10:30
Dean Herbert
a2a7aa708f
Use better logic for setting slider bar settings
2019-01-08 14:56:42 +09:00
Dean Herbert
01aa4c2a72
Use TransferOnCommit
2019-01-08 13:48:38 +09:00
Dean Herbert
199b614eba
Fix masking being unapplied incorrectly
2019-01-08 13:36:07 +09:00
Dean Herbert
440f4703cb
Fix toolbar offset not being applied
2019-01-08 12:57:31 +09:00
Dean Herbert
dd960e6a89
Remove unused variable
2019-01-08 12:50:42 +09:00
Dean Herbert
647a30279f
Merge branch 'master' into moreOptionsFromSkin.ini
2019-01-08 11:46:08 +09:00
Dean Herbert
8edec10e5f
Merge branch 'master' into fix-replay-import-statistics
2019-01-08 11:26:12 +09:00
Dean Herbert
276014f591
Merge branch 'master' into update-framework
2019-01-08 11:26:10 +09:00
Dean Herbert
2fc3e77be7
Merge branch 'master' into letterboxing
2019-01-08 11:26:09 +09:00
Dean Herbert
11861f4cc9
Merge branch 'master' into moreOptionsFromSkin.ini
2019-01-08 11:26:08 +09:00
Dean Herbert
881b10a18f
Merge remote-tracking branch 'Dragicafit/moreOptionsFromSkin.ini' into moreOptionsFromSkin.ini
2019-01-08 11:01:04 +09:00
Dean Herbert
7eed3ffe75
Merge branch 'master' into moreOptionsFromSkin.ini
2019-01-08 10:02:06 +09:00
Dean Herbert
4cee21f356
Make skinning better
2019-01-07 20:12:39 +09:00
Dean Herbert
8eedef3e86
Move cancellation to safer place
2019-01-07 19:31:05 +09:00
Dean Herbert
d72412d24d
Fix leaderboard not correctly handling cancellation
2019-01-07 19:28:46 +09:00
Dean Herbert
70d644406f
Merge remote-tracking branch 'origin/update-framework' into letterboxing
...
# Conflicts:
# osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
2019-01-07 18:53:53 +09:00
Dean Herbert
74539b5e5c
Merge remote-tracking branch 'upstream/master' into letterboxing
2019-01-07 18:52:48 +09:00
Dean Herbert
49ba4e5a14
Merge branch 'master' into update-framework
2019-01-07 18:51:54 +09:00
Dean Herbert
ca98caf84b
Merge pull request #4001 from UselessToucan/linq_temp
...
Use Find instead of FirstOrDefault
2019-01-07 18:50:59 +09:00
Dean Herbert
f6018294b5
Update framework
2019-01-07 18:50:27 +09:00
Dean Herbert
13b077c83b
Merge remote-tracking branch 'upstream/master' into moreOptionsFromSkin.ini
2019-01-07 18:11:17 +09:00
Dean Herbert
73c2fcac08
Remove broken SettingsLabel class
2019-01-07 17:03:59 +09:00
Dean Herbert
e73845172c
Merge branch 'master' into fix-replay-import-statistics
2019-01-07 13:44:01 +09:00
Roman Kapustin
4b5fc85875
Use Find instead of FirstOrDefault
2019-01-05 19:35:33 +03:00
Dean Herbert
4a7c6fb19d
Fix PP not display on profile overlay
2019-01-04 16:33:35 +09:00
Dean Herbert
4c2c7bd937
Fix global idle state being entered when overlays are visible
2019-01-04 16:26:10 +09:00
Dean Herbert
7d1163a7d2
Remove unnecessary null check
2019-01-04 15:49:23 +09:00
Dean Herbert
f2ccf70d1b
Backdate license header for now
2019-01-04 15:37:27 +09:00
Dean Herbert
c528a3896d
Formatting and naming
2019-01-04 15:34:32 +09:00
Dean Herbert
4c3310ca80
Remove unnecessary tracked settings (for now)
2019-01-04 15:28:48 +09:00
Dean Herbert
3a10dd47d5
Add preview for gameplay region
2019-01-04 15:28:35 +09:00
Dean Herbert
9c7830d83b
Size -> scale
2019-01-04 14:58:44 +09:00
Dean Herbert
35a6257642
Delay updates when changes would affect mouse position
2019-01-04 14:55:59 +09:00
Dean Herbert
5a807f2143
Add OSD support
2019-01-04 14:18:29 +09:00
Dean Herbert
3953f829c8
Add letterbox/screen scaling support
2019-01-04 13:36:02 +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
Dean Herbert
aec3753863
Fix imported replays having excess statistics
2019-01-03 14:01:20 +09:00
Dean Herbert
8b25e4c9ee
Fix searching for "channel" matching all channels
2019-01-03 12:04:36 +09:00
Dean Herbert
2d405bfc43
Add back options for 3 and 7 day long rooms
2019-01-02 16:33:52 +09:00
FreezyLemon
0047f29ec8
move missing newline to front of "Plays with..."
2018-12-30 22:40:17 +01:00
Roman Kapustin
850a7aa327
Update tab text font on activation/deactivation
2018-12-29 17:43:19 +03:00
Shane Woolcock
32ffcb9865
Merge branch 'master' into samah-ios
...
# Conflicts:
# osu.Game/osu.Game.csproj
2018-12-29 20:09:00 +10:30
Shane Woolcock
ff4b41b35f
Add basic visual tests
2018-12-29 18:47:35 +10:30
Dean Herbert
1f2d340914
Merge branch 'master' into fix-room-ordering
2018-12-28 14:07:11 +09:00
Dean Herbert
e6ccf209c7
Merge pull request #3957 from peppy/fix-excessive-cover-loading
...
Fix covers being loaded even when off-screen
2018-12-28 14:07:01 +09:00
Dean Herbert
0908309232
Merge branch 'master' into fix-room-ordering
2018-12-28 13:35:56 +09:00
Dean Herbert
8c62157d7a
Merge pull request #3943 from smoogipoo/fix-results
...
Fix ScoreProcessor's population
2018-12-28 13:32:40 +09:00
Dean Herbert
55607634b4
Fix covers being loaded even when off-screen
2018-12-28 13:30:05 +09:00
smoogipoo
72482aff8d
Whoops
2018-12-28 01:48:13 +09:00
smoogipoo
a7db0bbb91
Sort rooms based on their API position
2018-12-28 01:45:19 +09:00
Lanyun Hou
f2f1ba8cbe
Fix typo in line 42
2018-12-28 00:43:20 +08:00
smoogipoo
be86281c72
Fix score results not populated
2018-12-28 00:24:02 +09:00
smoogipoo
338b95dd63
Fix none result getting included
2018-12-27 22:48:24 +09:00
Dean Herbert
99ed009838
Fix extra hit result types showing on ranking screen
2018-12-27 22:31:40 +09:00
Dean Herbert
12a93af156
Merge pull request #3939 from smoogipoo/fix-multi-mods
...
Fix plays with mods not submitting
2018-12-27 22:20:10 +09:00
smoogipoo
a62405d82d
Fix plays with mods not submitting
2018-12-27 22:17:03 +09:00
Dean Herbert
cf079690e5
Use LargeTextureStore for online retrievals
2018-12-27 22:13:51 +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
Dean Herbert
304d245c9c
Merge pull request #3934 from peppy/populate-statistics
...
Populate statistics for all rulesets' scores
2018-12-27 22:04:08 +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
Dean Herbert
fb10d15870
Populate statistics for all rulesets' scores
2018-12-27 21:52:09 +09:00
smoogipoo
50b51a168e
Always submit standardised scores
2018-12-27 21:12:32 +09:00
Dean Herbert
c818e1cd83
Merge pull request #3929 from peppy/fix-polling-rates
...
Fix polling rates
2018-12-27 20:28:15 +09:00
Dean Herbert
31baf0086f
Optional idle tracker
2018-12-27 20:17:27 +09:00
Dean Herbert
1ce33cb6da
Adjust polling rate based on current screen and idle state
2018-12-27 20:06:07 +09:00
Dean Herbert
c5764ded1c
Fix infinite polling rate in certain scenarios
2018-12-27 20:03:32 +09:00
Dean Herbert
ab5f6e149c
Remvoe extra newline
2018-12-27 19:25:56 +09:00
Dean Herbert
31db768bdc
Hide version overlay when not in main menu
2018-12-27 19:21:07 +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
Dean Herbert
d6c53e3851
Cancel old web requests when changing filter modes
2018-12-27 18:09:42 +09:00
smoogipoo
b0e8561ad3
Fix ruleset not changing correctly
2018-12-27 17:48:10 +09:00
smoogipoo
dae710f9a6
Make leaderboard top not fade by default
2018-12-27 17:29:55 +09:00
phosphene47
3c677970cd
Add menu background skinning for supporters
2018-12-27 17:25:28 +09:00
smoogipoo
ea1309e768
Fix missing bind
2018-12-27 17:15:43 +09:00
smoogipoo
bd0576537e
Forcefully exit multiplayer if API loses connectivity
2018-12-27 17:12:58 +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
smoogipoo
a3b6a3981c
Use .Equals() override instead of manual type checks
2018-12-27 16:19:00 +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
bfbd7e5106
Merge remote-tracking branch 'upstream/master' into timeshift-wip
2018-12-26 22:42:24 +09:00
Dean Herbert
bb502769c7
Fix enum
2018-12-26 22:42:17 +09:00
Dean Herbert
cc1f3d54b0
Fix looping failure
2018-12-26 22:37:09 +09:00
Dean Herbert
6b7b0af2e4
Temporary fix for participant count being nullable
2018-12-26 22:25:15 +09:00
Dean Herbert
f6aa6e6b3c
Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip
2018-12-26 22:16:41 +09:00
Dean Herbert
8cf30bdb6a
Play with delegate
2018-12-26 22:16:35 +09:00
smoogipoo
e7310a16c7
Fix playlist not updating correcly
2018-12-26 22:14:49 +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
Dean Herbert
fb15806c98
Merge branch 'master' into fix-webrequest-cancellation
2018-12-26 21:21:29 +09:00
smoogipoo
2d19436456
Open -> Push
2018-12-26 21:21:26 +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
5af29f8384
Reduce code duplication
2018-12-26 21:18:44 +09:00
smoogipoo
940d4a16bb
Add error message when creation fails
2018-12-26 21:18:44 +09:00
smoogipoo
9901b11600
Display room join errors as notifications
2018-12-26 21:18:11 +09:00
smoogipoo
bee4e8ad28
Fix cancelled webrequests triggering exceptions
2018-12-26 21:17:10 +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
8386e206c3
Update ParticipantInfo
2018-12-26 20:35:54 +09:00
Dean Herbert
5bd3ab51dd
Open -> Push
2018-12-26 20:35:54 +09:00
Dean Herbert
6f0d13e36b
Move PartRoom calls
2018-12-26 20:35:54 +09:00
smoogipoo
9d305ba024
Reduce code duplication
2018-12-26 20:33:19 +09:00
smoogipoo
be9ba78d47
Add error message when creation fails
2018-12-26 20:33:19 +09:00
smoogipoo
052ab4763a
Display room join errors as notifications
2018-12-26 20:32:36 +09:00
Dean Herbert
7a431ed87f
Update ParticipantInfo
2018-12-26 20:31:04 +09:00
Dean Herbert
869081ce9c
Open -> Push
2018-12-26 20:21:30 +09:00
Dean Herbert
692f5c289d
Move PartRoom calls
2018-12-26 20:12:51 +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
0cefd4b21d
Improve room padding
2018-12-26 19:14:15 +09:00
Dean Herbert
e317b047f8
Merge remote-tracking branch 'upstream/master' into updateable-beatmap-sprite
2018-12-26 18:49:41 +09:00
Dean Herbert
edfb027ff2
Update framework
2018-12-26 18:49:33 +09:00
Dean Herbert
63847890d1
Add better messaging when connecting or failing
2018-12-26 18:07:33 +09:00
Dean Herbert
f442e59620
Icon and beatmap title visual pass
2018-12-26 18:01:53 +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
aeb2186539
Fix api get user request never failing
2018-12-26 16:06:39 +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
Dean Herbert
e4a72c0c64
Fix failing testcase
2018-12-26 13:18:36 +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
6a5f0eca18
Fix various elements flashing
2018-12-25 18:07:50 +09:00
smoogipoo
1dd2a4e368
Fix host info not working
2018-12-25 18:07:19 +09:00
Dean Herbert
9542e3e24a
Add Updateable beatmap sprite
2018-12-25 18:04:13 +09:00
smoogipoo
2f32c4d4d1
Fix title of match song select
2018-12-25 17:17:51 +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
smoogipoo
23d21a45e5
More automated tests
2018-12-25 11:59:08 +09:00
smoogipoo
626ec85ae8
Remove IHasFilterableChildren from class
2018-12-25 11:58:28 +09:00
smoogipoo
6712a68797
Create IRoomManager interface, add test for RoomsContainer
2018-12-25 11:45:50 +09:00
smoogipoo
f79aa07d02
Fix enddate not being bound to
2018-12-25 11:31:36 +09:00
smoogipoo
e0e75c7339
Fix incorrect room status
2018-12-25 11:24:46 +09:00
Shane Woolcock
436fbc7ffe
Merge branch 'master' into samah-ios
2018-12-24 15:52:47 +10:30
smoogipoo
02365ee5ba
Merge remote-tracking branch 'origin/master' into timeshift-wip
2018-12-22 23:23:21 +09:00
Dean Herbert
c6b37c45b5
Merge pull request #3902 from smoogipoo/disable-chat-avatar-click
...
Disable avatar clicks in chat tabs
2018-12-22 20:11:01 +09:00
smoogipoo
40db23ff4c
Disable avatar clicks in chat tabs
2018-12-22 19:30:52 +09:00
smoogipoo
30dbc36fce
Don't clear username on logout
2018-12-22 17:54:19 +09:00
smoogipoo
0757beb3b8
Test for null before loading
2018-12-22 17:54:08 +09:00
smoogipoo
d9b8df1595
Merge remote-tracking branch 'origin/master' into user-registration
2018-12-22 17:19:28 +09:00
Dan Balasescu
e6c197e9aa
Merge branch 'master' into improve-text-search
2018-12-22 16:38:50 +09:00
Dean Herbert
005c6ff40c
Add tooltip text to results screen pages
2018-12-22 16:30:06 +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
Dean Herbert
a35d9178f0
Quick rename
2018-12-22 16:20:29 +09:00
Dan Balasescu
2c97409e2e
Merge branch 'master' into rewrite-standalone-chat
2018-12-22 16:07:27 +09:00
Dean Herbert
e7508cbd5e
Fix CI issues
2018-12-22 15:55:10 +09:00
Dean Herbert
e404a0bc20
Clean-ups and renames
2018-12-22 15:51:00 +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
Shane Woolcock
18abff3ac0
Split solution
2018-12-22 17:12:43 +10:30
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
ac0e6f8d42
Fix post-merge issues
2018-12-22 15:35:22 +09:00
smoogipoo
bdb6e03dfb
Merge remote-tracking branch 'peppy/leaderboard-modularity' into timeshift-wip
...
# Conflicts:
# osu.Game/Online/Leaderboards/Leaderboard.cs
# osu.Game/Online/Leaderboards/LeaderboardScore.cs
# osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs
# osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
2018-12-22 15:33:26 +09:00
Dean Herbert
29fd1719da
Merge pull request #3896 from peppy/backwards-drawable-date
...
Allow DrawableDate to be used to display future dates
2018-12-22 15:29:05 +09:00
Dean Herbert
52c6d5bfd4
Move protected method down
2018-12-22 15:23:32 +09:00
Dean Herbert
787e65c3c5
Reduce generic-ness
2018-12-22 15:20:35 +09:00
smoogipoo
3570c35d7f
Make RoomScore derive ScoreInfo
2018-12-22 15:17:35 +09:00
Shane Woolcock
56196e17dd
Merge branch 'master' into samah-ios
2018-12-22 16:44:15 +10:30
smoogipoo
6afd2f7263
Adjust styling of disabled settings
2018-12-22 15:00:35 +09:00
Dean Herbert
23259b295c
Remove unnecessary using
2018-12-22 14:45:35 +09:00
smoogipoo
e657f13c15
Separate out Leaderboard into BeatmapLeaderboard
2018-12-22 14:44:36 +09:00
Dean Herbert
870d843fff
Fix username not displaying correctly in overlay
2018-12-22 14:40:55 +09:00
smoogipoo
b82bb0ea28
Mate RoomSettingsOverlay fill height
2018-12-22 14:40:10 +09:00
smoogipoo
09d7dc73dc
Allow channel manager and osugame to be null
2018-12-22 14:38:46 +09:00
smoogipoo
dbd391825a
Rework+fix TestCaseMultiHeader
2018-12-22 14:30:08 +09:00
smoogipoo
f47ac35522
Add click to avatar
2018-12-22 14:23:53 +09:00
smoogipoo
7191233be8
Allow roommanager to be null
2018-12-22 14:14:14 +09:00
smoogipoo
21cfe5a3e6
Decouple header from matchscreen
2018-12-22 14:12:27 +09:00
smoogipoo
c06cf5d379
Decouple match info from match screen
2018-12-22 14:08:00 +09:00
smoogipoo
d28c754256
Fix negative dates, and time moving in opposite direction
2018-12-22 14:06:50 +09:00
smoogipoo
86ce0b5519
Make DrawableDate adjustable
2018-12-22 14:06:44 +09:00
smoogipoo
d93421b796
Merge remote-tracking branch 'Joehuu/master' into timeshift-wip
...
# Conflicts:
# osu.Game/Screens/Play/HUD/ModDisplay.cs
2018-12-22 14:02:45 +09:00
smoogipoo
f1a9a352fc
Cleanup bindable handling
2018-12-22 14:01:06 +09:00
smoogipoo
1cb69c3478
Split requests/responses into separate files
2018-12-22 12:50:37 +09:00
smoogipoo
dd0c04ea36
Move RoomManager to multiplayer screen
2018-12-22 12:45:36 +09:00
Dean Herbert
396caae0a9
Remove redundant newline
2018-12-21 19:01:19 +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
fe6c369e07
Fix incorrect channel
2018-12-21 14:37:05 +09:00
Dean Herbert
6bca344e56
Merge branch 'master' into add-alt-select-support
2018-12-21 14:32:24 +09:00
smoogipoo
1df4826a1d
Merge remote-tracking branch 'origin/master' into timeshift-wip
2018-12-21 14:14:17 +09:00
smoogipoo
6a9b0a0ba3
Fix initial messages not being received
2018-12-21 14:02:36 +09:00
smoogipoo
6b6629e9fd
Fix not posting to the correct channel
2018-12-21 14:02:29 +09:00
smoogipoo
fa2bc16140
Remove participants, add match chat
2018-12-21 14:01:11 +09:00
Dean Herbert
59452800ed
Update framework
2018-12-21 13:33:06 +09:00
smoogipoo
14879acd83
Fix possible nullref
2018-12-21 13:26:50 +09:00
smoogipoo
e27b7b0c0d
Cleanup
2018-12-21 13:06:11 +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
Dan Balasescu
3d4edd9121
Merge branch 'master' into standalone-chat
2018-12-21 12:31:33 +09:00
Dean Herbert
aaac45ab8c
Add ability to select chat tabs with alt-1-9
2018-12-20 21:50:47 +09:00
smoogipoo
822225577b
Add joining/parting room requests
2018-12-20 20:58:34 +09:00
smoogipoo
9031896484
Fix create room button showing in song select
2018-12-20 20:09:17 +09:00
smoogipoo
104a3c8ffc
Add click to avatar
2018-12-20 20:08:22 +09:00
smoogipoo
6a76e335c7
Linkify everything
2018-12-20 20:03:45 +09:00
smoogipoo
f8d25a1b6c
Add method to add arbitrary drawables as links
2018-12-20 20:01:58 +09:00
Dean Herbert
ef9d93ff6b
Remove mod multipliers
...
We decided that mods shouldn't be interacting with other mods. This can be added once we have the ability to have per-mod settings, as a difficulty setting local to blinds.
2018-12-20 19:46:39 +09:00
Dean Herbert
d3368df94d
Simplify changes to RulesetContainer
2018-12-20 19:35:32 +09:00
Dean Herbert
bc8b0485d8
Add textbox/posting support
2018-12-20 18:49:03 +09:00
smoogipoo
deaf4ab4a1
Cleanup
2018-12-20 18:21:55 +09:00
smoogipoo
8db3ac0a9f
Make user links clickable
2018-12-20 18:04:39 +09:00
smoogipoo
1701af61d6
Add host avatar+username to match screen
2018-12-20 18:04:22 +09:00
Dean Herbert
65447d6f4a
Add optional parameters to target messages at a specific channel
2018-12-20 17:01:08 +09:00
Dean Herbert
3a13899ce1
Add stand-alone chat component
2018-12-20 16:54:49 +09:00
Dean Herbert
9177a45587
Merge branch 'master' into mod-fl2
2018-12-20 15:50:18 +09:00
smoogipoo
2e28f378de
Move beatmap + mod info to header
2018-12-20 15:17:33 +09:00
smoogipoo
72016a416b
Deselect match if ended
2018-12-20 15:17:08 +09:00
smoogipoo
03546c9d0d
Implement primary filter routes
2018-12-20 15:16:46 +09:00
Dean Herbert
e15ff98915
Merge branch 'master' into improve-text-search
2018-12-19 20:45:00 +09:00
Dean Herbert
8d458b0b6e
Update framework version
2018-12-19 19:45:50 +09:00
smoogipoo
36f6b4fc3f
Hook up participated filter
...
Very early stages, implementation will change.
2018-12-19 18:02:05 +09:00
smoogipoo
c86d9533bd
Add PollImmediately()
2018-12-19 18:01:21 +09:00
smoogipoo
673082445e
Rework filtering
2018-12-19 16:56:51 +09:00
smoogipoo
c544a5b9f0
Add end date to the drawable room too
2018-12-19 15:20:23 +09:00
smoogipoo
9d8170efa0
Only go into failing state if previously online
2018-12-19 14:32:43 +09:00
Dan Balasescu
02b95d3175
Merge branch 'master' into simplify-api-requests
2018-12-19 14:17:48 +09:00
Dean Herbert
067b448617
Merge branch 'master' into do_not_delete_replay_on_import
2018-12-19 13:50:04 +09:00
smoogipoo
a8d88dea3b
Display time remaining in the room
2018-12-19 13:07:56 +09:00
smoogipoo
224e644aa1
Fix negative dates, and time moving in opposite direction
2018-12-19 13:07:43 +09:00
smoogipoo
b89a6bea4c
Make DrawableDate adjustable
2018-12-19 12:44:51 +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
1051584f0f
Fix room duration not being set
2018-12-19 10:51:54 +09:00
Styphix
bacc07f5ec
Changed OsuFocusedOverlayContainer
to WaveOverlayContainer
from ChannelSelectionOverlay
...
Not sure what colour i shouldve gone for but im certain that this should be fine
2018-12-18 19:44:31 -05:00
Roman Kapustin
4a1af67893
Do not delete file on import failure
2018-12-18 22:49:53 +03:00
Dean Herbert
6088612a26
Remove all retry logic and simplify overall handling of API requests
2018-12-18 20:20:17 +09:00
smoogipoo
72d1ba897f
Reorder tabs
2018-12-18 18:29:13 +09:00
smoogipoo
4050cb88ea
Fix potential nullref
2018-12-18 18:09:54 +09:00
smoogipoo
3cdeeb7ac5
Add forceful set helper methods in OsuGame
2018-12-18 18:09:46 +09:00
smoogipoo
e4e1bde5da
Fix playlist events running too early
...
Screens are async loaded
2018-12-18 17:08:07 +09:00
smoogipoo
aabe6c68f5
Fix looping not working
2018-12-18 17:07:47 +09:00
smoogipoo
2f15d10029
Play track while in the multiplayer lobby
2018-12-18 14:45:35 +09:00