1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 14:07:25 +08:00
Commit Graph

1149 Commits

Author SHA1 Message Date
miterosan
ba5861b527 Merge remote-tracking branch 'origin/master' into Private_Messages
# Conflicts:
#	osu.Game/Online/API/Requests/GetMessagesRequest.cs
#	osu.Game/Overlays/Chat/ChatTabControl.cs
2018-05-06 19:45:33 +02:00
Dean Herbert
27437cfbaf
Merge branch 'master' into show-beatmap-id 2018-04-20 18:05:24 +09:00
Dean Herbert
8649ddc68b Make forum posts a web link 2018-04-20 13:01:23 +09:00
miterosan
3b68dda23e Merge remote-tracking branch 'origin/master' into Private_Messages 2018-04-18 20:55:12 +02:00
Dean Herbert
f62677222c Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id 2018-04-18 13:08:53 +09:00
Dean Herbert
96ef564f44 Remove unused field 2018-04-16 00:25:09 +09:00
Dean Herbert
c9615f837a Merge remote-tracking branch 'upstream/master' into instant-hide-screenshot 2018-04-16 00:20:06 +09:00
Dean Herbert
ae77c010e2 Merge remote-tracking branch 'upstream/master' into wave-container 2018-04-15 21:03:18 +09:00
miterosan
5bfb386226 Merge remote-tracking branch 'origin/master' into Private_Messages 2018-04-14 13:31:03 +02:00
smoogipoo
cf65833572 Reword xmldoc 2018-04-13 21:15:08 +09:00
smoogipoo
733f70cbd5 Merge remote-tracking branch 'origin/master' into instant-hide-screenshot 2018-04-13 21:13:09 +09:00
smoogipoo
34adb2527c A lot more protection from outsiders 2018-04-13 21:12:33 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
smoogipoo
0235eba9de Make TakeScreenshotAsync await on the internal task 2018-04-13 17:51:09 +09:00
smoogipoo
2e5bbe7074 Don't expose CursorOverrideContainer via DI + internalise access 2018-04-13 17:36:38 +09:00
smoogipoo
ebe36f0612 Instantly hide cursor for required frames while taking screenshot 2018-04-13 17:27:10 +09:00
miterosan
e39f5a1adf Rename var chatmanager -> channelManager
Apply requested changes
2018-04-12 23:19:13 +02:00
Joehu
61d6f52a53 Lowercase back button 2018-04-12 08:26:25 -07:00
DrabWeb
0bede52381 Move the waves portion of WaveOverlayContainer to WaveContainer to allow usage in other places. 2018-04-11 16:22:27 -03:00
TocoToucan
d7812ab12e CursorOverrideContainer.ShowMenuCursor 2018-04-11 21:22:52 +03:00
miterosan
3860594f40 Rename everything into channel and remove everything chat 2018-04-11 20:01:57 +02:00
Dean Herbert
c33cb9c02e
Merge branch 'master' into show-beatmap-id 2018-04-10 16:05:32 +09:00
UselessToucan
9225c06872
Merge branch 'master' into hide_menu_cursor 2018-04-09 21:41:54 +03:00
miterosan
a70b329155 Split drawing and business logic of ChatOverlay 2018-04-08 18:21:48 +02:00
naoey
ca4299c6fe
Remove unused using and fix possible nullref. 2018-04-04 22:07:24 +05:30
naoey
c304c1eecf
Make LinkFlowContainer handle beatmap id lookup in game. 2018-04-04 21:23:51 +05:30
DrabWeb
65f0e91734 Use Interpolation function directly for resizing tab strips. 2018-04-04 03:04:26 -03:00
DrabWeb
e3218250d5 Fix tab strip in BreadcrumbControl, allow strip height to be overriden. 2018-03-29 15:41:27 -03:00
DrabWeb
f43b009b96 Add optional strip to OsuTabControl. 2018-03-29 15:29:45 -03:00
TocoToucan
458594d24d Qualifier 'this.' is redundant 2018-03-27 18:03:57 +03:00
TocoToucan
e91d24f31a Use ScreenshotCaptureMenuCursor in ScreenshotManager 2018-03-24 12:53:01 +03:00
Dean Herbert
0e669c9a3f Fix many warnings 2018-03-24 18:23:22 +09:00
smoogipoo
c29f7a4333 Merge remote-tracking branch 'origin/master' into netstandard 2018-03-24 14:49:46 +09:00
TocoToucan
dd5cc59250 Introduce 'Capture menu cursor' setting 2018-03-23 22:53:06 +03:00
Joseph Madamba
f77dad2809
Add perfect mod icon 2018-03-22 22:49:14 -07:00
Dean Herbert
74191e1b73 Merge remote-tracking branch 'upstream/master' into take_screenshot 2018-03-22 20:49:17 +09:00
Dean Herbert
e41993ac44 Don't bother with an exception that will never happen
Wasn't being caught anyways
2018-03-22 20:45:26 +09:00
Dean Herbert
94847e4a23 Allow clicking notification to open screenshot folder 2018-03-22 20:44:00 +09:00
Dean Herbert
9e080028ff Add shutter sound 2018-03-22 20:42:55 +09:00
smoogipoo
9f220b3b9b Add explanatory comment 2018-03-22 18:51:03 +09:00
Dean Herbert
6e379f0646 Fix FocusedTextBox in line with framework changes 2018-03-22 15:54:16 +09:00
smoogipoo
3f3f57e51e Use cached vertexbatch add delegate 2018-03-22 15:13:38 +09:00
TocoToucan
4991f2ad2e Change filename format 2018-03-21 18:27:08 +03:00
Dean Herbert
ccdd11d7b2 Add missing licence header 2018-03-21 12:29:44 +09:00
TocoToucan
ee73bd4568 Update ScreenshotManager inline with framework changes 2018-03-19 22:39:00 +03:00
TocoToucan
245200d3ee Add simple screenshot notification 2018-03-16 21:25:00 +03:00
TocoToucan
8429408974 Change screenshot file name 2018-03-16 21:05:25 +03:00
TocoToucan
34dc8e7375 Resolve merge conflict 2018-03-14 23:22:19 +03:00
TocoToucan
5a1af062d3 Handle GlobalAction.TakeScreenshot in ScreenshotManager 2018-03-14 22:55:24 +03:00
TocoToucan
25f738c4ae Do not support bmp screenshots 2018-03-14 12:57:55 +03:00
TocoToucan
0e69ab1615 Introduce ScreenshotManager class 2018-03-14 00:17:12 +03:00
Dan Balasescu
fce61943bd
Merge branch 'master' into smoother-parallax-scale 2018-03-12 12:12:01 +09:00
smoogipoo
86d93ffe3c Fix tooltip not working due to not handling input 2018-03-12 10:49:50 +09:00
Dean Herbert
6ad962fc8b Interpolate ParallaxContainer's scale
Things were a bit jumpy when a screen was adjusting `ParallaxAmount`. This smoothes the applied scale changes to look great again.

