1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 16:57:25 +08:00
Commit Graph

1560 Commits

Author SHA1 Message Date
Dean Herbert
fbc5250bf1 Update framework 2018-07-11 17:12:01 +09:00
miterosan
d4f9bcdee1 Merge branch 'Private_Messages' of https://github.com/miterosan/osu into Private_Messages 2018-07-09 20:14:16 +02:00
miterosan
263e68de91 Use a custom channel not found exception. 2018-07-09 18:45:11 +02:00
miterosan
c56a4ea893
Merge branch 'master' into Private_Messages 2018-07-08 19:29:33 +02:00
Dean Herbert
7bfd82a417
Merge branch 'master' into hit-shake 2018-07-06 18:42:18 +09:00
Dean Herbert
c4952569cc
Merge branch 'master' into fix-menu-cursor-animation 2018-07-06 17:46:29 +09:00
Dean Herbert
54db287791 Remove casting 2018-07-06 17:45:39 +09:00
Dean Herbert
79af5cb0a0 Limit shake duration to ensure it doesn't overlap miss window 2018-07-06 17:24:30 +09:00
Dean Herbert
98410dbb6d Reduce shake transform count by one for more aesthetic behaviour 2018-07-06 13:24:02 +09:00
Dean Herbert
48d90a67ae xmldoc and formatting 2018-07-06 12:13:23 +09:00
Dean Herbert
0ecbc5945f Adjust transform to look better 2018-07-06 12:07:39 +09:00
Dean Herbert
aa96d91762 Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake 2018-07-06 11:57:32 +09:00
tgi74000
558b2622a7 Move the Shake logic to a new ShakeContainer 2018-07-05 15:48:54 +02:00
Dean Herbert
5fc17bacf3 Add "Select" action
Allows progressing forwards in the interface
2018-07-03 18:39:15 +09:00
ekrctb
f9f192ce34 Modify MenuCursor hightlight animation 2018-07-03 15:15:03 +09:00
miterosan
d791216505
Merge branch 'master' into Private_Messages 2018-07-03 07:58:15 +02:00
Dean Herbert
627a5deff9
Merge branch 'master' into fix-menu-cursor-crash 2018-07-02 18:09:11 +09:00
ekrctb
ae6fdd8e29 whitespace 2018-07-02 16:20:44 +09:00
ekrctb
63746876c2 typo 2018-07-02 16:09:33 +09:00
ekrctb
341ffa4667 Fix MenuCursor crash 2018-07-02 16:07:52 +09:00
Dean Herbert
6a459efd8f Don't allow Key.Escape 2018-07-02 11:04:40 +09:00
Dean Herbert
b1403d837e Add back support for closing focused overlays using back key 2018-07-01 15:52:47 +09:00
Dean Herbert
7028767e50 Fix regression in HoldFocus behaviour 2018-07-01 14:08:34 +09:00
Dean Herbert
00fd5c8dbc Fix regression causing binding settings to fail 2018-06-30 23:51:27 +09:00
miterosan
621f4218a3
Merge branch 'master' into Private_Messages 2018-06-30 16:17:56 +02:00
Dean Herbert
754e072e01 Don't handle all actions 2018-06-29 23:35:14 +09:00
Dean Herbert
fb90a4924b Only clear text in FocusedTextBox 2018-06-29 23:28:15 +09:00
Dean Herbert
7c0547b4ee Replace todo 2018-06-29 23:16:05 +09:00
Dean Herbert
ad28f88498 Fix protection change 2018-06-29 21:25:51 +09:00
Dean Herbert
cd47bd2cf8 Update framework 2018-06-29 21:06:43 +09:00
Dean Herbert
6a80a21078 Tidy up escape handling 2018-06-29 21:06:38 +09:00
Dan Balasescu
513129d4a8
Merge branch 'master' into fix-dialog-overlay-sounds 2018-06-29 18:45:37 +09:00
smoogipoo
1e696d247e Re-privatise 2018-06-29 18:33:28 +09:00
miterosan
884ac71874
Merge branch 'master' into Private_Messages 2018-06-28 21:04:02 +02:00
Dean Herbert
8ba2ac922f Move to local components namespace 2018-06-28 19:23:56 +09:00
Dean Herbert
0ef5b8f464 Tidy up code, remove unnecessary string.Formats 2018-06-28 19:19:00 +09:00
Dean Herbert
98fec94693 Merge remote-tracking branch 'upstream/master' into HoutarouOreki-unifyDates 2018-06-28 19:14:47 +09:00
Dean Herbert
c44a81bdf5 Add word wrap support 2018-06-28 13:04:39 +09:00
smoogipoo
f8acd9e451 Cleanup 2018-06-27 12:59:19 +09:00
Dean Herbert
bebf47d0d5
Merge branch 'master' into fix-dialog-overlay-sounds 2018-06-27 12:21:29 +09:00
miterosan
6049303c40
Merge branch 'master' into Private_Messages 2018-06-23 20:44:43 +02:00
Dean Herbert
3824354cb8 Lengthen PopIn transition slightly 2018-06-22 14:26:24 +09:00
Dean Herbert
fccd4f965c Merge remote-tracking branch 'upstream/master' into make-loading-more-visible 2018-06-22 14:21:01 +09:00
Dean Herbert
eb6d6dc2de Improve the visibility of the global loading animation
Updates design to match new `osu-web` design.
Adds TestCase for visual testing.
2018-06-22 13:14:43 +09:00
Dean Herbert
73e13e2d63 Rename Stop to StopAnyPlaying for clarity 2018-06-22 12:35:43 +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
74f732038f Add documentation for negative values of ParallaxAmount 2018-06-21 12:49:07 +09:00
Dean Herbert
733b7d1177
Merge branch 'master' into ParallaxContainerImprovement 2018-06-21 12:10:10 +09:00
Dean Herbert
5157a069bc
Merge branch 'master' into Private_Messages 2018-06-21 11:37:19 +09:00
Dean Herbert
3819ecb2be Update framework 2018-06-19 20:19:52 +09:00
Michael Manis
53bd3a1c30 Add some default LengthLimit to OsuTextBox 2018-06-18 19:49:12 -04:00
miterosan
cd0fe6a09e Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseChatLink.cs
2018-06-17 14:15:14 +02:00
HoutarouOreki
38feb7651c Set text at updateTime 2018-06-15 14:34:01 +02:00
HoutarouOreki
d122547c1e DrawableJoinDate handles "Here since the beginning" text 2018-06-15 14:28:49 +02:00
HoutarouOreki
f0fbc04d92 Adjust formats to be EN-UK 2018-06-15 14:11:21 +02:00
Dan Balasescu
aaf3ef240e
Remove easily-confused comment 2018-06-15 17:07:07 +09:00
Dean Herbert
a2950b1d80 Fix incorrect comment 2018-06-15 16:12:18 +09:00
Dan Balasescu
c30861186b
Merge branch 'master' into disallow-beatmap-change 2018-06-06 20:26:17 +09:00
smoogipoo
72cc53aded Rename GameBeatmap -> BindableBeatmap 2018-06-06 20:16:20 +09:00
Dean Herbert
d1fd09ed47 Rename variables 2018-06-06 15:49:27 +09:00
Dean Herbert
86be1bef6b Use UserTriggered in Player 2018-06-06 15:10:15 +09:00
Aergwyn
707af02097 apply feedback
-don't directly set AllowOverlay Bindable
this should be done specifically where needed
-remove AllowOverlay Bindable from ButtonSystem
-remove unnecessary xmldoc
2018-06-03 11:31:04 +02:00
Dean Herbert
49a683e386 Merge remote-tracking branch 'upstream/master' into miterosan-Private_Messages 2018-05-31 14:50:20 +09:00
Aergwyn
2b3a630270 add OverlayActivation enum
+ fix Toolbar being toggleable when it shouldn't be able to
+ allow opening overlays in MenuState.Initial again
2018-05-28 13:43:47 +02:00
smoogipoo
a3470f9ec3 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
#	osu.Game/Overlays/Music/PlaylistOverlay.cs
#	osu.Game/Screens/OsuScreen.cs
2018-05-28 18:01:15 +09:00
Dean Herbert
02c37ebc1f Move screen titles to OsuScreen 2018-05-28 13:30:24 +09:00
Dean Herbert
79442ad238
Merge branch 'master' into CursorOverrideContainer-rename 2018-05-26 12:19:47 +09:00
HoutarouOreki
63fb9ddec4 Forgot file name 2018-05-25 21:20:42 +02:00
HoutarouOreki
e2d840c2de Rename CursorOverrideContainer to MenuCursorContainer 2018-05-25 21:13:40 +02:00
HoutarouOreki
39224931f8 Try satisfying AppVeyor 2018-05-25 14:25:12 +02:00
HoutarouOreki
71c04f4605 Add license header to the new file 2018-05-25 14:10:54 +02:00
HoutarouOreki
29fbdf4d92 Remove horizontal white space 2018-05-25 14:05:50 +02:00
HoutarouOreki
e3ebc849c5 Remove not removed comment 2018-05-25 14:04:12 +02:00
HoutarouOreki
3efb51e464 Create Format(), override TooltipText.. 2018-05-25 14:00:32 +02:00
HoutarouOreki
a446b627da Make TooltipText virtual 2018-05-25 13:31:12 +02:00
HoutarouOreki
05b0564381 Create DrawableJoinDate somehow and remove dateFormat argument 2018-05-25 13:30:29 +02:00
HoutarouOreki
961702aadf Apply the format fix to the tooltip text across the board 2018-05-25 13:05:41 +02:00
Dean Herbert
1cb7d50407 Add and use default size (smaller than before) 2018-05-25 18:51:57 +09:00
HoutarouOreki
29de8e5e2d Document parameters more properly 2018-05-23 12:07:28 +02:00
HoutarouOreki
10bc3917b5 Apply suggested changes 2018-05-23 11:17:13 +02:00
smoogipoo
8004b8af4d Privatise the OsuGame beatmap, add local beatmap to OsuTestCase 2018-05-23 17:38:02 +09:00
HoutarouOreki
6cf227a7af Allow formatting for DrawableDate class 2018-05-23 03:24:18 +02:00
jorolf
8fbda5bc59 add license header 2018-05-22 15:41:10 +02:00
jorolf
b324337fa1 Add icon next to beatmap title/username to open in browser 2018-05-22 15:29:52 +02:00
Jacob
caad47b569
Merge branch 'master' into ParallaxContainerImprovement 2018-05-22 12:10:50 +02:00
Dean Herbert
5f8eb6d823 Fix class name 2018-05-22 16:04:36 +09:00
Jacob
e878e65e83
Merge branch 'master' into ParallaxContainerImprovement 2018-05-21 20:31:44 +02:00
Dean Herbert
ebda287e81 Share code with HoldToConfirm implementations elsewhere 2018-05-22 01:44:06 +09:00
Dean Herbert
9820666bcf
Merge branch 'master' into respect-showoverlay-bindable 2018-05-21 23:26:34 +09:00
Aergwyn
b7e3ea348b expose two Bindables with split logic instead of one with mixed logic 2018-05-21 15:53:55 +02:00
Jacob
30ff1c4b8b
Merge branch 'master' into ParallaxContainerImprovement 2018-05-21 15:19:24 +02:00
Aergwyn
1482bca147 Rename for better understanding
ShowOverlays -> AllowOverlays
ShowOverlaysOnEnter -> HideOverlaysOnEnter
2018-05-21 09:42:29 +02:00
Dean Herbert
92668f07e0
Merge branch 'master' into drawable-room-improvements 2018-05-21 11:09:12 +09:00
Aergwyn
4d528c4e67 fix VisualTests and Samples still playing 2018-05-20 10:57:15 +02:00
Aergwyn
67db539172 prevent Overlays from showing in intro/outro sequences 2018-05-18 08:00:05 +02:00
Jacob
1b64f86011
Merge branch 'master' into ParallaxContainerImprovement 2018-05-17 06:53:16 +02:00
KoziLord
d2b2d3e2e0 Use the absolute value of ParallaxAmount to make sure we're not scaling things down when using a negative value for the Parallax (moving against the cursor instead of with it) 2018-05-16 01:38:46 +02:00
KoziLord
1e88f216f2 Revert the ParallaxContainer changes I made by accident back. 2018-05-16 01:27:18 +02:00
DrabWeb
b9d99b5f40 Fix nullref when exiting the last screen. 2018-05-15 19:42:50 -03:00
KoziLord
be1159444d Use the absolute value of ParallaxAmount to make sure we're not scaling stuff down when using a negative ParallaxAmount 2018-05-15 15:56:49 +02:00
Dean Herbert
c0c449e453
Remove unused using 2018-05-15 22:53:33 +09:00
Dean Herbert
28df77e838 Simplify code and remove generic 2018-05-15 21:10:26 +09:00
Dean Herbert
0325b1bd7a Remove unused class 2018-05-15 19:42:30 +09:00
Dean Herbert
0def847f60
Merge branch 'master' into screen-breadcrumbs 2018-05-15 19:39:03 +09:00
Dean Herbert
fe1c1fec0d Stop overlays from handling DragStart
This was causing weird behaviour with the key configuration section and back button in settings.
2018-05-14 15:44:19 +09:00
DrabWeb
518dec0c68 Merge https://github.com/ppy/osu into drawable-room-improvements 2018-05-11 13:41:50 -03:00
DrabWeb
fa403e4e2a Add test step to test pushing after a previous screen is made current. 2018-05-11 04:49:40 -03:00
DrabWeb
ec53927d8e Add selection to DrawableRoom. 2018-05-10 22:48:07 -03:00
DrabWeb
b9adeeb063 Add ScreenBreadcrumbControl. 2018-05-10 21:35:26 -03:00
DrabWeb
ecb8de29a2 Adjust BreadcrumbControl to better match the designs. 2018-05-10 20:30:03 -03:00
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
FreezyLemon
270d81f816 Made the Link's OnClick() Method return true 2017-12-19 19:37:43 +01:00
smoogipoo
cf640d084e Use using 2017-12-18 16:38:15 +09:00
smoogipoo
846750a190 Remove unnecessary flag 2017-12-18 16:36:11 +09:00
smoogipoo
8fdaf6f8f4 Restructure DialogButton to support selection 2017-12-18 14:47:17 +09:00
Dean Herbert
fd9d900ae0 Simplify StarCounter and SpriteIcon 2017-12-15 18:40:03 +09:00
FreezyLemon
d0b7c92b46 Removed unnecessary usings. 2017-12-11 13:46:23 +01:00
FreezyLemon
bb0a32b555 Removed private OsuHoverContainer "content" from OsuLinkSpriteText for more customization. 2017-12-11 11:28:16 +01:00
FreezyLemon
4d475f1c1b Changed it so ChatLinks handle hover and click sounds themselves 2017-12-11 11:05:32 +01:00
FreezyLemon
13bc50ad56 Removed ICanDisableHoverSounds interface 2017-12-11 10:42:36 +01:00
FreezyLemon
5546b8c316 Trimmed whitespace (CI) 2017-12-07 19:55:29 +01:00
FreezyLemon
68255095a6 Renamed the IHasHoverSounds interface to ICanDisableHoverSounds and made it so that if the interface is not implemented, it is just ignored (samples will always be played). If it is implemented, the ShouldPlayHoverSound bool is decisive of whether sounds are played or not 2017-12-07 19:52:40 +01:00
FreezyLemon
e05618a415 Removed unnecessary "using" directives 2017-12-07 19:36:56 +01:00
FreezyLemon
2ceb073b5d Renamed OnClick to OnLinkClicked to (what should be) obvious reasons 2017-12-07 16:30:15 +01:00
FreezyLemon
2129d6cede Renamed the "on click" method to OnClick() and moved most of the implementation to ChatLink.
Also fixed the tooltip text up
2017-12-07 16:23:43 +01:00
FreezyLemon
ca40db2b97 Fixed a bug where the hover wouldn't work correctly due to OsuLinkSpriteText assigning Action to a private property. 2017-12-07 13:57:29 +01:00
FreezyLemon
a8599a1b75 Implemented new interface which allows parent containers to decide on whether a "OnHover" sound should be played. 2017-12-07 13:12:36 +01:00
FreezyLemon
ec8b5c2465 Permitted nulls in ChatOverlay.load() so that in testing, no "OsuGame" instance is required. Also added null checks to the links' on click actions 2017-12-07 10:31:02 +01:00
FreezyLemon
94eb853d3d Added centralised handling for some chat links 2017-12-06 16:41:57 +01:00
FreezyLemon
b04ddba2a0 Added basic "on click" actions to the in-chat links 2017-12-06 10:27:30 +01:00
FreezyLemon
bb138ccaf7 Added licence header and removed unnecessary whitespace 2017-12-04 13:55:57 +01:00
FreezyLemon
9b866d2248 Made it so the link ID is always added before loading the SpriteTexts (fixed weird bug where some sprites would be white instead of blue). Also improved XML doc on TextColour 2017-12-04 13:46:07 +01:00
FreezyLemon
cf96323980 Added new OsuLinkSpriteText.TextColour property that sets the internal content (OsuHoverContainer)'s colour instead of the whole container, so that text colour is always changed through that (e.g. link colouring, link hover fade).
Implemented it to be used when adding text to an OsuLinkTextFlowContainer.
2017-12-04 13:33:42 +01:00
FreezyLemon
319f43e209 Added "getIdFromUrl" call back to content.action because performance impact is small and no unnecessary id calculations are done 2017-12-04 13:29:56 +01:00
FreezyLemon
bf97f8b1b1 Added osu.ppy.sh/ss (screenshot) URL handling and calculate ID at assignment so it's not on click anymore 2017-12-03 23:55:34 +01:00
FreezyLemon
a839d0e91d LoadComponent before assigning URL to ensure dependency loading 2017-12-03 23:55:00 +01:00
FreezyLemon
3f336b8e61 Made the style a bit better, fixed a bug or two 2017-12-03 21:02:05 +01:00
FreezyLemon
2d270a1cfe Added ability to open other channels from chat links. 2017-12-03 20:45:30 +01:00
FreezyLemon
735dbddd17 Changed URL detection to be more reliable and generally work better 2017-12-03 06:52:57 +01:00
FreezyLemon
6d9dcc6691 Added all files to the .csproj and also introduced basic action filtering when you set the URL on an OsuLinkSpriteText object 2017-12-02 09:48:55 +01:00
FreezyLemon
86302716a6 Also moved LinkText to its own file so the chat could reuse it (ProfileHeader's private class ProfileLink also still inherits from this, though) 2017-12-01 20:32:08 +01:00
FreezyLemon
1f1c7dd70f Moved LinkFlowContainer out of ProfileHeader to make it available for other uses too (e.g. chat) and renamed it to LinkTextFlowContainer bc it can contain both links and text, not only one 2017-12-01 20:26:51 +01:00
smoogipoo
267bb75458 Merge remote-tracking branch 'Aergwyn/master' into netstandard 2017-11-29 23:45:29 +09:00
Dean Herbert
bf5ea027ef Add xmldoc to TriangleButton 2017-11-27 18:26:20 +09:00
Dean Herbert
51372d7cda Remove HandleInput override from TriangleButton 2017-11-27 18:19:06 +09:00
Dean Herbert
760f7d02d9 Remove AlwaysPresent (not actually required) 2017-11-27 18:12:52 +09:00
Dean Herbert
7877f42763 Merge remote-tracking branch 'upstream/master' into new-sounds-and-more 2017-11-27 17:59:24 +09:00
Dean Herbert
671b3d01ff Fix OsuClickableContainer's local content geting overwritten 2017-11-26 17:21:23 +09:00
Dean Herbert
880418fd0d Split out click and hover sound layers 2017-11-26 17:21:22 +09:00
Dean Herbert
0c6a125777 Remove custom colour handling 2017-11-26 17:21:21 +09:00
Dean Herbert
ac7e373f40 Add hover/click sound effects to more stuff everywhere 2017-11-26 17:21:21 +09:00
Dean Herbert
8f57bf2498 Add choices of hover sample sets 2017-11-26 17:17:50 +09:00
Dean Herbert
af499df6dd Make a base OsuButton class to handle default samples 2017-11-26 17:17:48 +09:00
Dean Herbert
07d6a70028 New sound effects with better names 2017-11-26 17:17:46 +09:00
Dean Herbert
7ff39d62a1 Fix SpriteIcon potentially not updating texture during a load race condition
Better fix for #1577.
2017-11-24 12:48:02 +09:00
Dean Herbert
d93911ae97 Improve user ratings calculations to make more sense
Closes #1552.
2017-11-23 18:10:08 +09:00
smoogipoo
de7c571be3 Merge remote-tracking branch 'origin/master' into netstandard 2017-11-22 19:46:17 +09:00
smoogipoo
b3bf6e7bee Merge master into netstandard 2017-11-21 16:39:21 +09:00
Dean Herbert
bd616c1307 Simplify some property access 2017-11-21 12:42:28 +09:00
Dean Herbert
4f6263ef86 Make many internal classes and methods public
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +09:00
smoogipoo
aac41d2de6 Disable resharper inspections on case-by-case basis 2017-11-20 18:55:48 +09:00
Dean Herbert
6df18ffb7a FocusedTextBox should not handle repeated escapes 2017-11-20 18:14:58 +09:00
smoogipoo
dacabd4a90 Merge branch 'master' into lazy-working-beatmap 2017-11-17 21:46:19 +09:00
Dean Herbert
b3aae2340b Avoid accessing beatmaps from BeatSyncedContainer until they are loaded 2017-11-17 18:38:11 +09:00
Dean Herbert
6c40cf08cc Optimise leaderboard display
Adds async loading support and cleans up the code quite a bit in the process.
2017-11-16 23:22:25 +09:00
Dean Herbert
af03d883f1 Ensure overlay containers scroll to top when new information is presented 2017-11-15 19:01:30 +09:00
Dean Herbert
e006090c5b Fix SpriteIcon loading textures on the update thread 2017-11-13 13:13:43 +09:00
smoogipoo
edd0d166b1 Add text transforms to OsuSpriteText 2017-11-04 00:42:36 +09:00
Dean Herbert
ed89f03900 Make ParallaxContainer public 2017-11-01 17:10:59 +09:00
Dean Herbert
520b806305 Merge remote-tracking branch 'upstream/master' into ranks-section 2017-10-13 18:49:05 +09:00
Dean Herbert
d98f1a2bb7 Merge remote-tracking branch 'upstream/master' into editor-waveform-timeline 2017-10-12 21:48:08 +09:00
smoogipoo
a5817e6e75 Add a way to change the IconButton icon colour 2017-10-12 18:17:23 +09:00
Thomas Müller
78f2037d84 Remove now obsolete RatioAdjust 2017-10-12 09:42:06 +02:00
smoogipoo
071b1b049c Fix properties not being set leading to colours not being set 2017-10-10 18:31:56 +09:00
smoogipoo
44141a38b8 Make it possible to change colours before load() 2017-10-10 18:04:41 +09:00
smoogipoo
bbd1a7059e xmldoc + hook up IconColour 2017-10-10 17:25:39 +09:00
smoogipoo
d7fb59ee0e Expose colours of IconButton 2017-10-10 17:20:23 +09:00
smoogipoo
9cb9151811 Move origin + anchor outside of ctor 2017-10-10 16:00:11 +09:00
smoogipoo
ba8bf6cbd5 Add ScreenSelectionTabControl to EditorMenuBar 2017-09-27 22:01:53 +09:00
gabixdev
8438ea1267 Fix formatting ;_; 2017-09-21 22:11:35 +02:00
gabixdev
3c00a7cc51 Reformat again... 2017-09-17 01:44:49 +02:00
gabixdev
a33dfbba25 Code reformat 2017-09-17 01:40:38 +02:00
gabixdev
48008cd7e6 ... 2017-09-17 01:34:56 +02:00
gabixdev
a8ada75633 CODE STYLE XD 2017-09-17 01:28:02 +02:00
gabixdev
846838c621 Move to MenuCursor 2017-09-17 01:14:33 +02:00
gabixdev
bfe1febef2 Fix field access + remove unneeded this 2017-09-17 01:00:44 +02:00
gabixdev
e8462ac134 Add option to disable cursor rotation. 2017-09-17 00:47:55 +02:00
Dean Herbert
9c4876d135 Merge remote-tracking branch 'upstream/master' into ranks-section 2017-09-14 18:52:44 +09:00
MrTheMake
89b5a6670e Changed type of IHasFilterTerms.FilterTerms according to framework update 2017-09-13 16:18:02 +02:00
Dean Herbert
fb7740a3ab Update all dependencies in line with framework 2017-09-13 20:25:40 +09:00
Dean Herbert
28a25c201f Merge remote-tracking branch 'upstream/master' into ranks-section 2017-09-12 19:50:58 +09:00
Dean Herbert
7c7849f189 Fix icon states being updated incorrectly when being set too early 2017-09-11 21:40:58 +09:00
smoogipooo
58c875bdca Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
#	osu-framework
2017-09-11 15:02:12 +09:00
Dean Herbert
f33bd700c5 Fix individual volume controls not being adjustable via wheel
They were blocking each others' input unnecessarily.
2017-09-11 08:27:29 +09:00
smoogipooo
cde22865b9 Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
#	osu-framework
2017-09-11 02:42:23 +09:00
Dean Herbert
ea35b69f2f Merge branch 'master' into fix-mono-crash 2017-09-10 11:49:20 +09:00
smoogipooo
19db7a8f72 Update in line with framework changes. 2017-09-07 22:46:21 +09:00
Dean Herbert
41398f57d6 Changes in line with framework 2017-09-07 20:36:32 +09:00
Dean Herbert
5822a6cc96 Merge branch 'master' into ranks-section 2017-09-07 15:11:07 +09:00
naoey
69ff4bfa46
Fix startup crash on mono. 2017-09-06 20:04:21 +05:30
smoogipooo
06fac913bf Re-implement EditorMenuBar. 2017-09-06 21:14:29 +09:00
smoogipooo
df79d8918d Merge branch 'master' into menu-bar 2017-09-06 18:26:18 +09:00
smoogipooo
2a64bcda85 Fix resizing bug(?). 2017-09-04 09:32:44 +09:00
smoogipooo
57678a13d9 Update in-line with framework changes. 2017-09-04 09:32:35 +09:00
Dean Herbert
d7d0e96e6b Merge branch 'master' into ranks-section 2017-09-01 18:46:53 +09:00
Dan Balasescu
cabf671811 Merge branch 'master' into menu-bar 2017-08-30 12:31:12 +09:00
Dean Herbert
dba3c9a0e2 Merge branch 'master' into menu-mvvm 2017-08-29 18:37:21 +09:00
Dean Herbert
24a2dc3d1e Don't use child 2017-08-29 18:31:51 +09:00
smoogipooo
2535313f4f Use using. 2017-08-29 18:18:36 +09:00
Dean Herbert
39b5b04700 Don't use Bindable for AccentColour
Implements IHasAccentColour for conformity to rest of project. Also fixes a nullref when opening the login menu.
2017-08-29 18:17:01 +09:00
Dean Herbert
85f876a934 Remove unused using statement 2017-08-29 15:23:32 +09:00
smoogipooo
b17d9ac06e Move EditorMenuBar into the Edit namespace, and fix a minor styling issue. 2017-08-28 17:55:50 +09:00
smoogipooo
83fe8514a4 Remove unnecessary exception, replace with default value. 2017-08-28 15:44:05 +09:00
smoogipooo
7bf6d4aa65 Rename DrawableOsuContextMenuItem -> DrawableOsuMenuItem, and move to OsuMenu. 2017-08-28 15:33:24 +09:00
smoogipooo
fc6c682d88 Update in-line with framework changes. 2017-08-28 14:42:52 +09:00
smoogipooo
66db3389f6 Update in line with framework changes. 2017-08-28 12:49:33 +09:00
smoogipooo
b5c1c05af5 Remove poop. 2017-08-28 11:03:51 +09:00
smoogipooo
4385edeb45 Update usages of Menu to reflect ValueChanged events. 2017-08-28 11:01:53 +09:00
Jorolf
9374bf925e only show warning when focused 2017-08-25 16:39:49 +02:00
Jorolf
26323caf6f Merge branch 'master' of git://github.com/ppy/osu into caps-warning 2017-08-25 16:33:29 +02:00
Dean Herbert
ee85515d95 Changes in line with framework changes 2017-08-25 19:18:07 +09:00
smoogipooo
3ffc467704 Fix crappy resizing. 2017-08-25 16:27:01 +09:00
smoogipooo
ce644138b9 Update OsuTabControl in line with framework 2017-08-25 15:58:30 +09:00
smoogipooo
a3a5a89636 Update OsuDropdown in line with framework 2017-08-25 15:58:21 +09:00
smoogipooo
4fb9570618 Create IHasOsuContextMenu and update OsuContextMenuContainer in line with framework. 2017-08-25 15:10:29 +09:00
smoogipooo
7467d24d35 Update OsuContextMenu in line with framework. 2017-08-25 15:10:12 +09:00
smoogipooo
06c392d6f2 Update OsuMenu in line with framework. 2017-08-25 15:09:07 +09:00
Jorolf
f8cc4238ff cleanup code 2017-08-24 22:13:20 +02:00
Dean Herbert
36629f5207 Make ProgressBar usable in more places than just MusicController 2017-08-24 18:51:34 +09:00
Dean Herbert
e9dde822a1 Expose triangles in OsuButton for further customisation 2017-08-23 19:25:40 +09:00
Jorolf
d81956e974 use GameHost to check if caps lock is enabled 2017-08-22 15:43:45 +02:00
Jorolf
c29d3437ba fix merge changes 2017-08-22 13:35:49 +02:00
Jorolf
2ccd6c6128 Merge branch 'master' of git://github.com/ppy/osu into caps-warning
# Conflicts:
#	osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
2017-08-22 13:29:42 +02:00
jorolf
3025fcdb25 Merge branch 'master' into ranks-section 2017-08-22 13:19:03 +02:00
Dan Balasescu
f371ca73f1 Merge branch 'master' into cursor-rotation-delay 2017-08-22 19:54:10 +09:00
Dean Herbert
d8de6e289c Don't start rotating the cursor until it has travelled a minimum disatnce
Some people, myself included, were annoyed by the rotation starting too soon (especially when dragging up and left one pixel).
2017-08-22 17:38:51 +09:00
Dean Herbert
18645fcf29 Update volume control logic to use key bindings
Fixes them not working at all, too.
2017-08-22 14:48:04 +09:00
Dean Herbert
250fb33fbc Merge branch 'master' into ranks-section 2017-08-22 12:46:28 +09:00
smoogipooo
3ea7be1ccf Fix selecting unranked beatmaps in song select crashing the game. Fixes #1134. 2017-08-19 12:28:54 +09:00
PoULkY
cc39aad7f8 Fix OsuButton doesn't implement IFilterable 2017-08-18 01:23:44 +07:00
Dean Herbert
7e21ddb5eb Remove usage of HideOnEscape 2017-08-16 22:56:32 +09:00
Dean Herbert
143ff695ef Remove unused using statements 2017-08-15 17:44:04 +09:00
Dean Herbert
6ded194c53 Remove all usage of DI to retrieve InputManager
Uses GetContainingInputManager instead, as per framework changes.
2017-08-15 14:30:50 +09:00
Dean Herbert
1fe273cbc0 Move GameplayCursor to osu! ruleset and make work with OsuActions 2017-08-10 18:37:41 +09:00
Jorolf
c877a5a8b7 update TestCase 2017-08-09 19:26:27 +02:00
Jorolf
8631c469fc add license header 2017-08-09 18:50:44 +02:00
Jorolf
7d7cfe5d92 Merge branch 'master' of git://github.com/ppy/osu into ranks-section 2017-08-08 23:13:25 +02:00
Jorolf
1c2329f111 generalize the hover code 2017-08-08 23:11:46 +02:00
Dean Herbert
2ce30474ca Merge branch 'master' into spriteicon-invalidation-fix 2017-08-07 14:49:09 +09:00
smoogipooo
d0906d8232 Adjust xmldocs to conform to TransformableExtensions. 2017-08-07 14:20:56 +09:00
smoogipooo
2221797273 Add transform sequence support to IHasAccentColour. 2017-08-07 14:12:05 +09:00
smoogipooo
ce7d391f06 These method calls are impure. 2017-08-07 13:37:07 +09:00
smoogipooo
953cf5af58 Fix SpriteIcon invalidation causing game breakness. 2017-08-07 13:26:54 +09:00
Dean Herbert
8941c8658c Use nested containers for shadow 2017-08-07 09:50:04 +09:00
Dean Herbert
d7fede96ef Fix shadow on SpriteIcon being a bit off 2017-08-07 08:54:53 +09:00
Huo Yaoyuan
8843d97895 Remove depth setting in SectionsContainer and profile. 2017-08-05 18:01:10 +08:00
Huo Yaoyuan
62b3540fd6 Merge branch 'master' into fixes 2017-08-04 13:49:03 +08:00
Dean Herbert
a5a5c1a315 Remove debug code 2017-08-03 15:50:59 +09:00
Dean Herbert
91f3d8deb4 Improve class xmldoc 2017-08-03 15:48:06 +09:00
Dean Herbert
bb032508bd Add comment explaining why we use scale 2017-08-03 15:47:26 +09:00
Dean Herbert
c7f5b83e9e Derive from CompositeDrawable instead
We need to expose EdgeEffect as it's used in places.
2017-08-03 15:45:59 +09:00
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
Dean Herbert
256daeaf68 Rename variable 2017-08-02 11:56:29 +09:00
MrTheMake
4d8e5898fd Updates according to the framework and formatting 2017-08-01 17:28:18 +02:00
Dean Herbert
209d024caa Merge branch 'master' into musiccontroller-canbeatmapchange 2017-08-01 11:54:05 +09:00
Huo Yaoyuan
df3f75b842 Merge branch 'master' into fixes 2017-07-31 17:51:34 +08:00
Dean Herbert
6a36fa7809 Make OsuButtons visually disable when not enabled 2017-07-28 12:58:03 +09:00
Dean Herbert
b64fe68233 Allow OsuColour.FromHex to support prefix #.
Coincides with https://github.com/ppy/osu-web/pull/1373
2017-07-27 18:03:35 +09:00
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Huo Yaoyuan
e0b1057b87 Merge branch 'master' into fixes 2017-07-24 20:50:33 +08:00
Dean Herbert
64f2e2dc32 Use Colour instead of ColourInfo 2017-07-23 13:06:16 +02:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller
598b3f051e Address CI concerns and update framework 2017-07-22 11:15:45 +02:00
Thomas Müller
0f2bcb2904 Update framework 2017-07-21 18:23:01 +02:00
Thomas Müller
a7dc8a892b Update framework 2017-07-21 17:24:09 +02:00
Dean Herbert
451f92772a Merge branch 'master' into fixes 2017-07-20 19:46:50 +09:00
Thomas Müller
c4619f614a Merge branch 'master' of github.com:ppy/osu into better-transforms
# Conflicts:
#	osu-framework
2017-07-19 19:15:51 +02:00
MrTheMake
6ff2b73c30 Merge branch 'master' of https://github.com/ppy/osu into musiccontroller-canbeatmapchange 2017-07-19 16:50:29 +02:00
Dean Herbert
64ebc01a3b Remove many now unnecessary null-checks 2017-07-19 15:45:23 +09:00
Dean Herbert
007b343854 Fix incorrect equality check when TimingPointAt returns a default T 2017-07-19 15:16:40 +09:00
Thomas Müller
4d8261fe0b Merge branch 'master' of https://github.com/ppy/osu into better-transforms
# Conflicts:
#	osu-framework
#	osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
#	osu.Game/Overlays/DragBar.cs
2017-07-18 15:16:02 +03:00
Huo Yaoyuan
ef2770b718 Bypass commit in SearchTextBox regardless of Shift and Ctrl. 2017-07-18 17:40:34 +08:00
Huo Yaoyuan
a0c4fcdb4b Move xml doc to the right class. 2017-07-18 17:03:59 +08:00
Thomas Müller
7acff29bd3 Fix OsuTooltipContainer.PopIn not overriding PopOut transforms 2017-07-18 11:53:56 +03:00
Thomas Müller
87bcd526f3 Get rid of raw AddDelay calls within osu.Game 2017-07-17 16:51:21 +03:00
Thomas Müller
19fb03e737 Try different formatting style 2017-07-16 18:28:20 +03:00
Thomas Müller
032e9df67b ApplyDelay -> AddDelay 2017-07-16 17:47:29 +03:00
Thomas Müller
99221260c4 Replace several usages of BeginDelayedSequence with LINQ-style 2017-07-16 17:42:01 +03:00
Thomas Müller
71105bb9ee Delay -> ApplyDelay; DelayReset -> ResetDelay 2017-07-16 14:06:46 +03:00
Thomas Müller
6063219b72 Update framework 2017-07-16 13:59:26 +03:00
Thomas Müller
a5e610a7ba Update framework and fix compilation
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
Thomas Müller
fd58c6e835 Nicer generic rolling counters 2017-07-14 19:14:07 +03:00
Huo Yaoyuan
26b36c08a3 Prefer ScrollTo in SectionsContainer. 2017-07-14 22:56:27 +08:00
Huo Yaoyuan
6cf36da389 Merge branch 'master' into profile 2017-07-14 22:52:19 +08:00
Thomas Müller
b5fbb26f8f Merge branch 'master' of https://github.com/ppy/osu into better-transforms 2017-07-14 16:46:18 +03:00
Thomas Müller
c73a1ae058 Use TransformTo in rolling counters 2017-07-14 16:46:00 +03:00
MrTheMake
d2c18026f2 Removed unnecessary variables 2017-07-14 12:45:24 +02:00
MrTheMake
00a622da1a Let disabled icon buttons be interactive again 2017-07-14 12:31:12 +02:00
MrTheMake
c053733ea9 Updated to use ppy's implementation 2017-07-14 12:09:55 +02:00
MrTheMake
8e0d59bfed Updated to use ppy's implementation 2017-07-14 12:08:56 +02:00