Dean Herbert
e88d36ed38
Merge branch 'master' into fix-multiplayer-parallax-overflow
2019-01-25 14:55:28 +09:00
Dean Herbert
7ed215c521
Make InternalPadding a bit simpler
2019-01-25 14:46:45 +09:00
Dean Herbert
787d4da153
Combine constant
2019-01-25 14:10:59 +09:00
Dean Herbert
2b250aa47b
Merge branch 'master' into fix-tracked-config-disposal
2019-01-25 12:14:58 +09:00
Unknown
2bbaa2ac60
silently return instead of throwing
2019-01-24 16:02:47 +01:00
ProgrammaticNajel
4cae9bae83
Merge branch 'master' into fix-multiplayer-parallax-overflow
2019-01-24 20:41:10 +08:00
smoogipoo
8ea7ec6445
Convert everything to use IScreen
2019-01-24 19:47:44 +09:00
Dean Herbert
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09:00
ProgrammaticNajel
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
Unknown
93c9037394
fix crash when config doesn't have tracked settings
2019-01-23 13:09:03 +01:00
Dean Herbert
1025c51e0d
Allow filtering settings matching based on dropdown content
2019-01-23 17:30:05 +09:00
Dean Herbert
7d6d7cf457
Merge remote-tracking branch 'upstream/master' into download-tracking-component
...
# Conflicts:
# osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs
2019-01-23 11:06:29 +09:00
Dean Herbert
09553550a3
Remove remaining supporter check
2019-01-23 00:19:39 +09:00
Dean Herbert
7baff750de
Consolidate layout, wording and ordering with VisualSettings
2019-01-22 10:06:30 +09:00
Bear Daniel
7cdb823c87
Moved "Use beatmap hitsounds" button
2019-01-21 08:04:06 -06:00
Bear Daniel
858541bcf4
Added "Use beatmap hitsounds" button to volume section of settings
2019-01-18 02:33:39 -06:00
Dean Herbert
f489718e25
Fix non-matching filename
2019-01-18 14:35:32 +09:00
Dean Herbert
21e79f51b1
Remove necessity of BeatmapSetDownloader
2019-01-18 14:28:06 +09:00
Dean Herbert
8848fa8b1b
Improve UX of download buttons on beatmap set overlay
2019-01-18 12:04:49 +09:00
Dean Herbert
b62630ecd2
Centralise download tracking logic so we can show it in multiple scenarios
2019-01-18 11:28:10 +09:00
nwabear
42fa04beee
Update SkinSection.cs
...
Added "Use beatmap skins" button to general settings
2019-01-17 14:40:22 -06:00
Dean Herbert
93a08bdb23
Remove stray using
2019-01-17 20:23:15 +09:00
Dean Herbert
d16f4af92b
Use TransferValueOnCommit for mouse sensitivity
2019-01-17 19:18:40 +09:00
Unknown
6eff79913b
remove blank lines
2019-01-11 10:34:56 +01: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
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
Dean Herbert
de8c5a6df0
Block input and show loading when submitting registration
2018-12-06 16:29:41 +09:00
Dean Herbert
09f985c721
Add warning lines
2018-12-06 15:49:06 +09:00
Dean Herbert
d5de5d1cb7
Fix textbox focus issues
2018-12-06 14:57:00 +09:00
Dean Herbert
cc3ccc4c40
Affix logo in place better
2018-12-06 12:53:35 +09:00
Dean Herbert
88052dcea1
Reset to welcome screen on exiting mid-process
2018-12-06 12:38:11 +09:00
Dean Herbert
d3f5111fa1
Use relative URL
2018-12-06 12:18:21 +09:00
Dean Herbert
e56f4cc8a5
Add remaining steps to registration screen
2018-12-06 11:58:09 +09:00
Dean Herbert
4f46fa4798
Hide on connect
2018-12-05 17:30:16 +09:00
Dean Herbert
1ca00f6662
Add registration API call and related error handling
2018-12-05 17:13:22 +09:00
Dean Herbert
1a974f64de
Initial design for user registration dialog
2018-12-05 12:57:26 +09:00
Dan Balasescu
78d1a1c499
Merge branch 'master' into fix-async-profile-logic
2018-12-03 20:55:23 +09:00
Dan Balasescu
f278dff49c
Merge branch 'master' into fix-chat-crash
2018-12-03 19:17:05 +09:00
Dean Herbert
7e35afd178
Fix loading scores on profile pages potentially causing long blocking operations
2018-12-03 18:37:44 +09:00
Dean Herbert
14d9f1d8bb
Fix hard crash due to out-of-order chat sequencing
2018-12-03 18:13:10 +09:00
smoogipoo
814d401eb0
Make ChannelSelectorTabItem not switchable
2018-12-03 11:48:36 +09:00
smoogipoo
7255a01bf5
Remove ChatTabControl
2018-12-03 11:48:21 +09:00
smoogipoo
a8ad7d4670
Add silent import parameter
2018-11-30 18:27:13 +09:00
Dean Herbert
059e9e180b
Apply review
2018-11-30 18:07:15 +09:00
Dean Herbert
3727955911
Refactors/renames
2018-11-30 16:35:45 +09:00
Dean Herbert
831cd3ed59
ScoreInfo scoreInfo -> ScoreInfo score
2018-11-30 15:18:52 +09:00
smoogipoo
a88b69ec43
Notify of existing imports
2018-11-28 20:19:35 +09:00
smoogipoo
219929eb47
Score -> ScoreInfo
2018-11-28 18:33:01 +09:00
smoogipoo
5b409a5ae5
Fix missed renames
2018-11-28 17:27:22 +09:00
smoogipoo
09b79d736b
Remove unused usings
2018-11-28 16:33:42 +09:00
smoogipoo
5fd6e6ca77
Re-namespacing
2018-11-28 16:12:57 +09:00
Dean Herbert
6647fcd299
Fix volume adjustment precision regressing
2018-11-27 18:05:38 +09:00
smoogipoo
efdad3a3a7
Merge remote-tracking branch 'origin/master' into ChatManager_with_BindableCollection
2018-11-26 16:12:55 +09:00
naoey
c71fc0b800
Don't focus overlay again after set is fetched
2018-11-25 14:49:09 +05:30
smoogipoo
cadfe41f83
Merge remote-tracking branch 'origin/master' into external_link_warning
2018-11-23 15:19:52 +09:00
smoogipoo
df004d7a49
Adjust dialog text
2018-11-23 15:19:15 +09:00
smoogipoo
ac73844fe0
Fix header potentially overflowing the dialog
2018-11-23 15:19:09 +09:00
Dean Herbert
1b76e2faf5
Merge branch 'master' into fix-editor-precise-scroll
2018-11-23 09:57:35 +09:00
Dan Balasescu
0ee4b1c4ac
Merge branch 'master' into fix-channel-presence
2018-11-22 21:52:16 +09:00
Dean Herbert
10047e6815
Adjust tick-based wheel control to be more correct
2018-11-22 20:13:40 +09:00
Dean Herbert
61fdfe39fd
Add comment
2018-11-22 19:21:32 +09:00
smoogipoo
d1ec9fc294
Merge remote-tracking branch 'Joehuu/master' into fix-channel-presence
2018-11-22 13:04:32 +09:00
smoogipoo
5caa67d735
Hide playlist when MusicController is hidden
2018-11-22 12:12:34 +09:00
miterosan
21c9353fee
Remove not used usings
2018-11-21 23:15:45 +01:00
miterosan
a14b6ac9df
Replace ObservableCollection with BindableCollection
2018-11-21 23:15:44 +01:00
smoogipoo
cd2737156f
Fix crashes when importing/deleting from model managers
2018-11-21 23:11:09 +01:00
smoogipoo
39e9c61e24
OpenTK -> osuTK
2018-11-21 23:11:08 +01:00
Dean Herbert
7755242a43
Merge branch 'master' into osuTK
2018-11-21 18:53:11 +09:00
Dean Herbert
eab2776755
Fix a crash on leaving the selected channel
2018-11-21 17:15:15 +09:00
smoogipoo
5ad96afea0
Fix crashes when importing/deleting from model managers
2018-11-20 18:09:23 +09:00
smoogipoo
f27bd3ef3e
OpenTK -> osuTK
2018-11-20 17:14:59 +09:00
Dean Herbert
23a446bab2
Add support for all channel types
2018-11-20 15:03:55 +09:00
Roman Kapustin
376e76e00d
Resolve merge conflicts
2018-11-18 16:10:36 +03:00
Roman Kapustin
c4fc87b69a
Move to next track on Completed event
2018-11-17 15:39:40 +03:00
HoLLy
9dd3d28436
Fix SettingsTextBox having width of 0
2018-11-14 22:29:11 +01:00
smoogipoo
f1f2fc133a
Use SkinInfo directly
2018-11-14 19:29:20 +09:00
smoogipoo
aff5fa6169
Update with osu!-side dropdown changes
2018-11-14 18:02:38 +09:00
Dean Herbert
396a5b3cd0
Merge branch 'master' into Private_Messages
2018-11-14 12:49:54 +09:00
Dean Herbert
b9278b3488
Fix brackets
2018-11-14 12:05:07 +09:00
Dean Herbert
c77412992e
Merge conditionals
2018-11-14 11:53:34 +09:00
Dean Herbert
f241fcdba1
Add back support for new API and private messages
2018-11-13 15:20:59 +09:00
Dean Herbert
4b1282235a
Merge remote-tracking branch 'upstream/master' into Private_Messages
2018-11-12 20:41:10 +09:00
gotopie
4c9dcdf156
hide seekbar when no song is playing
2018-11-02 19:04:30 -04:00
Roman Kapustin
b4809f4417
External link warning code cleanup
2018-11-01 23:52:07 +03:00
Dean Herbert
94093ac948
Update beatmap search API to match latest osu-web structure
2018-10-23 18:05:41 +09:00
Roman Kapustin
805f8d98c4
Implement warn about opening external links option
2018-10-22 23:57:37 +03:00
Roman Kapustin
b4c68f4cf7
Show a warning prior to opening external links
2018-10-22 23:16:57 +03:00
Paul Teng
7720fa10eb
Reduce height of RankChartLineGraph
2018-10-17 20:19:01 -04:00
Dean Herbert
f7c887cf79
Merge branch 'master' into debounce-seeks
2018-10-12 17:50:39 +09:00
Paul Teng
2181f34f74
Merge branch 'master' into result-no-gamemode-switch
2018-10-10 06:43:01 -04:00
Dean Herbert
841b2e8692
Merge branch 'master' into consistent-terminology-format
2018-10-10 19:19:36 +09:00
Paul Teng
a91dda1a89
Merge branch 'master' into result-no-gamemode-switch
2018-10-09 13:04:53 -04:00
Paul Teng
ae79c3832e
Add base. for safety
2018-10-09 11:05:15 -04:00
smoogipoo
ccb6723711
Debounce music controller seeks
2018-10-09 16:50:29 +09:00
Dean Herbert
a171ed3500
Fix joined channels not appearing as joined in the channel list
2018-10-09 16:12:20 +09:00
Paul Teng
ca9cbf1aea
Fix rulsets being completed unselectable
2018-10-06 07:51:56 -04:00
Paul Teng
8b27741cb0
Do not propagate positional input to subtree
2018-10-05 11:37:44 -04:00
Paul Teng
8264dd49de
Update bindable only if enabled
2018-10-05 07:13:18 -04:00
Dean Herbert
716eee9a5c
Fix last visit not supporting null values
...
Can now be null if a user chooses to hide their online status
2018-10-05 00:25:40 +09:00
ekrctb
68980fc477
Adjust usage of Handle(Non)PositionalInput to follow framework update
2018-10-02 14:45:33 +09:00
ekrctb
b7a2ad1aa5
Use UIEvent level getters for modifier keys.
2018-10-02 13:26:36 +09:00
ekrctb
50091252e2
Adapt signature change of event handlers
2018-10-02 12:02:55 +09:00