Most noticeable when hitting the retry hotkey (`~`) from gameplay.
2018-03-09 14:35:53 +09:00
Dean Herbert
3b56999118 Add drawable to display (and update) relative dates 2018-03-08 12:58:16 +09:00
Dean Herbert
f78538fea8
Merge branch 'master' into user-profile-recent 2018-03-07 19:41:52 +09:00
Dan Balasescu
5fda7881c3
Merge branch 'master' into fix-textbox-arrows 2018-03-07 16:01:44 +09:00
Dean Herbert
c176e309e1
Merge branch 'master' into volume-control 2018-03-07 14:03:09 +09:00
smoogipoo
78d73d4c11 Additional fixes for flow ordering after framework changes 2018-03-06 17:20:58 +09:00
smoogipoo
148551afa2 osu!-side changes in-line with framework layout changes 2018-03-06 14:12:37 +09:00
Dean Herbert
90828cca8f Fix left and right arrows keys in chat overlay not working
Misplaced override. Resolves ppy/osu-framework#1444
2018-03-06 08:59:40 +09:00
jorolf
3a420ba826 add the volume overlay 2018-03-03 19:08:35 +01:00
Dean Herbert
26e50043b7 Fix parallax container during rewinds 2018-03-04 00:52:00 +09:00
Dean Herbert
eacb9ba743
Merge branch 'master' into user-profile-recent 2018-02-28 23:49:33 +09:00
Dean Herbert
bda673e6fe
Merge branch 'master' into player-reduced-parallax 2018-02-28 23:15:25 +09:00
naoey
2e535afb84
Remove redundant subsection title.
- Also handle opening UserProfile in LinkFlowContainer similar to how
beatmaps and channels are handled
2018-02-28 15:25:29 +05:30
Dean Herbert
dd6cf1379e Reduce parallax effect during gameplay
This also cleans up some shared code in OsuScreen.
2018-02-28 11:42:47 +09:00
Dean Herbert
0cd049c6b0 Rely less on zero-duration transform helpers
They have huge overheads.

