RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,572 Commits 3 Branches 650 Tags 352 MiB
Commit Graph

398 Commits

Author SHA1 Message Date
David Zhao ab3fa91a2f
Merge branch 'master' into UserDimLogic 2019-02-22 20:38:10 +09:00
David Zhao 76de39a344 Put user dim logic in yet another container inside UserDimContainer 2019-02-22 20:34:51 +09:00
David Zhao 94bc552282 Fix backgrounds not fading out when replaced by storyboard, add test for this 2019-02-22 11:41:28 +09:00
smoogipoo d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
David Zhao 97db8abd59 Remove unused includes 2019-02-21 18:34:11 +09:00
David Zhao 0677194f46 Move all storyboard show logic into UserDimContainer 2019-02-21 18:14:58 +09:00
David Zhao 3f000dfe2e Remove unnecessary region 2019-02-20 16:58:12 +09:00
David Zhao 1bd1b6b099 Move user dim logic into UserDimContainer instead 2019-02-20 16:53:57 +09:00
EVAST9919 559960036e update top score design 2019-02-05 14:48:35 +03:00
Dean Herbert ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
jorolf 54d8e4043f Merge branch 'master' of git://github.com/ppy/osu into profile-header-update 2019-01-27 23:32:48 +01:00
Dean Herbert 8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert 5ea6e8e247 Allow full osu!direct usage regardless of supporter status for now 2019-01-22 14:22:38 +09:00
Dean Herbert 3abfaea7ac Stop cursor from sticking to edges of scaled game window 2019-01-16 17:21:26 +09:00
Dean Herbert 2c2ed1ae47
Merge branch 'master' into profile-header-update 2019-01-10 18:34:39 +09:00
Dean Herbert 930d6382c7
Merge pull request #4016 from smoogipoo/fix-link-flow 
Fix links not working in partially masked text flow
 2019-01-10 15:19:58 +09:00
smoogipoo 4578d36a67 Add comment 2019-01-10 14:55:36 +09:00
Dean Herbert 4f5c208672 Add UI scale 
Limited to (relatively) sane values until we eventually get around to adjusting UI to allow higher extermities.
 2019-01-09 19:01:33 +09:00
smoogipoo da98915c0c Fix links not working in partially masked text flow 2019-01-08 18:59:01 +09:00
Dean Herbert 199b614eba Fix masking being unapplied incorrectly 2019-01-08 13:36:07 +09:00
Dean Herbert dd960e6a89 Remove unused variable 2019-01-08 12:50:42 +09:00
Dean Herbert 01f6199c49
Merge branch 'master' into profile-header-update 2019-01-04 16:38:42 +09:00
Dean Herbert f2ccf70d1b Backdate license header for now 2019-01-04 15:37:27 +09:00
Dean Herbert 3a10dd47d5 Add preview for gameplay region 2019-01-04 15:28:35 +09:00
Dean Herbert 3953f829c8 Add letterbox/screen scaling support 2019-01-04 13:36:02 +09:00
Dean Herbert 63847890d1 Add better messaging when connecting or failing 2018-12-26 18:07:33 +09:00
jorolf 2fe80d5568 Update ProfileHeader to the new design 2018-12-22 21:50:25 +01:00
jorolf 15ae0cd70a Merge branch 'master' of git://github.com/ppy/osu into profile-header-update 2018-12-22 16:54:39 +01:00
jorolf b4fa2d9049 WIP 2018-12-22 16:51:24 +01:00
Dean Herbert 1a974f64de Initial design for user registration dialog 2018-12-05 12:57:26 +09:00
smoogipoo cadfe41f83 Merge remote-tracking branch 'origin/master' into external_link_warning 2018-11-23 15:19:52 +09:00
smoogipoo f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Roman Kapustin 376e76e00d Resolve merge conflicts 2018-11-18 16:10:36 +03:00
Dean Herbert 4b1282235a Merge remote-tracking branch 'upstream/master' into Private_Messages 2018-11-12 20:41:10 +09:00
Roman Kapustin 7401fabb5d Extract external link opening to the ExternalLinkOpener class 2018-10-23 23:03:00 +03:00
Roman Kapustin 805f8d98c4 Implement warn about opening external links option 2018-10-22 23:57:37 +03:00
Roman Kapustin b4c68f4cf7 Show a warning prior to opening external links 2018-10-22 23:16:57 +03:00
ekrctb 68980fc477 Adjust usage of Handle(Non)PositionalInput to follow framework update 2018-10-02 14:45:33 +09:00
ekrctb 50091252e2 Adapt signature change of event handlers 2018-10-02 12:02:55 +09:00
ekrctb 99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
smoogipoo a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
Dean Herbert be1365fb18 Improve exception text 2018-09-14 11:58:23 +09:00
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 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 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 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
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 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
miterosan d791216505
Merge branch 'master' into Private_Messages 2018-07-03 07:58:15 +02:00
Dean Herbert b1403d837e Add back support for closing focused overlays using back key 2018-07-01 15:52:47 +09:00
miterosan 621f4218a3
Merge branch 'master' into Private_Messages 2018-06-30 16:17:56 +02: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 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
miterosan 6049303c40
Merge branch 'master' into Private_Messages 2018-06-23 20:44:43 +02: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
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 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
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 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
Dean Herbert 32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
miterosan e39f5a1adf Rename var chatmanager -> channelManager 
Apply requested changes
 2018-04-12 23:19:13 +02: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
miterosan 3860594f40 Rename everything into channel and remove everything chat 2018-04-11 20:01:57 +02: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
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 f78538fea8
Merge branch 'master' into user-profile-recent 2018-03-07 19:41:52 +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 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 53129e5235 Fix text getting truncated after last link in chat line 2018-01-30 17:47:22 +09: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 45301d07fd
Merge branch 'master' into url-parsing-support 2018-01-12 19:34:44 +09:00
FreezyLemon 2c67ff75ed added custom hoverclicksounds so links make sounds on hover&click 2018-01-11 18:52:50 +01:00
smoogipoo c5c33e20bf OverlayContainer changes in-line with framework 2018-01-11 19:03:01 +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
Dean Herbert 37d393bca0 Update licence headers 2018-01-05 20:21:19 +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 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
FreezyLemon 962e4d7c8a Removed LinkId and word wrapping (for now). 
Also reimplemented the OsuHoverContainer properly
 2017-12-25 20:46:04 +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