Dean Herbert
e0ee5e2085
Merge branch 'master' into timeline-audio-scrolling
2018-06-17 19:01:16 +09:00
Dean Herbert
a7ed3ea80b
Rename alwaysVisible to explain where it comes from
2018-06-13 11:38:15 +09:00
Dean Herbert
d9e7a324c0
Revert HudOverlay to private field
2018-06-13 11:30:22 +09:00
smoogipoo
67aa52fb1d
Use bindable binding
2018-06-12 19:34:49 +09:00
smoogipoo
c70c7a476b
Always display the key counter during replay/autoplay
2018-06-12 17:59:59 +09:00
smoogipoo
3b396e38ca
Hide the scrollbar
2018-06-12 15:51:48 +09:00
smoogipoo
aaf2f66594
Make scrolling only zoom the timeline
2018-06-12 15:51:36 +09:00
smoogipoo
6ceac8ab0a
Add a centre marker to the timeline
2018-06-12 14:34:28 +09:00
smoogipoo
30b7b7961f
Merge remote-tracking branch 'origin/master' into timeline-audio-scrolling
...
# Conflicts:
# osu-framework
# osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
# osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs
2018-06-12 14:22:27 +09:00
Dean Herbert
37ea4c273b
Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework
2018-06-11 20:17:41 +09:00
Dean Herbert
8092d70402
Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework
2018-06-11 20:17:33 +09:00
smoogipoo
b9391b3c6b
Fix bindable not working under non-debug due to weak references
2018-06-11 18:18:24 +09:00
Aergwyn
b9b04c1b6e
move back logic into GameplayMenuOverlay
2018-06-09 09:28:02 +02:00
Aergwyn
792d3b8215
allow "go back" keybind in play
2018-06-09 09:14:58 +02:00
Dean Herbert
0b4f5af52e
Add setting to toggle standardised or exponential scoring display
...
Also adjusts exponential scoring to be closer to stable. Log wasn't cutting it.
2018-06-08 03:17:12 +09:00
Dean Herbert
475fb06559
Use new bind method
2018-06-07 16:46:54 +09:00
Dean Herbert
e6158bc348
Merge remote-tracking branch 'upstream/master' into disallow-beatmap-change
2018-06-07 16:35:07 +09:00
Dan Balasescu
ef287eaa7f
Merge branch 'master' into fix-menu-notifications
2018-06-07 15:35:30 +09:00
Dean Herbert
f3c9049660
Merge branch 'master' into disallow-beatmap-change
2018-06-07 15:34:19 +09:00
smoogipoo
d516a0a05c
Store platform offset clock in variable for visibility
2018-06-07 13:42:31 +09:00
smoogipoo
3745f9000b
Merge remote-tracking branch 'origin/master' into remove-decoder-offset
2018-06-07 13:37:19 +09:00
Dean Herbert
f491a18d40
Fix notifications not showing at main osu! logo on menu
2018-06-07 01:49:34 +09:00
smoogipoo
18fc63bac2
Add back removed using
2018-06-06 20:32:37 +09:00
Dan Balasescu
c30861186b
Merge branch 'master' into disallow-beatmap-change
2018-06-06 20:26:17 +09:00
smoogipoo
e77084bec4
Give OsuScreen a mutable BindableBeatmap
2018-06-06 20:19:53 +09:00
smoogipoo
ff60f69f47
Explicitly construct local beatmaps rather than using GetBoundCopy
2018-06-06 20:19:30 +09:00
smoogipoo
72cc53aded
Rename GameBeatmap -> BindableBeatmap
2018-06-06 20:16:20 +09:00
smoogipoo
4086ff7313
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
# osu.Game/Screens/Menu/Intro.cs
# osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
Dean Herbert
9306fec498
Fix missing null checks
2018-06-06 18:21:03 +09:00
Dean Herbert
55921efffb
Rewrite much state logic
2018-06-06 16:17:51 +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
Dean Herbert
6be382aab6
Merge branch 'master' into overlay-activation
2018-06-06 10:07:22 +09:00
Dean Herbert
d2633a706d
Merge branch 'master' into score-component-tooltips
2018-06-06 09:06:22 +09:00
Dean Herbert
00c8d2ff11
Merge branch 'master' into source-link-colour
2018-06-06 08:27:28 +09:00
Dan Balasescu
b2cc7b9a5c
Merge branch 'master' into fix-beatmap-info-wedge-async
2018-06-04 20:29:29 +09:00
Dan Balasescu
566470e852
Merge branch 'master' into better-loading-logo
2018-06-04 20:06:22 +09:00
Dan Balasescu
f9b6de67b8
Merge branch 'master' into hide-flash-gap
2018-06-04 19:29:10 +09:00
Thomas Müller
88b23d4e66
Merge branch 'master' into netcoreapp2.1
2018-06-04 05:30:25 +02:00
Dean Herbert
7701cac297
Merge branch 'master' into overlay-activation
2018-06-04 11:37:14 +09:00
Dean Herbert
4b604bf055
Merge branch 'master' into disallow-beatmap-change
2018-06-04 10:53:04 +09:00
DrabWeb
a7bab14b30
Add tooltip to ScoreComponentLabel.
2018-06-03 22:26:30 -03:00
DrabWeb
db4c26e1ab
Rewrite ScoreComponentLabel.
2018-06-03 22:22:44 -03:00
Joehu
bd7c9cd8bf
Set 'Colour' when creating 'textFlow'
2018-06-03 17:41:34 -07:00
Dean Herbert
7ca437aa8e
Merge branch 'master' into fix-expand-button-colour
2018-06-04 02:16:27 +09:00
Joehu
5c713ac2ab
Use default colour in MetadataSection
2018-06-03 07:51:57 -07:00
Dean Herbert
3795a55808
Fix menu flashes not extending to the edge of screen during parallax
2018-06-03 22:26:47 +09:00
Aergwyn
2afe0feb24
remove white space
...
I think
2018-06-03 12:02:43 +02:00
Aergwyn
f0095193b3
Merge branch 'master' into overlay-activation
2018-06-03 11:52:33 +02: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
Joehu
0f13acf67e
Use updateExpanded method
2018-06-02 12:52:31 -07:00
Joehu
dc2a004c87
Remove link colours for all unlinked text
2018-06-02 12:04:58 -07:00
Dean Herbert
652e2ccaf5
Merge branch 'master' into netcoreapp2.1
2018-06-03 03:55:33 +09:00
Dean Herbert
64eda27547
Update framework
2018-06-03 03:05:53 +09:00
Dean Herbert
eb135b2e85
Merge branch 'master' into participant-count-default
2018-06-03 03:05:17 +09:00
FreezyLemon
a0c643fae5
Fix SongProgressInfo timespan formatting
2018-06-02 11:25:49 +02:00
Joehu
8d3de3affb
Use '?:' expression instead
2018-06-01 15:58:05 -07:00
Joehu
5d1421c0e9
Fix visual settings expand button colour
2018-06-01 15:31:25 -07:00
DrabWeb
da8b1f996f
Override Type in Match.
2018-06-01 17:16:35 -03:00
DrabWeb
5073057420
Cleanup.
2018-06-01 16:34:03 -03:00
DrabWeb
97b473ef30
Expose tabs and hide beatmap select button in Header.
2018-06-01 16:23:11 -03:00
DrabWeb
cc32adf51f
Move max text updating into updateMax.
2018-06-01 14:28:24 -03:00
Dean Herbert
5c2a2e394e
Fix incorrect async logic in BeatmapInfoWedge
...
Closes #2653 .
Alternative to #2657 .
2018-06-01 20:31:29 +09:00
DrabWeb
59762c0393
Change Room.Participants to an IEnumerable.
2018-06-01 06:15:23 -03:00
DrabWeb
8dd36ee1a9
Default Max to null in ParticipantCount.
2018-06-01 06:08:57 -03:00
DrabWeb
9989517ff0
Merge https://github.com/ppy/osu into multiplayer-match
2018-06-01 04:01:14 -03:00
Dean Herbert
b9c601074d
Formatting fixes
2018-06-01 15:45:09 +09:00
Dean Herbert
c5a3eff182
Merge branch 'master' into multiplayer-logic-encapsulation
2018-06-01 15:31:19 +09:00
Joehu
b4d621a2cb
Add link colour to beatmap source
2018-05-31 10:21:22 -07:00
Dean Herbert
b68a5f5eab
Tidy up Loader logic
2018-05-31 20:07:44 +09:00
Dean Herbert
42bc6b6b2e
Merge branch 'master' into updateable-beatmap-set-cover
2018-05-31 17:33:31 +09:00
Dean Herbert
dfbcf4d7b7
Add tests
2018-05-31 17:29:59 +09:00
Dean Herbert
7487c82ec1
Stop the logo from beating
2018-05-31 17:14:47 +09:00
Dean Herbert
c161d82474
Reduce the length of the fadeout animation
2018-05-31 17:14:04 +09:00
Dean Herbert
9df173b339
Merge branch 'master' into better-loading-logo
2018-05-31 15:59:04 +09:00
Dan Balasescu
29f3011f75
Merge branch 'master' into fix-osu-logo-discrepancies
2018-05-31 15:21:44 +09:00
smoogipoo
e48b17fb0d
Unindent
2018-05-31 15:17:59 +09:00
smoogipoo
4ff803d11d
Merge remote-tracking branch 'origin/master' into fix-osu-logo-discrepancies
2018-05-31 14:47:47 +09:00
Dan Balasescu
76567ae98b
Merge branch 'master' into song-selet-enumerable
2018-05-31 14:42:58 +09:00
Dan Balasescu
cd3ca68f03
Merge branch 'master' into song-selet-enumerable
2018-05-31 14:38:04 +09:00
Dan Balasescu
35d8ec8df6
Merge branch 'master' into fix-player-life-management
2018-05-31 14:34:31 +09:00
DrabWeb
ff93a54a64
Default Type to Title, use ToLower for the screen type title.
2018-05-30 23:16:54 -03:00
Dean Herbert
74c52e0a7c
Merge branch 'master' into multiplayer-screen-type
2018-05-31 00:16:43 +09:00
Dean Herbert
9ea6ab28ea
Fix intro potentially starting out-of-sync due to logo's outward animation
2018-05-30 20:22:31 +09:00
Dean Herbert
9497db0b0b
Add a delay before the loading logo is displayed
2018-05-30 20:22:26 +09:00
Dean Herbert
0caf15166e
Remove unnecessary FinishTransforms
2018-05-30 20:05:31 +09:00
Dean Herbert
0dafcf00b7
Fix some discrepancies with the main menu logo transitions
2018-05-30 19:50:00 +09:00
Dean Herbert
6d6b186fb2
Fix delayed logo animations playing even if screen has already been exited
2018-05-30 19:25:39 +09:00
Dean Herbert
a28e71995d
Offload database query to task
...
Allows song select to load a touch faster, in theory.
2018-05-30 16:15:57 +09:00
Dean Herbert
5872b61988
Fix potential double-disposal of player if PlayerLoader is finalised
2018-05-30 15:48:26 +09:00
Dean Herbert
54e53f7190
Fix player getting loaded when exiting song select
2018-05-30 15:48:20 +09:00
Dean Herbert
6000a90721
Merge branch 'master' into overlay-activation
2018-05-30 13:59:20 +09:00
DrabWeb
7b8211e6db
Add MultiplayerScreen.Type
2018-05-29 04:23:29 -03:00
DrabWeb
9a7e5a3e2c
Update TestCaseMatch.
2018-05-29 04:16:19 -03:00
DrabWeb
7edb82eb85
Add TestCaseMatchParticipants.
2018-05-29 03:53:30 -03:00
DrabWeb
b4b4a8a157
Add TestCaseMatchInfo.
2018-05-29 03:24:38 -03:00
DrabWeb
94b54a0520
Adjust design of ReadyButton.
2018-05-29 03:03:51 -03:00
DrabWeb
3915cb7f2f
Add Match Participants, change Room.Users to IEnumerable.
2018-05-29 02:42:52 -03:00
DrabWeb
77ff0640c2
Add a gradient over the cover in Header.
2018-05-29 01:53:45 -03:00
DrabWeb
c8ce34b6d4
Add Match Info.
2018-05-29 01:51:04 -03:00
DrabWeb
98819880c4
Add match screen header.
2018-05-29 01:16:39 -03:00
DrabWeb
ab3ac49a2d
Add empty Match screen.
2018-05-29 01:16:39 -03:00
DrabWeb
d090323c00
Add ParticipantCount to share with the Match screen.
2018-05-29 00:51:56 -03:00
DrabWeb
852d7ef48d
Use ?: expression instead of if/else.
2018-05-29 00:07:33 -03:00
DrabWeb
7beac3a712
Cleanup DrawableRoom.
2018-05-28 23:56:00 -03:00
DrabWeb
dcc39d96e2
BeatmapModeInfo -> BeatmapTypeInfo.
2018-05-28 23:45:59 -03:00
DrabWeb
bd9af745dd
Cleanup.
...
(cherry picked from commit fffa6a004cf074caf0cf5c8ae1408a80500859fa)
2018-05-28 23:41:50 -03:00
DrabWeb
8b8d10349e
Move RoomInspector info panel content to BeatmapModeInfo to share with Match.
...
(cherry picked from commit 257d9d13ac81d85583314f8b5dfabf05661b1572)
2018-05-28 23:41:42 -03:00
DrabWeb
8b36e1dad0
Add BeatmapTitle to encapsulate multiplayer beatmap title display logic.
...
(cherry picked from commit 58e65afb45fbc675186e470cc4a268d9eaa2a539)
2018-05-28 23:41:07 -03:00
DrabWeb
bdfb5752cd
Update existing drawables to use UpdateableBeatmapSetCover.
2018-05-28 19:31:20 -03: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
5be46307fd
Fix results screen parallax being cut off
...
Alternative to / closes #2549 .
Didn't want to reference the toolbar as was done, also wanted to remove the awkward scaling factors so rather than scaling down the inner one, we scale up the outer one.
2018-05-28 19:43:59 +09: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
ed7c860802
Adjust transitions of DrawableRoom
2018-05-28 13:30:29 +09:00
Dean Herbert
02c37ebc1f
Move screen titles to OsuScreen
2018-05-28 13:30:24 +09:00
Dean Herbert
0ca6d73f0e
Add a delay before the osu! logo appears when exiting multiplayer
2018-05-28 13:30:17 +09:00
Dean Herbert
3c3412791c
Merge remote-tracking branch 'upstream/release' into multiplayer-lounge
2018-05-28 13:30:04 +09:00
smoogipoo
3abfd4711d
Fix wrong clock being seeked when unpausing
2018-05-28 03:42:53 +09:00
smoogipoo
8ae2a3696f
Apply platform universal offset at player level
2018-05-28 03:31:46 +09:00
Dean Herbert
95315e46f0
Make drawable rooms fade in when first displayed
...
Stops filtered rooms from briefly displaying.
2018-05-27 14:12:20 +09:00
Dean Herbert
12b5ca1b0d
Merge branch 'master' into multiplayer-lounge
2018-05-27 11:15:03 +09:00
Dean Herbert
975ce82177
Ensure autoplay tests actually increase score above zero
2018-05-26 14:46:05 +09:00
Dean Herbert
699f661b02
Merge remote-tracking branch 'upstream/master' into AlFasGD-editor-seekbar-fix
2018-05-25 19:07:30 +09:00
Dean Herbert
28aa6faef9
Merge branch 'master' into player_loader_input_toggles
2018-05-25 18:38:12 +09:00
Dean Herbert
7961c56239
Merge remote-tracking branch 'FreezyLemon/master' into smoogipoo-disallow-beatmap-change
2018-05-25 10:55:01 +09:00
smoogipoo
b649025e86
beginUserDrag/endUserDrag
2018-05-24 14:36:48 +09:00
smoogipoo
d4f68e0b67
Fix possible NaN values due to trackvirtual infinite length
2018-05-24 14:31:31 +09:00
smoogipoo
f1ac84d95b
Fix base.CreateLocalDependencies sometimes not being called
2018-05-24 13:03:25 +09:00
Aergwyn
0c0f86fe26
fix incorrect default values keeping overlays in wrong state
2018-05-23 16:25:10 +02:00
smoogipoo
a5d2d74447
Remove whitespace
2018-05-23 19:01:27 +09:00
smoogipoo
8004b8af4d
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
2018-05-23 17:38:02 +09:00
smoogipoo
a30f72b477
Add helper methods for seeking/scrolling
2018-05-23 14:32:00 +09:00
smoogipoo
6b0eeb3436
Rework seeking interactions to support smooth scrolling
2018-05-23 14:14:32 +09:00
smoogipoo
49f893d5e4
Couple the timeline to the audio
2018-05-23 12:00:11 +09:00
Aergwyn
76fbc656a1
fix disclaimer allowing notifications
2018-05-22 17:53:36 +02:00
Dean Herbert
ef40ca8805
Merge branch 'master' into respect-showoverlay-bindable
2018-05-22 19:00:42 +09:00
smoogipoo
1dfa3ff995
Merge remote-tracking branch 'origin/master' into editor-timeline-rework
2018-05-22 18:30:29 +09:00
Dan Balasescu
99163ca8ba
Merge branch 'master' into fix-main-menu-escape
2018-05-22 18:17:51 +09:00
smoogipoo
0e122468db
Fix progress easing to 0 if aborting after confirmation
2018-05-22 18:06:40 +09:00
Dean Herbert
d43e4af8ea
Fix overlap between quit button at key input overlay
2018-05-22 16:45:42 +09:00
Dean Herbert
436067c01f
Handle scale back in a nicer way
2018-05-22 16:44:37 +09:00
Dean Herbert
7b770d03c5
Use OnMouseMove instead of Update logic
2018-05-22 16:26:59 +09:00
Dean Herbert
babb7d5158
Fix white ring flash when holding button post-confirmation
2018-05-22 16:23:05 +09:00
Dean Herbert
5f8eb6d823
Fix class name
2018-05-22 16:04:36 +09:00
Dean Herbert
8fbda9d57e
Improve comment
2018-05-22 16:04:07 +09:00
Dean Herbert
58ae545747
innerCircle -> overlayCircle
2018-05-22 15:59:53 +09:00
Dean Herbert
ef55c3c197
Fix icon scale not resetting due to no implicit triggering
2018-05-22 15:58:17 +09:00
Dean Herbert
2ce2bd9788
Add comment for pendingAnimation
2018-05-22 15:58:00 +09:00
DrabWeb
349b0a3322
Remove empty ctor.
2018-05-22 01:46:08 -03:00
DrabWeb
3cc5bb516e
Remove unused Match ctor param.
2018-05-22 01:39:25 -03:00
