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