Dean Herbert
03084aa04b
Revert async changes
2018-08-31 07:07:10 +09:00
Dean Herbert
b1a3dfedd1
Reduce async-await pairs
2018-08-30 14:41:16 +09:00
Dean Herbert
73c764d983
Update SpriteIcon
2018-08-29 03:36:01 +09:00
smoogipoo
e7a5816d27
Use GetAsync for all samples
2018-08-27 17:30:16 +09:00
smoogipoo
1b279d383f
Use GetAsync on all textures
2018-08-27 17:26:44 +09:00
smoogipoo
21d5322899
Update with async changes
2018-08-27 17:05:58 +09:00
Dean Herbert
4376ad107e
Merge branch 'master' into Private_Messages
2018-08-24 17:26:33 +09:00
Dean Herbert
ffcad6e0f1
Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake
...
# Conflicts:
# osu.Game.Rulesets.Osu.Tests/TestCaseHitCircle.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
2018-08-24 15:26:36 +09:00
Dean Herbert
4cd21fabf3
Remove extra newlines
2018-08-21 19:16:07 +09:00
Dean Herbert
22dce64d6d
Merge branch 'master' into circular-button
2018-08-21 19:15:20 +09:00
smoogipoo
9a1e92800b
Adjust with framework-side screenchanges
2018-08-17 14:30:44 +09:00
miterosan
cc640893c2
Merge branch 'master' into Private_Messages
2018-08-04 00:33:46 +02:00
Dean Herbert
4bd811bd2d
Merge branch 'master' into circular-button
2018-08-02 20:25:45 +09:00
smoogipoo
b9814b64ed
Move default button implementation from TriangleButton to OsuButton
2018-08-01 17:02:38 +09:00
Shane Woolcock
47533f83c3
Update TabControl subclasses to use AddInternal
2018-07-31 20:52:11 +09:30
miterosan
b1e9a4fd24
Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
2018-07-29 23:28:34 +02:00
Dean Herbert
da8fc0ee5d
ToLower -> ToLowerInvariant
2018-07-25 07:37:05 +02:00
Dean Herbert
53f556de9a
Trim whitespace
2018-07-24 15:10:55 +02:00
miterosan
d9611dcffb
Instead of Doing nothing at LinkFlowContainer if no link was found, we log it as an error.
2018-07-23 22:06:40 +02:00
miterosan
9f43e0c900
Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
...
# Conflicts:
# osu.Game/Overlays/Chat/ChatTabControl.cs
# osu.Game/Overlays/ChatOverlay.cs
2018-07-23 15:45:54 +02:00
Dean Herbert
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
Dean Herbert
58fe434dd0
Don't use in invalidation logic to avoid incorrect execution
2018-07-16 16:39:52 +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
6698f320fb
Merge branch 'master' into download-button-state
2018-07-13 22:05:26 +09:00
Dean Herbert
67e7e371cc
Also block keyboard completely
2018-07-13 20:40:49 +09:00
Dean Herbert
3308f8f823
Fix focused overlays not blocking select action
2018-07-13 20:37:49 +09:00
Dean Herbert
ee2c7c50ad
Tidy up button hierarchy
2018-07-13 16:28:18 +09:00
Dean Herbert
c67e11b2c7
Restore old tooltip appear delay behaviour
2018-07-12 15:27:17 +09:00
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
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