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 |
|
Dan Balasescu
|
8214faeacc
|
Merge branch 'master' into fix-over-inclusive-channel-search
|
2019-01-08 19:54:31 +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 |
|
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
|
74539b5e5c
|
Merge remote-tracking branch 'upstream/master' into letterboxing
|
2019-01-07 18:52:48 +09:00 |
|
Dean Herbert
|
73c2fcac08
|
Remove broken SettingsLabel class
|
2019-01-07 17:03:59 +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
|
3953f829c8
|
Add letterbox/screen scaling support
|
2019-01-04 13:36:02 +09:00 |
|
Dean Herbert
|
8b25e4c9ee
|
Fix searching for "channel" matching all channels
|
2019-01-03 12:04:36 +09:00 |
|
FreezyLemon
|
0047f29ec8
|
move missing newline to front of "Plays with..."
|
2018-12-30 22:40:17 +01: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
|
63847890d1
|
Add better messaging when connecting or failing
|
2018-12-26 18:07:33 +09:00 |
|
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
|
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 |
|
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 |
|
Dan Balasescu
|
2c97409e2e
|
Merge branch 'master' into rewrite-standalone-chat
|
2018-12-22 16:07:27 +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
|
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
|
f47ac35522
|
Add click to avatar
|
2018-12-22 14:23:53 +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 |
|
Dean Herbert
|
81104f4803
|
Make standalone chat reuse more code from main chat overlay
|
2018-12-21 17:54:12 +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
|
aaac45ab8c
|
Add ability to select chat tabs with alt-1-9
|
2018-12-20 21:50:47 +09:00 |
|
smoogipoo
|
104a3c8ffc
|
Add click to avatar
|
2018-12-20 20:08:22 +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 |
|
Dean Herbert
|
e9f661bbf5
|
Merge branch 'master' into user-registration
|
2018-12-17 05:05:06 +09:00 |
|
Dean Herbert
|
0b5f3c00bf
|
Revert "Fix WaveOverlayContainer always being present"
This reverts commit a6fc128094.
|
2018-12-14 20:50:27 +09:00 |
|
Dean Herbert
|
13cabac386
|
Update in line with framework changes
|
2018-12-14 19:56:21 +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
|
a6fc128094
|
Fix WaveOverlayContainer always being present
|
2018-12-14 15:41:05 +09:00 |
|
smoogipoo
|
2aafaf9ce2
|
Merge branch 'timeshift-api-integration'
|
2018-12-13 17:07:39 +09:00 |
|
smoogipoo
|
208273f16a
|
Merge branch 'timeshift'
# Conflicts:
# osu.Game/osu.Game.csproj
|
2018-12-13 17:06:20 +09:00 |
|
Dean Herbert
|
4fc9902cd2
|
Fix reverting to default skin via settings button causing a hard crash
|
2018-12-12 21:30:21 +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 |
|
smoogipoo
|
41c7d10dff
|
Fix compilation issues (+ use updated framework)
|
2018-12-10 13:48:05 +09:00 |
|
Dean Herbert
|
2a2561e5c8
|
Update framework and otehr nuget packages
|
2018-12-07 19:39:54 +09:00 |
|
Dean Herbert
|
2122966cd4
|
Show channel selector when no channels are joined
|
2018-12-07 13:26:31 +09:00 |
|
Dean Herbert
|
b0e2b56e85
|
Don't show warning screen if no previous account is detected
|
2018-12-06 16:54:08 +09:00 |
|