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

235 Commits

Author SHA1 Message Date
Dean Herbert
03084aa04b Revert async changes 2018-08-31 07:07:10 +09:00
smoogipoo
e7a5816d27 Use GetAsync for all samples 2018-08-27 17:30:16 +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
0f37758314 Update framework 2018-07-21 16:21:53 +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
fbc5250bf1 Update framework 2018-07-11 17:12:01 +09:00
Dean Herbert
7bfd82a417
Merge branch 'master' into hit-shake 2018-07-06 18:42:18 +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
Dean Herbert
b1403d837e Add back support for closing focused overlays using back key 2018-07-01 15:52:47 +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
Dean Herbert
c44a81bdf5 Add word wrap support 2018-06-28 13:04:39 +09:00
Dean Herbert
bebf47d0d5
Merge branch 'master' into fix-dialog-overlay-sounds 2018-06-27 12:21:29 +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
3819ecb2be Update framework 2018-06-19 20:19:52 +09: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
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
8004b8af4d Privatise the OsuGame beatmap, add local beatmap to OsuTestCase 2018-05-23 17:38:02 +09: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
Aergwyn
b7e3ea348b expose two Bindables with split logic instead of one with mixed logic 2018-05-21 15:53:55 +02:00
Aergwyn
1482bca147 Rename for better understanding
ShowOverlays -> AllowOverlays
ShowOverlaysOnEnter -> HideOverlaysOnEnter
2018-05-21 09:42:29 +02: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
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
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
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
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
Dean Herbert
f62677222c Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id 2018-04-18 13:08:53 +09:00