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
610c2df2d4
Merge branch 'master' into dont-always-focus-textboxes
2019-01-28 13:40:08 +09:00
260034a80e
Don't auto-focus textboxes when on screen keyboard would cause inconvenience
2019-01-25 19:20:29 +09:00
82d944dc89
Fix textbox colours not always being set corrrectly
2019-01-25 19:20:29 +09:00
a5f1aa644b
Fix cursor sensitivity tooltip not updating instantly
2019-01-25 17:30:35 +09:00
a25dce53cd
Fix logical regression
2019-01-25 15:03:32 +09:00
e88d36ed38
Merge branch 'master' into fix-multiplayer-parallax-overflow
2019-01-25 14:55:28 +09:00
7ed215c521
Make InternalPadding a bit simpler
2019-01-25 14:46:45 +09:00
787d4da153
Combine constant
2019-01-25 14:10:59 +09:00
2b250aa47b
Merge branch 'master' into fix-tracked-config-disposal
2019-01-25 12:14:58 +09:00
2bbaa2ac60
silently return instead of throwing
2019-01-24 16:02:47 +01:00
4cae9bae83
Merge branch 'master' into fix-multiplayer-parallax-overflow
2019-01-24 20:41:10 +08:00
8ea7ec6445
Convert everything to use IScreen
2019-01-24 19:47:44 +09:00
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09:00
7ac20c3545
Add overflow padding to account for parallax shifting
...
Added overflow padding in the Multiplayer screen, and adjusting content (LoungeSubScreen, FilterControl, Header, "Create Room" button) to account for this padding.
2019-01-24 16:11:24 +08:00
93c9037394
fix crash when config doesn't have tracked settings
2019-01-23 13:09:03 +01:00
1025c51e0d
Allow filtering settings matching based on dropdown content
2019-01-23 17:30:05 +09:00
09553550a3
Remove remaining supporter check
2019-01-23 00:19:39 +09:00
7baff750de
Consolidate layout, wording and ordering with VisualSettings
2019-01-22 10:06:30 +09:00
7cdb823c87
Moved "Use beatmap hitsounds" button
2019-01-21 08:04:06 -06:00
858541bcf4
Added "Use beatmap hitsounds" button to volume section of settings
2019-01-18 02:33:39 -06:00
42fa04beee
Update SkinSection.cs
...
Added "Use beatmap skins" button to general settings
2019-01-17 14:40:22 -06:00
93a08bdb23
Remove stray using
2019-01-17 20:23:15 +09:00
d16f4af92b
Use TransferValueOnCommit for mouse sensitivity
2019-01-17 19:18:40 +09:00
6eff79913b
remove blank lines
2019-01-11 10:34:56 +01:00
5e4bea9d99
Fix extra newline
2019-01-10 12:11:14 +09:00
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
8214faeacc
Merge branch 'master' into fix-over-inclusive-channel-search
2019-01-08 19:54:31 +09:00
2c44b928d3
Remove unused references
2019-01-08 16:38:34 +09:00
daeba63242
Remove more unused code
2019-01-08 16:37:18 +09:00
a2a7aa708f
Use better logic for setting slider bar settings
2019-01-08 14:56:42 +09:00
01aa4c2a72
Use TransferOnCommit
2019-01-08 13:48:38 +09:00
74539b5e5c
Merge remote-tracking branch 'upstream/master' into letterboxing
2019-01-07 18:52:48 +09:00
73c2fcac08
Remove broken SettingsLabel class
2019-01-07 17:03:59 +09:00
3a10dd47d5
Add preview for gameplay region
2019-01-04 15:28:35 +09:00
9c7830d83b
Size -> scale
2019-01-04 14:58:44 +09:00
35a6257642
Delay updates when changes would affect mouse position
2019-01-04 14:55:59 +09:00
3953f829c8
Add letterbox/screen scaling support
2019-01-04 13:36:02 +09:00
8b25e4c9ee
Fix searching for "channel" matching all channels
2019-01-03 12:04:36 +09:00
0047f29ec8
move missing newline to front of "Plays with..."
2018-12-30 22:40:17 +01:00
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
63847890d1
Add better messaging when connecting or failing
2018-12-26 18:07:33 +09:00
02365ee5ba
Merge remote-tracking branch 'origin/master' into timeshift-wip
2018-12-22 23:23:21 +09:00
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
40db23ff4c
Disable avatar clicks in chat tabs
2018-12-22 19:30:52 +09:00
0757beb3b8
Test for null before loading
2018-12-22 17:54:08 +09:00
d9b8df1595
Merge remote-tracking branch 'origin/master' into user-registration
2018-12-22 17:19:28 +09:00
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
2c97409e2e
Merge branch 'master' into rewrite-standalone-chat
2018-12-22 16:07:27 +09:00
0e9991b81a
Merge remote-tracking branch 'origin/master' into timeshift-wip
2018-12-22 15:36:36 +09:00
