|
|
49a683e386
|
Merge remote-tracking branch 'upstream/master' into miterosan-Private_Messages
|
2018-05-31 14:50:20 +09:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
02c37ebc1f
|
Move screen titles to OsuScreen
|
2018-05-28 13:30:24 +09:00 |
|
|
|
79442ad238
|
Merge branch 'master' into CursorOverrideContainer-rename
|
2018-05-26 12:19:47 +09:00 |
|
|
|
63fb9ddec4
|
Forgot file name
|
2018-05-25 21:20:42 +02:00 |
|
|
|
e2d840c2de
|
Rename CursorOverrideContainer to MenuCursorContainer
|
2018-05-25 21:13:40 +02:00 |
|
|
|
39224931f8
|
Try satisfying AppVeyor
|
2018-05-25 14:25:12 +02:00 |
|
|
|
71c04f4605
|
Add license header to the new file
|
2018-05-25 14:10:54 +02:00 |
|
|
|
29fbdf4d92
|
Remove horizontal white space
|
2018-05-25 14:05:50 +02:00 |
|
|
|
e3ebc849c5
|
Remove not removed comment
|
2018-05-25 14:04:12 +02:00 |
|
|
|
3efb51e464
|
Create Format(), override TooltipText..
|
2018-05-25 14:00:32 +02:00 |
|
|
|
a446b627da
|
Make TooltipText virtual
|
2018-05-25 13:31:12 +02:00 |
|
|
|
05b0564381
|
Create DrawableJoinDate somehow and remove dateFormat argument
|
2018-05-25 13:30:29 +02:00 |
|
|
|
961702aadf
|
Apply the format fix to the tooltip text across the board
|
2018-05-25 13:05:41 +02:00 |
|
|
|
1cb7d50407
|
Add and use default size (smaller than before)
|
2018-05-25 18:51:57 +09:00 |
|
|
|
29de8e5e2d
|
Document parameters more properly
|
2018-05-23 12:07:28 +02:00 |
|
|
|
10bc3917b5
|
Apply suggested changes
|
2018-05-23 11:17:13 +02:00 |
|
|
|
8004b8af4d
|
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
|
2018-05-23 17:38:02 +09:00 |
|
|
|
6cf227a7af
|
Allow formatting for DrawableDate class
|
2018-05-23 03:24:18 +02:00 |
|
|
|
8fbda5bc59
|
add license header
|
2018-05-22 15:41:10 +02:00 |
|
|
|
b324337fa1
|
Add icon next to beatmap title/username to open in browser
|
2018-05-22 15:29:52 +02:00 |
|
|
|
caad47b569
|
Merge branch 'master' into ParallaxContainerImprovement
|
2018-05-22 12:10:50 +02:00 |
|
|
|
5f8eb6d823
|
Fix class name
|
2018-05-22 16:04:36 +09:00 |
|
|
|
e878e65e83
|
Merge branch 'master' into ParallaxContainerImprovement
|
2018-05-21 20:31:44 +02:00 |
|
|
|
ebda287e81
|
Share code with HoldToConfirm implementations elsewhere
|
2018-05-22 01:44:06 +09:00 |
|
|
|
9820666bcf
|
Merge branch 'master' into respect-showoverlay-bindable
|
2018-05-21 23:26:34 +09:00 |
|
|
|
b7e3ea348b
|
expose two Bindables with split logic instead of one with mixed logic
|
2018-05-21 15:53:55 +02:00 |
|
|
|
30ff1c4b8b
|
Merge branch 'master' into ParallaxContainerImprovement
|
2018-05-21 15:19:24 +02:00 |
|
|
|
1482bca147
|
Rename for better understanding
ShowOverlays -> AllowOverlays
ShowOverlaysOnEnter -> HideOverlaysOnEnter
|
2018-05-21 09:42:29 +02:00 |
|
|
|
92668f07e0
|
Merge branch 'master' into drawable-room-improvements
|
2018-05-21 11:09:12 +09:00 |
|
|
|
4d528c4e67
|
fix VisualTests and Samples still playing
|
2018-05-20 10:57:15 +02:00 |
|
|
|
67db539172
|
prevent Overlays from showing in intro/outro sequences
|
2018-05-18 08:00:05 +02:00 |
|
|
|
1b64f86011
|
Merge branch 'master' into ParallaxContainerImprovement
|
2018-05-17 06:53:16 +02:00 |
|
|
|
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 |
|
|
|
1e88f216f2
|
Revert the ParallaxContainer changes I made by accident back.
|
2018-05-16 01:27:18 +02:00 |
|
|
|
b9d99b5f40
|
Fix nullref when exiting the last screen.
|
2018-05-15 19:42:50 -03:00 |
|
|
|
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 |
|
|
|
c0c449e453
|
Remove unused using
|
2018-05-15 22:53:33 +09:00 |
|
|
|
28df77e838
|
Simplify code and remove generic
|
2018-05-15 21:10:26 +09:00 |
|
|
|
0325b1bd7a
|
Remove unused class
|
2018-05-15 19:42:30 +09:00 |
|
|
|
0def847f60
|
Merge branch 'master' into screen-breadcrumbs
|
2018-05-15 19:39:03 +09:00 |
|
|
|
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 |
|
|
|
518dec0c68
|
Merge https://github.com/ppy/osu into drawable-room-improvements
|
2018-05-11 13:41:50 -03:00 |
|
|
|
fa403e4e2a
|
Add test step to test pushing after a previous screen is made current.
|
2018-05-11 04:49:40 -03:00 |
|
|
|
ec53927d8e
|
Add selection to DrawableRoom.
|
2018-05-10 22:48:07 -03:00 |
|
|
|
b9adeeb063
|
Add ScreenBreadcrumbControl.
|
2018-05-10 21:35:26 -03:00 |
|
|
|
ecb8de29a2
|
Adjust BreadcrumbControl to better match the designs.
|
2018-05-10 20:30:03 -03:00 |
|
|
|
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 |
|
|
|
27437cfbaf
|
Merge branch 'master' into show-beatmap-id
|
2018-04-20 18:05:24 +09:00 |
|