See ppy/osu-framework#1411.
2018-02-28 11:00:54 +09:00
naoey
5724618b2a
Add license headers and sanitise open profile argument. 2018-02-26 09:58:11 +05:30
naoey
bb40919f9c
Add link handling to recent activities.
- Add a show user action to link handling
2018-02-26 01:21:27 +05:30
Dean Herbert
96c23d2a62 Add override to fix left/right arrow control 2018-02-15 19:41:15 +09:00
smoogipoo
b500b76407 Merge branch 'master' into update-branch 2018-02-08 23:35:48 +09:00
Dean Herbert
cafa605b90 Fix visual settings checkboxes playing sounds in bindable binding
Move sound binding to much later in the process to avoid programmatic checkbox changes triggering interaction sounds
2018-02-08 14:43:47 +09:00
smoogipoo
ee93c0bc19 Use an endian-independent method to find precision 2018-02-07 20:03:37 +09:00
smoogipoo
23d4c20726 Apply suggestions to normalisation function 2018-02-07 17:31:18 +09:00
smoogipoo
406ec6e92d Make OsuSliderBar always use number of digits from precision 2018-02-07 13:26:17 +09:00
Dan Balasescu
d332a2dddd
Merge branch 'master' into url-parsing-support 2018-02-01 16:13:32 +09:00
Dean Herbert
47b92f3d1d Fix mute button not prolonging volume control display 2018-01-31 18:00:44 +09:00
Dean Herbert
93ffa1f8a2 Fix button alignment and animation 2018-01-31 17:36:53 +09:00
Dean Herbert
97ae44f23c Remove outwards exposure of mute property 2018-01-31 16:56:26 +09:00
Dean Herbert
b47061f43d Merge remote-tracking branch 'upstream/master' into mute-toggle 2018-01-31 14:20:15 +09:00
Dean Herbert
53129e5235 Fix text getting truncated after last link in chat line 2018-01-30 17:47:22 +09:00
Dean Herbert
a5b0d51205 Merge remote-tracking branch 'upstream/master' into url-parsing-support
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-01-27 14:06:58 +09:00
Dean Herbert
060d80efbe Continue showing progress bar on direct panels when importing
Previously the progrress bar would fade out once downloads completed, which felt unintuitive.
2018-01-22 13:05:07 +09:00
aQaTL
c4feb67bce
Using field properties to set mute / unmute instead of separate methods 2018-01-20 11:45:04 +01:00
aQaTL
4a85266fca
Using BindableBool to mute the volume when it's value changes 2018-01-18 17:23:02 +01:00
aQaTL
9c09b33e4e
Removed no longer used "lastVolume" field 2018-01-17 23:17:59 +01:00
aQaTL
18ff57fdf9
Inline changing mute icon properties with object creation 2018-01-17 21:09:46 +01:00
aQaTL
a8fb732256
Added muted/unmuted icon 2018-01-17 20:43:08 +01:00
aQaTL
1440edbf8b
Use AudioManager adjustments to mute volume 2018-01-17 17:15:13 +01:00
aQaTL
ac41cb59ea
Typo fix, removed unnecessary braces 2018-01-17 14:36:33 +01:00
Dean Herbert
38c5434b82 Remove placeholder methods in OsuGame
Let's add these when they can actually be implemented.
2018-01-17 20:32:20 +09:00
Dean Herbert
b27577e242 Add temporary browser handling of beatmap difficulty loading
until we have an api method to support this.
2018-01-17 19:37:20 +09:00
Dean Herbert
783ca40c64 Update with upstream changes 2018-01-17 16:51:47 +09:00
Dean Herbert
54b0f4b912 Merge branch 'master' into url-parsing-support 2018-01-17 16:16:55 +09:00
aQaTL
0340e4f8dc
Option in settings to toggle mute/unmute when losing/gaining window focus 2018-01-16 20:33:30 +01:00
aQaTL
9277586907
Toggle mute/unmute keyboard shortcut 2018-01-16 17:46:54 +01:00
Dean Herbert
5212194e3f Merge remote-tracking branch 'ppy/master' into fix-cursor-hiding 2018-01-17 00:44:42 +09:00
Dean Herbert
5e1cd8ddc4 Apply conditionals directly rather than using an in-between property 2018-01-16 20:34:40 +09:00
smoogipoo
02564db43f Merge remote-tracking branch 'origin/master' into fix-cursor-hiding 2018-01-16 20:20:47 +09:00
Dean Herbert
9b33499fe7 Merge remote-tracking branch 'upstream/master' into RefactorInputQueues 2018-01-16 20:04:34 +09:00
smoogipoo
0459f0a069 Invert CanShowCursor conditional to fix cursor not showing in VisualTests 2018-01-16 13:40:02 +09:00
Dean Herbert
0796d33e66
Merge branch 'master' into fix-skipbutton-ordering 2018-01-15 15:54:18 +09:00
smoogipoo
7c41925144 ProvidesUserCursor -> ProvidingUserCursor, and update xmldoc 2018-01-15 14:07:09 +09:00
smoogipoo
43f8a8e8c5 Rename OsuCursorVisualiser -> CursorOverrideContainer 2018-01-15 14:00:13 +09:00
Aergwyn
ae1adfd2f2 remove unnecessary empty lines
codefactor.io \(o.o)/
also one unnecessary semicolon
2018-01-12 19:30:34 +01:00
smoogipoo
78441c05cb OsuCursorContainer -> OsuCursorVisualiser 2018-01-12 19:45:09 +09:00
smoogipoo
34aee4fea0 Improve comments 2018-01-12 19:39:35 +09:00
smoogipoo
16d739580b IProvideLocalCursor -> IProvideCursor 2018-01-12 19:37:03 +09:00
smoogipoo
620e125fad Fix cursor being displayed on intro/disclaimer 2018-01-12 19:34:55 +09:00
Dean Herbert
45301d07fd
Merge branch 'master' into url-parsing-support 2018-01-12 19:34:44 +09:00
smoogipoo
5952f1e7f1 Adjust transforms for cursor transitions 2018-01-12 19:34:14 +09:00
Dean Herbert
188b26472c Merge remote-tracking branch 'upstream/master' into sliderbar-tooltip-precision 2018-01-12 18:54:36 +09:00
smoogipoo
512e4d2c9f Rewrite the way that cursor overrides are done game-wide 2018-01-12 18:13:17 +09:00
FreezyLemon
2c67ff75ed added custom hoverclicksounds so links make sounds on hover&click 2018-01-11 18:52:50 +01:00
smoogipoo
5cfb2c2ffe Make VolumeControlReceptor handle global input
Fixes volume not being able to be changed in dead areas of OverlayContainers.
2018-01-11 19:03:31 +09:00
smoogipoo
c5c33e20bf OverlayContainer changes in-line with framework 2018-01-11 19:03:01 +09:00
smoogipoo
d147683361 Cleanup 2018-01-10 17:39:15 +09:00
smoogipoo
c010b48b29 Remove number format specified from OsuSliderBar, override ToolTipText
Better/cleaner solution.
2018-01-10 17:29:16 +09:00
smoogipoo
17e7f75aca More osu!-side bindable fixes 2018-01-10 15:41:13 +09:00
FreezyLemon
3bf9901dd2 Fixed bugs and added tests 2018-01-09 16:11:45 +01:00
Dean Herbert
72624aea18 Use a better method of link compilation
Adds word wrap back, simplifies a lot.
2018-01-09 20:33:20 +09:00
Dean Herbert
1be0569743 Update licence headers 2018-01-09 14:34:52 +09:00
Dean Herbert
b035a92bda
Merge branch 'master' into url-parsing-support 2018-01-09 14:28:20 +09:00
TocoToucan
ae032cbf23 Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties 2018-01-07 23:40:00 +03:00
Dean Herbert
a1d94d7adf
Merge branch 'master' into sliderbar-tooltip-precision 2018-01-05 20:48:30 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
smoogipoo
cbf4852438 Expose a NumberFormatInfo for more extensibility 2018-01-05 14:26:10 +09:00
smoogipoo
b84f83cf16 Trigger a value changed event when the number of digits changes 2018-01-05 14:26:10 +09:00
smoogipoo
eaa2a007e7 Cleanup 2018-01-05 14:26:10 +09:00
smoogipoo
08af3e6303 Make OsuSliderBar formatting support variable number of digits 2018-01-05 14:26:10 +09:00
smoogipoo
ddc9edab54 Make OsuSliderBar support both float and double values 2018-01-05 14:26:10 +09:00
smoogipoo
af86220dcc Merge remote-tracking branch 'origin/master' into update-branch 2018-01-05 12:08:50 +09:00
smoogipoo
5eb2dc3d64 Cleanup some possible CI errors
Not sure why these aren't being detected on master right now - they should be...
2018-01-05 01:20:24 +09:00
smoogipoo
36e9232472 Merge master into netstandard 2018-01-05 00:42:48 +09:00
Dan Balasescu
d167663340
Merge branch 'master' into large-texture-store 2018-01-03 13:50:49 +09:00
Dean Herbert
faf1181fc3
Merge branch 'master' into url-parsing-support 2018-01-02 17:51:50 +09:00
FreezyLemon
e7721d71f3 Changed chat link implementation according to review 2017-12-31 00:51:47 +01:00
Dean Herbert
f2d302f8dc Create a LargeTextureStore for cached (but not atlased) global textures
Also
- Fixes first transition depth being incorrect.
- Improves smoothness of transitions (and adds a slight delay to offset from screen switches).
2017-12-31 07:05:04 +09:00
Dean Herbert
e332683d18 Fix music controller draggability 2017-12-30 21:10:40 +09:00
Dean Herbert
442a649c63 Make all FocusedOverlays hide on clicks outside of themselves
Also allows wheel events to pass through around them.
2017-12-30 20:45:41 +09:00
FreezyLemon
ae79be7b51 small style fixes plus new assert in test 2017-12-28 21:45:58 +01:00
FreezyLemon
7454633f63 Refactor and general tidying up 2017-12-28 20:11:21 +01:00
smoogipoo
7a793eaded Merge master into netstandard 2017-12-27 20:48:53 +09:00
FreezyLemon
cbfef7052e further CI adjustments 2017-12-25 21:02:48 +01:00
FreezyLemon
962e4d7c8a Removed LinkId and word wrapping (for now).
Also reimplemented the OsuHoverContainer properly
2017-12-25 20:46:04 +01:00
FreezyLemon
a30448095e Merge branch 'master' into url-parsing-support 2017-12-25 19:12:23 +01:00
Dean Herbert
1a318c5c2b Improve LineGraph invalidation logic 2017-12-22 18:58:35 +09:00
Dean Herbert
fc0b97065c Move hover sound/container to base implementation 2017-12-20 15:54:13 +09:00
Dean Herbert
a6496e35ec Merge branch 'master' into url-parsing-support 2017-12-20 14:41:12 +09:00