1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-30 07:12:58 +08:00
Commit Graph

2549 Commits

Author SHA1 Message Date
Dean Herbert
ab9340f4be Fix usage of culture local ToUpper causing incorrect display on Turkish machines
Closes #3098.
2018-07-24 11:37:43 +02:00
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
Dean Herbert
5fe634a3b6 Click download button to load beatmap 2018-07-18 13:18:50 +09:00
Dean Herbert
aa2f2f3e94
Merge pull request #3034 from peppy/reduce-panel-width
Reduce osu!direct panel width to allow three panels displayed at 16:9 resolutions
2018-07-17 19:14:48 +09:00
Dan Balasescu
64cde1ebad
Merge branch 'master' into use-switch-over-if 2018-07-17 16:44:57 +09:00
Dean Herbert
97e71245e9
Merge branch 'master' into reduce-panel-width 2018-07-17 16:36:05 +09:00
Dean Herbert
825941aff1 Use switch with type matching in place of if-else where possible 2018-07-17 14:35:09 +09:00
Dan Balasescu
745d596343
Merge branch 'master' into fix-incorrect-mods 2018-07-17 13:41:02 +09:00
Dean Herbert
4f1b7c8065
Merge branch 'master' into reduce-panel-width 2018-07-17 04:20:40 +09:00
Dean Herbert
84c13174d9
Merge branch 'master' into use-has-flags 2018-07-17 03:50:40 +09:00
Dean Herbert
dbc538abbe Use Enum.HasFlag
With .NET core 2.0+ this is as efficient as the ugly code we've been using.
2018-07-16 16:18:46 +09:00
Dean Herbert
a117b323e2
Merge branch 'master' into make-notifications-quieter 2018-07-16 13:15:07 +09:00
Dean Herbert
a12c47536b Change default to being important 2018-07-16 13:00:21 +09:00
Dean Herbert
4829f4f09c
Merge branch 'master' into download-button-state 2018-07-16 03:17:26 +09:00
Dean Herbert
730eb2daa2 Reduce osu!direct panel width to allow three panels displayed at 16:9 resolutions 2018-07-14 03:47:56 +09:00
Dean Herbert
81e5a37d6d Enlist a few more important notifications 2018-07-14 03:31:19 +09:00
Dean Herbert
e0bcd6988a
Merge branch 'master' into lesserSideKeys 2018-07-13 23:32:44 +09:00
Dean Herbert
d63611a9b3
Merge branch 'master' into fix-incorrect-mods 2018-07-13 22:08:21 +09:00
Dean Herbert
6698f320fb
Merge branch 'master' into download-button-state 2018-07-13 22:05:26 +09:00
Dean Herbert
ac4f25c5bc Make notifications less noisy 2018-07-13 21:25:08 +09:00
Dean Herbert
fc3aff6689 Fix initial colour 2018-07-13 21:19:10 +09:00
Dan Balasescu
3d136ef0f9
Merge branch 'master' into fix-ugly-line 2018-07-13 18:08:55 +09:00
Dean Herbert
ee2c7c50ad Tidy up button hierarchy 2018-07-13 16:28:18 +09:00
Dean Herbert
0676919496 Fix incorrect corner radius 2018-07-13 14:56:44 +09:00
Dean Herbert
09be9c2ed2 Merge remote-tracking branch 'upstream/master' into naoey-download-button-state 2018-07-13 14:52:10 +09:00
Dean Herbert
ac078153ae Merge remote-tracking branch 'upstream/master' into peppy-fix-incorrect-mods 2018-07-13 14:20:56 +09:00
Dean Herbert
20b805f9eb
Merge branch 'master' into fix-key-binding-row 2018-07-12 20:06:47 +09:00
Dean Herbert
24054246b8 Fix DI regression 2018-07-11 17:54:01 +09:00
Dean Herbert
fbc5250bf1 Update framework 2018-07-11 17:12:01 +09:00
ekrctb
55e0cd770d Use BypassAutoSizeAxes 2018-07-11 11:24:43 +09:00
Roman Kapustin
8f9bf4bd3e Remove redundant DesktopGameWindow cast 2018-07-10 22:07:32 +03:00
HoutarouOreki
dd20663192 Lesser keyboard steps 2018-07-10 17:28:56 +02:00
smoogipoo
bf1ce8cdd8 Fix linking still being broken 2018-07-10 16:02:13 +09:00
smoogipoo
0f649cd231 Merge remote-tracking branch 'origin/master' into fix-beatmap-links 2018-07-10 16:01:56 +09:00
Dean Herbert
7f315d79c2 Fix pixel gap in user profile when scrolling 2018-07-10 13:06:03 +09:00
Roman Kapustin
699702f8d0 Use DesktopGameWindow.GetCurrentDisplay method 2018-07-09 21:57:31 +03:00
Roman Kapustin
3dbdfcc1e2 Merge remote-tracking branch 'ppy/master' into select_resolution_in_fullscreen_mode 2018-07-09 21:31:46 +03:00
Dean Herbert
974c4f5185 ToolbarMode* -> ToolbarRuleset* 2018-07-10 01:20:21 +09:00
Dean Herbert
1670f4fe31
Merge branch 'master' into fix-osd-fade-in 2018-07-09 19:10:57 +09:00
Dean Herbert
df67c0498d Fix OSD fade-in not correctly debouncing
It could potentially never fade in on quick presses.
2018-07-09 17:53:39 +09:00
HoutarouOreki
930667d0f9 Remove unused age display code 2018-07-09 10:12:10 +02:00
Dean Herbert
91777b04d8
Merge branch 'master' into download-button-state 2018-07-08 14:15:47 +09:00
Dan Balasescu
8f3f872182
Merge branch 'master' into go-forward 2018-07-06 14:29:26 +09:00
Dean Herbert
e5001b84bd Merge remote-tracking branch 'upstream/master' into ekrctb-fix-volme-meter 2018-07-05 21:04:19 +09:00
Dean Herbert
625b9ead4c Fix links from profile top scores to beatmaps not working correctly 2018-07-05 21:00:23 +09:00
ekrctb
bbceac6cda Apply renaming of wheel -> scroll 2018-07-05 16:50:04 +09:00
Dean Herbert
e28a610757 Fix mods not correctly resetting when changing ruleset at song select 2018-07-05 13:22:52 +09:00
Jacob Odgård Tørring
2979cb96a6 attemptSeek accesses beatmap Disabled directly 2018-07-04 21:09:28 +02:00
Jacob Odgård Tørring
9248340df8
Merge branch 'master' into master 2018-07-04 20:51:05 +02:00
naoey
6ea6a10def Reduce size of download button in list view to fit hover effect 2018-07-03 20:26:49 +05:30
naoey
2a0b1f3615 Update direct panel download button for new design
- Add a download failed event to BeatmapManager
- Make DownloadButton aware of all 3 possible download states
- Change button appearance based on each state
2018-07-03 20:18:09 +05:30
Dean Herbert
5fc17bacf3 Add "Select" action
Allows progressing forwards in the interface
2018-07-03 18:39:15 +09:00
Dean Herbert
b33206c212 Fix selecting a button on a dialog causing both that button and exit to animate 2018-07-03 18:35:09 +09:00
Dean Herbert
6c848f135c Add comment about last button invocation 2018-07-02 17:48:16 +09:00
Dan Balasescu
e99c05c85e
Merge branch 'master' into fix-dialog-popups 2018-07-02 17:41:16 +09:00
smoogipoo
9f405b0894 Don't hard-bail if config skin doesn't exist anymore 2018-07-02 16:49:07 +09:00
smoogipoo
b61fe10f62 Adapt to IBindables 2018-07-02 15:07:18 +09:00
smoogipoo
4070c1a888 Merge remote-tracking branch 'origin/master' into non-null-ruleset
# Conflicts:
#	osu.Game/Screens/Select/FilterControl.cs
2018-07-02 15:05:34 +09:00
Dean Herbert
596787c941 Standardise input handling of popup dialogs 2018-07-02 14:25:12 +09:00
Roman Kapustin
4af45b7518 Do not display resolutions lower than 800x600 2018-06-30 20:06:11 +03:00
Roman Kapustin
101f18821a Merge remote-tracking branch 'ppy/master' into select_resolution_in_fullscreen_mode 2018-06-30 17:05:25 +03:00
Dean Herbert
b9b1e77172
Merge branch 'master' into allow-back-in-player 2018-06-29 21:54:18 +09:00
Dean Herbert
6a80a21078 Tidy up escape handling 2018-06-29 21:06:38 +09:00
Dean Herbert
9fce4eaccf
Merge branch 'master' into di-backed-ruleset 2018-06-29 19:33:12 +09:00
Dan Balasescu
513129d4a8
Merge branch 'master' into fix-dialog-overlay-sounds 2018-06-29 18:45:37 +09:00
Dean Herbert
8ba2ac922f Move to local components namespace 2018-06-28 19:23:56 +09:00
Dean Herbert
98fec94693 Merge remote-tracking branch 'upstream/master' into HoutarouOreki-unifyDates 2018-06-28 19:14:47 +09:00
Joehu
8518fce4a9 Fix osu!supporter naming 2018-06-27 17:57:55 -07:00
ekrctb
1ed6a672f2 Update volme control
Use IMouseWheelBindingHandler for volume VolumeControlReceptor.
VolumeMeter is no longer an IKeyBindingHandler because it is unused.
2018-06-27 18:43:29 +09:00
smoogipoo
ede59f63f6 Merge remote-tracking branch 'origin/master' into make-loading-more-visible 2018-06-27 12:52:06 +09:00
Dean Herbert
bebf47d0d5
Merge branch 'master' into fix-dialog-overlay-sounds 2018-06-27 12:21:29 +09:00
smoogipoo
8a81fba1ea Other input states need to be considered for wheel bindings 2018-06-26 20:34:22 +09:00
Dean Herbert
4bcc05a7fc Remove null checks on ruleset
Add a default ruleset to `OsuTestCase` to cover testing scenarios.
2018-06-26 18:24:34 +09:00
Dean Herbert
4dd12cedad Fix review issues 2018-06-26 17:01:40 +09:00
Dean Herbert
b0a1b25983 Privatise game ruleset and access via DI
Also decouples the bindable at SongSelect, where it is debounced in line with the carousel being updated.
2018-06-26 16:32:32 +09:00
Dean Herbert
563cb46b4a Update framework and other nuget dependencies 2018-06-26 12:10:56 +09:00
Roman Kapustin
5076fe4c20 LayoutSettings: inject OsuGameBase instead of OsuGame 2018-06-23 12:45:13 +03:00
Dean Herbert
51600dd0ae Improve PlayButton's loading 2018-06-22 14:27:36 +09:00
smoogipoo
8d3c2d54f3 Merge remote-tracking branch 'origin/master' into improve-volume-controls 2018-06-22 13:33:07 +09:00
smoogipoo
67a067ffa5 Fix overlay not disappearing when losing hover from the last pixel
OnMouseMove isn't invoked when hover is lost.
2018-06-22 13:32:32 +09:00
smoogipoo
72aee8344e Always call schedulePopOut 2018-06-22 13:32:00 +09:00
smoogipoo
206f913a4c Make mute button not handle hover 2018-06-22 13:31:32 +09:00
Dean Herbert
73e13e2d63 Rename Stop to StopAnyPlaying for clarity 2018-06-22 12:35:43 +09:00
Dean Herbert
4b2b1f51f9 Apply some code review 2018-06-22 12:33:30 +09:00
Dean Herbert
de10480e95
Merge branch 'master' into multiple_previews_different_overlays 2018-06-22 10:44:36 +09:00
Roman Kapustin
5d26d5d4ed Fix resolutionDropdown 2018-06-21 20:42:22 +03:00
Roman Kapustin
2ecf78e3d2 Merge remote-tracking branch 'ppy/master' into select_resolution_in_fullscreen_mode 2018-06-21 19:44:29 +03:00
smoogipoo
40ed3fdd05 Fix possible incorrect order of events due to threaded load 2018-06-21 18:45:32 +09:00
smoogipoo
b2066c5d73 Rework preview tracks to reduce usage complexities 2018-06-21 18:40:27 +09:00
Dean Herbert
a2fa55c426 Fix dialog overlay playing double samples on show/hide 2018-06-21 16:47:05 +09:00
Dean Herbert
ed17a241f5 Decrease notification font size 2018-06-21 14:43:02 +09:00
smoogipoo
ab2889da1f Merge remote-tracking branch 'origin/master' into multiple_previews_different_overlays 2018-06-21 13:24:02 +09:00
Dean Herbert
65487d1610
Merge branch 'master' into improve-volume-controls 2018-06-21 11:56:56 +09:00
Dean Herbert
285062d93e
Merge branch 'master' into master 2018-06-21 11:40:37 +09:00
Dean Herbert
ee0950a845
Merge branch 'master' into select_resolution_in_fullscreen_mode 2018-06-20 13:19:39 +09:00
Dean Herbert
d7f65d62e0 Use vertical/horizontal pair instead 2018-06-20 10:45:35 +09:00
Michael Manis
a0f1143287 Add padding to 'show more' button 2018-06-18 19:14:44 -04:00
Dean Herbert
c74c059044
Merge branch 'master' into multiple_previews_different_overlays 2018-06-18 05:05:27 +09:00
HoutarouOreki
faff7feef1 Remove unnecessary white space change 2018-06-15 15:03:09 +02:00
HoutarouOreki
6938adc148 Unify join time text's visual format with the web 2018-06-15 15:00:41 +02:00
HoutarouOreki
d122547c1e DrawableJoinDate handles "Here since the beginning" text 2018-06-15 14:28:49 +02:00
Dean Herbert
db9141a6cf
Merge branch 'master' into fix-music-controller-drag 2018-06-15 17:08:01 +09:00
Dean Herbert
8b5a9c3236
Merge branch 'master' into fix-volume-pixellation 2018-06-15 16:45:15 +09:00
Dean Herbert
1c27ef644a Fix music controller drag activating from anywhere on the screen 2018-06-15 16:12:11 +09:00
Joehu
069d939e29 Remove "from" prefix from sources on direct panels 2018-06-14 21:53:01 -07:00
Dean Herbert
b318b770d4 Fix pixellation of volume meter progress bars 2018-06-13 19:22:39 +09:00
Dean Herbert
cee5be1d56 Improve precision wheel adjustment handling 2018-06-13 17:03:56 +09:00
Dean Herbert
e0b68e4e09 Fix hide re-schedule not triggering on noop state change 2018-06-13 16:47:10 +09:00
Dean Herbert
a55bf82fd9 Handle hover blocking in VolumeOverlay to ensure correct hide scheduling 2018-06-13 16:46:56 +09:00
Dean Herbert
2a18625b2c Correctly block scroll events when hovering controls 2018-06-13 16:46:27 +09:00
Dean Herbert
2cc7953421 Merge remote-tracking branch 'upstream/master' into peppy-improve-volume-controls 2018-06-13 16:14:20 +09:00
Roman Kapustin
71371dc4b8 ValueChanged parameters quickfix 2018-06-12 19:27:55 +03:00
UselessToucan
b6c0aa3f26
Merge branch 'master' into select_resolution_in_fullscreen_mode 2018-06-12 18:01:30 +03:00
Dan Balasescu
126678c226
Merge branch 'master' into multiple_previews_different_overlays 2018-06-12 19:26:51 +09:00
Dan Balasescu
80ec0b1839
Merge branch 'master' into populate-missing-online-ids 2018-06-12 14:03:23 +09:00
Dean Herbert
ae136e89a4
Merge branch 'master' into ruleset-configs 2018-06-12 13:13:18 +09:00
Dan Balasescu
0a35a81c2d
Merge branch 'master' into populate-missing-online-ids 2018-06-12 13:11:21 +09:00
Dan Balasescu
41452a0754
Merge branch 'master' into multiple_previews_different_overlays 2018-06-11 18:56:50 +09:00
Dan Balasescu
7de8e1cfc4
Merge branch 'master' into refactor-api 2018-06-11 18:49:15 +09:00
Dan Balasescu
78daf1c7ad
Merge branch 'master' into exponential-scoring-toggle 2018-06-11 18:19:33 +09:00
smoogipoo
14b7530994 Use a global ruleset config cache 2018-06-11 15:07:42 +09:00
smoogipoo
f4fbf27d42 Give ruleset settings a ruleset-specific config manager 2018-06-11 13:28:50 +09:00
Roman Kapustin
de7e4328c5 Use bindable size 2018-06-10 16:17:57 +03:00
UselessToucan
4233211fb3
Merge branch 'master' into select_resolution_in_fullscreen_mode 2018-06-08 21:13:41 +03:00
Roman Kapustin
8702a70524 Resolve merge conflicts in DirectOverlay 2018-06-08 21:03:16 +03:00
Dean Herbert
a880e626d8 Use for loop and SetLayoutPosition 2018-06-08 21:20:15 +09:00
Dean Herbert
1e7bffe5e3
Merge branch 'master' into badge-ordering 2018-06-08 21:13:35 +09:00
Dean Herbert
803598c3d0 Merge remote-tracking branch 'upstream/master' into DrabWeb-beatmap-set-downloader 2018-06-08 20:54:14 +09:00
Dean Herbert
59e5a8556f Fix volume control adjustment being extreme when precision scrolling 2018-06-08 18:15:03 +09:00
Dean Herbert
66d28aa9fc
Merge branch 'master' into beatmap-set-downloader 2018-06-08 16:28:25 +09:00
Dean Herbert
955a78e76d Remove OnlineBeatmapSetID from BeatmapInfo
It should now be retrieved via the linked BeatmapSetInfo
2018-06-08 15:26:27 +09:00
Dean Herbert
8cc31aca54 Reorganise API requests and response classes
They were previously breaking the two-class-per-file rule.
2018-06-08 11:42:35 +09:00
DrabWeb
0fae49ee21 Don't add a 'with Video' subtitle. 2018-06-07 20:47:27 -03:00
Dean Herbert
0b4f5af52e Add setting to toggle standardised or exponential scoring display
Also adjusts exponential scoring to be closer to stable. Log wasn't cutting it.
2018-06-08 03:17:12 +09:00
Roman Kapustin
1fdbd20471 Nullref quickfix in PlayButton 2018-06-07 14:50:21 +03:00
Roman Kapustin
ab6699b1fb Stop DirectOverlay preview on search update 2018-06-07 14:40:41 +03:00
Roman Kapustin
3033294df1 Stop Preview on BeatmapSet change 2018-06-07 14:30:11 +03:00
Dean Herbert
475fb06559 Use new bind method 2018-06-07 16:46:54 +09:00
Dean Herbert
17ba129e61 Make volume controls stay open when hovered
Closes #2743.
2018-06-07 01:14:43 +09:00
Dean Herbert
dd75cd973b Show UI mouse cursor when hovering volume meters during gameplay
Also adds a hover animation.
2018-06-07 01:13:35 +09:00
Dean Herbert
621be3bbfc Merge branch 'master' into disallow-beatmap-change 2018-06-07 00:38:40 +09:00
Dean Herbert
ea1336d243 Merge remote-tracking branch 'upstream/master' into nuget-consumption 2018-06-06 21:09:51 +09:00
Dean Herbert
2e23da1dfa
Merge branch 'master' into beatmap-set-downloader 2018-06-06 20:32:58 +09:00
Dan Balasescu
c30861186b
Merge branch 'master' into disallow-beatmap-change 2018-06-06 20:26:17 +09:00
smoogipoo
ff60f69f47 Explicitly construct local beatmaps rather than using GetBoundCopy 2018-06-06 20:19:30 +09:00
smoogipoo
72cc53aded Rename GameBeatmap -> BindableBeatmap 2018-06-06 20:16:20 +09:00
Dean Herbert
a645a109be
Merge branch 'master' into overlay-activation 2018-06-06 19:18:28 +09:00
Dean Herbert
0a97b8ae25 Implement DebugUtils locally
Has been removed from framework
2018-06-06 18:33:10 +09:00
smoogipoo
4086ff7313 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
#	osu.Game/Screens/Menu/Intro.cs
#	osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
Aergwyn
aaaa8a3b7c match Bindable names 2018-06-06 09:55:16 +02:00