smoogipoo
b88c4464cb
Make virtual beatmap tracks approximate beatmap length
2018-06-27 16:02:49 +09:00
Dean Herbert
527d7c29f2
Merge branch 'master' into fix-background-screen-crash
2018-06-27 16:00:59 +09:00
smoogipoo
f8acd9e451
Cleanup
2018-06-27 12:59:19 +09:00
Dean Herbert
0866dd11bd
DefaultBackAction -> BackAction, defaults to last button
...
The last button is more commonly the escape condition.
2018-06-27 12:57:26 +09:00
smoogipoo
ede59f63f6
Merge remote-tracking branch 'origin/master' into make-loading-more-visible
2018-06-27 12:52:06 +09:00
Dean Herbert
d7ce4ab6fd
Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player
2018-06-27 12:36:10 +09:00
Dean Herbert
bebf47d0d5
Merge branch 'master' into fix-dialog-overlay-sounds
2018-06-27 12:21:29 +09:00
smoogipoo
80501de4b9
Add legacy slider offsets
2018-06-27 12:09:21 +09:00
Dean Herbert
ac1bf3b092
Merge branch 'master' into editor-seek-snapping-fix
2018-06-27 11:08:19 +09:00
Dean Herbert
1b050ca68e
Merge branch 'master' into fix-unauthorized-request
2018-06-26 22:25:19 +09:00
Dan Balasescu
830ce0da4c
Merge branch 'master' into update-framework
2018-06-26 20:41:08 +09:00
smoogipoo
8a81fba1ea
Other input states need to be considered for wheel bindings
2018-06-26 20:34:22 +09:00
smoogipoo
f1dfe04bd9
Fix broken conditional
2018-06-26 20:13:44 +09:00
smoogipoo
02b733a42e
Merge remote-tracking branch 'origin/master' into fix-unauthorized-request
2018-06-26 19:58:51 +09:00
Dean Herbert
f7f17bab78
Merge branch 'master' into catch-droplet-fix
2018-06-26 19:29:15 +09:00
Dean Herbert
018dcc98b4
Fix failing tests
2018-06-26 19:17:34 +09:00
Dean Herbert
4bcc05a7fc
Remove null checks on ruleset
...
Add a default ruleset to `OsuTestCase` to cover testing scenarios.
2018-06-26 18:24:34 +09:00
Dean Herbert
4dd12cedad
Fix review issues
2018-06-26 17:01:40 +09:00
Dean Herbert
13480feb4f
Remove error logging
...
Already logged to network.log with ample detail.
2018-06-26 16:38:19 +09:00
Dean Herbert
388ca5d572
Move leaderboard update scheduling to a more central method
2018-06-26 16:33:22 +09:00
Dean Herbert
b0a1b25983
Privatise game ruleset and access via DI
...
Also decouples the bindable at SongSelect, where it is debounced in line with the carousel being updated.
2018-06-26 16:32:32 +09:00
Dean Herbert
563cb46b4a
Update framework and other nuget dependencies
2018-06-26 12:10:56 +09:00
smoogipoo
cd74ec705e
Fix possible mis-ordering of scroll position updates
...
1. Checking whether the scroll position has changed must be done _after_ Current is updated in base.UpdateAfterChildren. This was causing the timeline to sometimes not provide smooth scrolling while the track is not running.
2. We can't just move all code to UpdateAfterChildren to fulfill (1) - we need the code to follow the track time to still run prior to base.UpdateAfterChildren, so that it modifies Current prior to base.UpdateAfterChildren changing to position.
2018-06-25 20:31:06 +09:00
Dean Herbert
594cc0d21d
Merge branch 'master' into mania-playfield-inversions
2018-06-25 18:36:23 +09:00
Dean Herbert
e75ff1145c
Merge branch 'master' into editor-seek-snapping-fix
2018-06-25 18:27:03 +09:00
smoogipoo
97057ced85
Merge remote-tracking branch 'origin/master' into full-mania-fix
2018-06-25 12:43:49 +09:00
miterosan
6049303c40
Merge branch 'master' into Private_Messages
2018-06-23 20:44:43 +02:00
ekrctb
d6084c0b30
Adapt to new input handling changes
2018-06-22 18:10:27 +09:00
Dean Herbert
78ccbcabf3
Fix API getting stuck in an endless loop under a certain unauthorized scenario
2018-06-22 17:34:29 +09:00
Dean Herbert
51600dd0ae
Improve PlayButton's loading
2018-06-22 14:27:36 +09: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
99cc406b97
Merge branch 'master' into improve-volume-controls
2018-06-22 13:39:48 +09:00
smoogipoo
8d3c2d54f3
Merge remote-tracking branch 'origin/master' into improve-volume-controls
2018-06-22 13:33:07 +09:00
smoogipoo
67a067ffa5
Fix overlay not disappearing when losing hover from the last pixel
...
OnMouseMove isn't invoked when hover is lost.
2018-06-22 13:32:32 +09:00
smoogipoo
72aee8344e
Always call schedulePopOut
2018-06-22 13:32:00 +09:00
smoogipoo
206f913a4c
Make mute button not handle hover
2018-06-22 13:31:32 +09:00
Dean Herbert
5d3b51b8d4
Merge branch 'master' into api-offline-early-return
2018-06-22 13:16:30 +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
Dean Herbert
4b2b1f51f9
Apply some code review
2018-06-22 12:33:30 +09:00
Dean Herbert
de10480e95
Merge branch 'master' into multiple_previews_different_overlays
2018-06-22 10:44:36 +09:00
Dan Balasescu
465342c636
Merge branch 'master' into notification-usability
2018-06-21 19:48:16 +09:00
smoogipoo
1932399521
Add testcases
2018-06-21 19:31:07 +09:00
smoogipoo
63a6fc2596
XMLDoc all the things
2018-06-21 18:54:50 +09:00
smoogipoo
40ed3fdd05
Fix possible incorrect order of events due to threaded load
2018-06-21 18:45:32 +09:00
smoogipoo
b2066c5d73
Rework preview tracks to reduce usage complexities
2018-06-21 18:40:27 +09:00
Dean Herbert
5c63b3ddac
Merge pull request #2828 from smoogipoo/improve-editor-scrolling
...
Always perform non-seeked scroll in the editor while audio is playing
2018-06-21 17:24:15 +09:00
Dean Herbert
a2fa55c426
Fix dialog overlay playing double samples on show/hide
2018-06-21 16:47:05 +09:00
Dean Herbert
6ec0aaee91
Split out logic for subsequent log message and apply action to only itself
2018-06-21 14:50:42 +09:00
Dean Herbert
87d94591e4
Start displaying notifications earlier
...
Also show important notifications and more in total.
2018-06-21 14:43:38 +09:00
Dean Herbert
ed17a241f5
Decrease notification font size
2018-06-21 14:43:02 +09:00
Dean Herbert
6aa0ca5cc9
Add (one-way) migration for existing users
2018-06-21 14:22:25 +09:00
smoogipoo
ab2889da1f
Merge remote-tracking branch 'origin/master' into multiple_previews_different_overlays
2018-06-21 13:24:02 +09:00
Dean Herbert
74f732038f
Add documentation for negative values of ParallaxAmount
2018-06-21 12:49:07 +09:00
Dean Herbert
5f2d1d4a1e
Dim TestCase background a bit
2018-06-21 12:48:44 +09:00
Dean Herbert
733b7d1177
Merge branch 'master' into ParallaxContainerImprovement
2018-06-21 12:10:10 +09:00
Dean Herbert
65487d1610
Merge branch 'master' into improve-volume-controls
2018-06-21 11:56:56 +09:00
Dean Herbert
5157a069bc
Merge branch 'master' into Private_Messages
2018-06-21 11:37:19 +09:00
Dean Herbert
2a42418dbf
Tidy up ReadyButton
2018-06-21 10:21:54 +09:00
Dean Herbert
4c068097c8
Change required child to use same structure as other use cases
2018-06-21 10:12:12 +09:00
Dean Herbert
96100a2200
Remove schedule logic (seems unnecessary)
2018-06-20 17:41:48 +09:00
Dean Herbert
39649747aa
Simplify and synchronise multiplayer screen transitions
2018-06-20 17:25:22 +09:00
Dean Herbert
f0c72438a3
Group ValueChanged attachment with bindings
2018-06-20 17:06:02 +09:00
Dean Herbert
3f020a2802
Merge branch 'master' into multiplayer-match
2018-06-20 14:49:32 +09:00
Dean Herbert
b95042e370
Fix background screens not supporting early-exit condition
...
Closes #2681 .
2018-06-20 12:43:48 +09:00
Dean Herbert
3eb0a17978
Merge remote-tracking branch 'upstream/master' into ThePyrotechnic-ShowMorePadding
2018-06-20 10:45:43 +09:00
Dean Herbert
d7f65d62e0
Use vertical/horizontal pair instead
2018-06-20 10:45:35 +09:00
Dan Balasescu
77e03a59a9
Merge branch 'master' into ruleset-container
2018-06-19 21:47:10 +09:00
Tom Arrow
ad883e087a
RulesetContainer<TObject> cannot be derived
2018-06-19 14:31:24 +02:00
Dean Herbert
3819ecb2be
Update framework
2018-06-19 20:19:52 +09:00
Dean Herbert
b8f9caf418
Merge branch 'master' into multiplayer-match
2018-06-19 17:18:33 +09:00
Michael Manis
a0f1143287
Add padding to 'show more' button
2018-06-18 19:14:44 -04:00
smoogipoo
8c671f93fc
Always perform non-seeked scroll in the editor while audio is playing
2018-06-18 19:32:04 +09:00
smoogipoo
54e60d8bc2
Fix test appveyor tests failing due to lack of audio manager
2018-06-18 19:27:22 +09:00
smoogipoo
6d318d35ee
Fix not being able to seek by other means during flick-scroll
2018-06-18 18:56:54 +09:00
smoogipoo
dbc50e35d5
Fix the timeline and editor fighting over track seeking
2018-06-18 18:02:26 +09:00
Dean Herbert
c74c059044
Merge branch 'master' into multiple_previews_different_overlays
2018-06-18 05:05:27 +09:00
Dean Herbert
1d9d240454
Merge branch 'master' into mania-playfield-inversions
2018-06-18 04:41:17 +09:00
Dean Herbert
b1d059a67d
Add some colours to the compose-mode timeline
2018-06-18 04:31:47 +09:00
Dean Herbert
bec6e3083e
Remove scrollbar depth change as scrollbar is hidden now
2018-06-18 03:19:21 +09:00
Dean Herbert
d58ef96a23
Merge branch 'master' into timeline-markers
2018-06-18 03:14:04 +09:00
Dean Herbert
31f9d0161d
Add a comment about precision scroll behaviour
2018-06-18 03:03:09 +09:00
Dean Herbert
ae160baa6e
Merge branch 'master' into timeline-input-adjustment
2018-06-18 02:54:25 +09:00
Dean Herbert
48613ea1f6
Merge branch 'master' into timeline-markers
2018-06-18 02:09:20 +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
Dean Herbert
a20ec0d4cc
Merge branch 'master' into timeline-audio-scrolling
2018-06-17 19:01:21 +09:00
Dean Herbert
e0ee5e2085
Merge branch 'master' into timeline-audio-scrolling
2018-06-17 19:01:16 +09:00
HoutarouOreki
faff7feef1
Remove unnecessary white space change
2018-06-15 15:03:09 +02:00
HoutarouOreki
6938adc148
Unify join time text's visual format with the web
2018-06-15 15:00:41 +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
smoogipoo
47ae962099
Output only one mapping failure per mapping
2018-06-15 18:36:22 +09:00
Dean Herbert
57011ff13b
Merge branch 'master' into mania-playfield-inversions
2018-06-15 18:33:40 +09:00
Dean Herbert
a6437c005c
Merge branch 'master' into diffcalc-rework
2018-06-15 18:02:18 +09:00
smoogipoo
e945186978
Expose the beatmap converter
2018-06-15 17:59:52 +09:00
Dean Herbert
5d105cd08d
Avoid errors being logged when importing beatmaps while logged out
2018-06-15 17:23:03 +09:00
Dan Balasescu
234ed04cdd
Merge branch 'master' into remove-migrate-exception
2018-06-15 17:22:34 +09:00
Dean Herbert
db9141a6cf
Merge branch 'master' into fix-music-controller-drag
2018-06-15 17:08:01 +09:00
Dan Balasescu
aaf3ef240e
Remove easily-confused comment
2018-06-15 17:07:07 +09:00
Dean Herbert
8b5a9c3236
Merge branch 'master' into fix-volume-pixellation
2018-06-15 16:45:15 +09:00
Dean Herbert
a2950b1d80
Fix incorrect comment
2018-06-15 16:12:18 +09:00
Dean Herbert
1c27ef644a
Fix music controller drag activating from anywhere on the screen
2018-06-15 16:12:11 +09:00
Dean Herbert
2ff7b4cdcf
Merge branch 'master' into catch-droplet-fix
2018-06-15 14:34:01 +09:00
Dean Herbert
036c57833b
Merge branch 'master' into conversion-test-improvements
2018-06-15 14:26:37 +09:00
Joehu
069d939e29
Remove "from" prefix from sources on direct panels
2018-06-14 21:53:01 -07:00
Dan Balasescu
98cafa106f
Merge branch 'master' into fix-volume-pixellation
2018-06-15 13:44:18 +09:00
Dean Herbert
4a19f22b3d
Remove custom migration exception
...
This was hiding the true error message from ever hitting logs.
Made to help disagnose #2711 .
2018-06-15 13:38:42 +09:00
smoogipoo
b63e9f29d4
Merge branch 'conversion-test-improvements' into catch-droplet-fix
2018-06-14 21:38:16 +09:00
Dean Herbert
d259b31893
Fix empty line
2018-06-14 21:38:08 +09:00
Dean Herbert
cb73f215ac
Add check for player screens too
2018-06-14 21:38:08 +09:00
Dean Herbert
caeddc861a
Add test for WorkingBeatmap leakage
2018-06-14 21:38:08 +09:00
smoogipoo
a4d2364083
Add one more newline
2018-06-14 21:29:08 +09:00
smoogipoo
b99b520656
Allow convertmapping to be extended
2018-06-14 21:25:33 +09:00
smoogipoo
024d2abfe0
Always generate mappings/convert values as soon as objects are converted
...
# Conflicts:
# osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
2018-06-14 21:25:23 +09:00
smoogipoo
8d0e7abdd6
Some rulesets don't have a beatmap processor
2018-06-14 21:23:11 +09:00
smoogipoo
5e66b02108
Process beatmap before generating mappings
2018-06-14 21:22:56 +09:00
smoogipoo
8f7334874c
Fix up performance calculators
2018-06-14 16:04:48 +09:00
smoogipoo
540b43313e
Remove PP test cases (osu-tools/osu-server should be used instead)
2018-06-14 15:57:06 +09:00
smoogipoo
b7a06b9594
Restructure of DifficultyCalculator to cleanup mod + attribute handling
2018-06-14 15:32:07 +09:00
smoogipoo
1431ee1867
Remove unused method
2018-06-14 14:46:25 +09:00
Dean Herbert
b318b770d4
Fix pixellation of volume meter progress bars
2018-06-13 19:22:39 +09:00
Dean Herbert
cee5be1d56
Improve precision wheel adjustment handling
2018-06-13 17:03:56 +09:00
Dean Herbert
e0b68e4e09
Fix hide re-schedule not triggering on noop state change
2018-06-13 16:47:10 +09:00
Dean Herbert
a55bf82fd9
Handle hover blocking in VolumeOverlay to ensure correct hide scheduling
2018-06-13 16:46:56 +09:00
Dean Herbert
2a18625b2c
Correctly block scroll events when hovering controls
2018-06-13 16:46:27 +09:00
Dean Herbert
2cc7953421
Merge remote-tracking branch 'upstream/master' into peppy-improve-volume-controls
2018-06-13 16:14:20 +09:00
Dean Herbert
0fdb04f57d
Fix empty line
2018-06-13 15:43:18 +09:00
Dean Herbert
3ac90511c9
Merge branch 'master' into fix-memory-leak
2018-06-13 15:27:39 +09:00
Dean Herbert
39738a997e
Add check for player screens too
2018-06-13 15:26:23 +09:00
Dan Balasescu
cbb883614a
Merge branch 'master' into catch-droplet-fix
2018-06-13 15:18:52 +09:00
Dean Herbert
14f5c814a6
Add test for WorkingBeatmap leakage
2018-06-13 15:12:10 +09:00
Dan Balasescu
0e0e64895a
Merge branch 'master' into mania-step-interval
2018-06-13 13:55:27 +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
ca3186f34c
Create dependencies before children are loaded
2018-06-12 19:51:35 +09:00
smoogipoo
67aa52fb1d
Use bindable binding
2018-06-12 19:34:49 +09:00
Dan Balasescu
126678c226
Merge branch 'master' into multiple_previews_different_overlays
2018-06-12 19:26:51 +09:00
Dean Herbert
bcfb092e53
Change step to 200
2018-06-12 18:03:45 +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
Dan Balasescu
f71b0456e8
Merge branch 'master' into timeline-audio-scrolling
2018-06-12 14:23:05 +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
Dan Balasescu
80ec0b1839
Merge branch 'master' into populate-missing-online-ids
2018-06-12 14:03:23 +09:00
Dean Herbert
ae136e89a4
Merge branch 'master' into ruleset-configs
2018-06-12 13:13:18 +09:00
Dan Balasescu
0a35a81c2d
Merge branch 'master' into populate-missing-online-ids
2018-06-12 13:11:21 +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
Dan Balasescu
41452a0754
Merge branch 'master' into multiple_previews_different_overlays
2018-06-11 18:56:50 +09:00
Dan Balasescu
7de8e1cfc4
Merge branch 'master' into refactor-api
2018-06-11 18:49:15 +09:00
Dan Balasescu
3981f56157
Merge branch 'master' into exponential-scoring-toggle
2018-06-11 18:34:55 +09:00
Dan Balasescu
78daf1c7ad
Merge branch 'master' into exponential-scoring-toggle
2018-06-11 18:19:33 +09:00
smoogipoo
b9391b3c6b
Fix bindable not working under non-debug due to weak references
2018-06-11 18:18:24 +09:00
Dan Balasescu
9994c69d58
Merge branch 'master' into fix-object-ordering
2018-06-11 17:53:33 +09:00
smoogipoo
b51e714ae5
Fix xmldoc
2018-06-11 15:44:59 +09:00
smoogipoo
563a2667d3
Merge branch 'ruleset-configs' into mania-playfield-inversions
2018-06-11 15:08:48 +09:00
smoogipoo
14b7530994
Use a global ruleset config cache
2018-06-11 15:07:42 +09:00
smoogipoo
be01dbae3a
Move ruleset dependency caching to CreateLocalDependencies
...
In some cases we may want to refer to the cached configmanager dependency from subclasses. This prevents injection errors when doing so.
2018-06-11 15:07:29 +09:00
smoogipoo
f49b7d6e16
Add mania direction to settings
2018-06-11 14:36:19 +09:00
smoogipoo
93696fb5e5
Merge branch 'ruleset-configs' into mania-playfield-inversions
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-06-11 13:46:39 +09:00
smoogipoo
4fb6a8627e
Merge remote-tracking branch 'origin/master' into mania-playfield-inversions
2018-06-11 13:45:47 +09:00
smoogipoo
f4fbf27d42
Give ruleset settings a ruleset-specific config manager
2018-06-11 13:28:50 +09:00
smoogipoo
eca016ec6c
Move ruleset config managers to Ruleset
2018-06-11 13:17:08 +09:00
smoogipoo
22e8a0bb6e
Make ruleset config manager variants nullable
2018-06-11 13:13:36 +09:00
smoogipoo
63ec36b3be
Explicitly handle null settings case + add annotations
2018-06-11 12:57:56 +09:00
smoogipoo
b219c17115
Move dependency creation under ctor
2018-06-11 12:57:26 +09:00
Crusensis
fbc0cd6f5f
Split AffectsCombo into IsBonus
2018-06-09 18:14:33 -07:00
Dean Herbert
86fb9666b2
Rename "Exponential" to "Classic"
2018-06-10 01:45:05 +09:00
Dean Herbert
cc37a355d2
Add comment about matching stable scoring
...
Also updated equation to be close to what is expected
2018-06-10 01:44:46 +09:00
Dean Herbert
aaa65c428f
Merge branch 'master' into diffcalc-modtypes
2018-06-09 23:35:17 +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
Roman Kapustin
8702a70524
Resolve merge conflicts in DirectOverlay
2018-06-08 21:03:16 +03:00
Dean Herbert
d3570df64f
Merge pull request #2764 from peppy/update-dependencies
...
Update framework and other packages
2018-06-08 22:07:25 +09:00
Dean Herbert
a5ddae3f37
Merge pull request #2763 from peppy/revert-update-subtree
...
Revert InputManager UpdateSubTree change
2018-06-08 22:06:55 +09:00
Dean Herbert
fd4f61fc88
Update framework and other packages
2018-06-08 21:51:43 +09:00
Dean Herbert
a880e626d8
Use for loop and SetLayoutPosition
2018-06-08 21:20:15 +09:00
Dean Herbert
1e7bffe5e3
Merge branch 'master' into badge-ordering
2018-06-08 21:13:35 +09:00
Dean Herbert
9bdb3113ce
Revert "Always update children when ruleset input manager is updated"
...
This reverts commit 4eb7a34944
2018-06-08 21:05:28 +09:00
Dean Herbert
803598c3d0
Merge remote-tracking branch 'upstream/master' into DrabWeb-beatmap-set-downloader
2018-06-08 20:54:14 +09:00
Dean Herbert
ecc0f5e575
Use Any() instead of Count()
2018-06-08 20:54:09 +09:00
Dean Herbert
064e8190be
Add basic documentation
2018-06-08 20:53:58 +09:00
Dean Herbert
59e5a8556f
Fix volume control adjustment being extreme when precision scrolling
2018-06-08 18:15:03 +09:00
Dean Herbert
66d28aa9fc
Merge branch 'master' into beatmap-set-downloader
2018-06-08 16:28:25 +09:00
Dean Herbert
e1bc0fa552
Fix csproj file ending line
2018-06-08 15:59:59 +09:00
Dean Herbert
a775d00bd8
Add online fetch support for online IDs
2018-06-08 15:59:45 +09:00
Dean Herbert
955a78e76d
Remove OnlineBeatmapSetID from BeatmapInfo
...
It should now be retrieved via the linked BeatmapSetInfo
2018-06-08 15:26:27 +09:00
smoogipoo
2a48e0e44a
Fix sequential speed change visualiser not working with 0 control points
2018-06-08 15:11:43 +09:00
Dean Herbert
e8455dc1e4
Fix incorrect hash usage
2018-06-08 14:38:04 +09:00
Dean Herbert
21c8ef576c
Expose result for synchronous consumption
2018-06-08 14:37:48 +09:00
Dean Herbert
b265f02d56
Add comment about scheduled invocation
2018-06-08 14:37:27 +09:00
Dean Herbert
8220e0c79a
Remove OnlineBeatmapSetID from BeatmapMetadata
2018-06-08 12:46:34 +09:00
Dean Herbert
d1e9dba4aa
Move beatmap lookup ability to new request
2018-06-08 12:21:12 +09:00
Dean Herbert
b45354ce97
Add missing header
2018-06-08 12:06:58 +09:00
Dean Herbert
1716975a37
Move out APIBeatmap
2018-06-08 12:04:33 +09:00
Dean Herbert
8cc31aca54
Reorganise API requests and response classes
...
They were previously breaking the two-class-per-file rule.
2018-06-08 11:42:35 +09:00
DrabWeb
0fae49ee21
Don't add a 'with Video' subtitle.
2018-06-07 20:47:27 -03: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
rootyElf
b3cab35a2c
Update EntityFramework libraries
...
Updated Microsoft.EntityFrameworkCore.Sqlite and Microsoft.EntityFrameworkCore.Sqlite.Core to 2.1.0 to enable the app to run on arm linux platforms. This also updates SQLitePCLRaw.lib.e_sqlite3.linux from 1.1.7 to 1.1.11. While 1.1.7 only provides native libraries for linux-x64 and linux-x86, 1.1.11 adds alpine-x64, linux-arm, linux-arm64, linux-armel and linux-musl-x64.
2018-06-07 15:46:31 +01:00
Roman Kapustin
1fdbd20471
Nullref quickfix in PlayButton
2018-06-07 14:50:21 +03:00
Roman Kapustin
ab6699b1fb
Stop DirectOverlay preview on search update
2018-06-07 14:40:41 +03:00
Roman Kapustin
3033294df1
Stop Preview on BeatmapSet change
2018-06-07 14:30:11 +03:00
Dean Herbert
2c25e5e8da
Merge branch 'master' into mania-step-interval
2018-06-07 20:26:33 +09:00
smoogipoo
55a5dfa9b6
Add column testcase
2018-06-07 20:24:33 +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
Dean Herbert
5e9a1961cb
Greatly increase the playfield scroll speed adjust step
...
It was so small previously that I believe many people didn't even realise it was working.
2018-06-07 14:35:33 +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
Dean Herbert
17ba129e61
Make volume controls stay open when hovered
...
Closes #2743 .
2018-06-07 01:14:43 +09:00
Dean Herbert
dd75cd973b
Show UI mouse cursor when hovering volume meters during gameplay
...
Also adds a hover animation.
2018-06-07 01:13:35 +09:00
Dean Herbert
621be3bbfc
Merge branch 'master' into disallow-beatmap-change
2018-06-07 00:38:40 +09:00
Dan Balasescu
b59c45ca57
Merge branch 'master' into fix-database-migration-failure
2018-06-06 22:44:35 +09:00
Dean Herbert
ee6f107f08
Merge remote-tracking branch 'upstream/master' into peppy-fix-import-path-failures
2018-06-06 22:12:10 +09:00
Dean Herbert
a60c888ae5
Add comment about reasoning for local context variable
2018-06-06 22:05:25 +09:00
Dean Herbert
00b4a2519f
Update framework
2018-06-06 21:22:22 +09:00
Dean Herbert
ea1336d243
Merge remote-tracking branch 'upstream/master' into nuget-consumption
2018-06-06 21:09:51 +09:00
Dean Herbert
70478e2216
Merge remote-tracking branch 'upstream/master' into fix-import-path-failures
2018-06-06 20:55:51 +09:00
Dean Herbert
c756a89daf
Standardise path
2018-06-06 20:55:42 +09:00
Dean Herbert
2e23da1dfa
Merge branch 'master' into beatmap-set-downloader
2018-06-06 20:32:58 +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
ebcfe97ccf
Expose Dependencies from base OsuTestCase
2018-06-06 20:25:40 +09:00
smoogipoo
f2ac5b8b2d
CreatePlayer shouldn't receive a beatmap
2018-06-06 20:21:47 +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
Dean Herbert
a645a109be
Merge branch 'master' into overlay-activation
2018-06-06 19:18:28 +09:00
Dean Herbert
0a97b8ae25
Implement DebugUtils locally
...
Has been removed from framework
2018-06-06 18:33:10 +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
5a4408e359
Merge remote-tracking branch 'upstream/master' into nuget-consumption
2018-06-06 18:22:22 +09:00
Dean Herbert
9306fec498
Fix missing null checks
2018-06-06 18:21:03 +09:00
Aergwyn
aaaa8a3b7c
match Bindable names
2018-06-06 09:55:16 +02:00
smoogipoo
83ff47ec80
Rewrite difficulty mod combinations
2018-06-06 16:20:17 +09:00
Dean Herbert
55921efffb
Rewrite much state logic
2018-06-06 16:17:51 +09:00
Dean Herbert
9e25e02696
Ensure notifications don't appear during UserTriggered mode
...
Closes #2640 .
2018-06-06 15:50:24 +09:00
Dean Herbert
d1fd09ed47
Rename variables
2018-06-06 15:49:27 +09:00
DrabWeb
7819be7957
Remove unused using.
2018-06-06 03:28:07 -03:00
DrabWeb
188272e15d
Replace OnAlreadyDownloading with returning a bool from Download.
2018-06-06 03:18:42 -03:00
DrabWeb
df4c855aa2
Manage subtitle inside of DownloadButton.
2018-06-06 03:13:37 -03:00
Dean Herbert
86be1bef6b
Use UserTriggered in Player
2018-06-06 15:10:15 +09:00
Dean Herbert
3567823759
Reverse order of exposed objects in HitObjectContainer
...
Closes #2740 .
2018-06-06 15:03:47 +09:00
Dean Herbert
d3cd267036
Formatting fixes
2018-06-06 14:20:51 +09:00
smoogipoo
e19ca0c120
Add nomod mod type
2018-06-06 14:08:02 +09:00
smoogipoo
8274623ad6
Cleanup multi mod constructions
2018-06-06 14:07:50 +09:00
Dean Herbert
a5679f7bf5
Improve readability of code
2018-06-06 14:04:20 +09:00
Dean Herbert
1dd5bdcf72
Move setting to new "mods" section
2018-06-06 12:32:59 +09:00
Dean Herbert
ee92986494
Merge branch 'master' into osu-hd-setting
2018-06-06 12:09:12 +09:00
Dean Herbert
6be382aab6
Merge branch 'master' into overlay-activation
2018-06-06 10:07:22 +09:00
Dean Herbert
26569b434c
Merge branch 'master' into fix-replay-updates
2018-06-06 09:40:46 +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
DrabWeb
80951eae68
Inherit BeatmapSetDownloader from Component.
2018-06-05 18:09:26 -03:00
Dean Herbert
601ef3b6f7
Consume osu.Framework via nuget
2018-06-05 14:14:56 +09:00
Dean Herbert
3b03a25ea5
Fix beatmaps with subfolders importing incorrectly on windows
...
Closes #2718 .
2018-06-05 11:36:44 +09:00
DrabWeb
4cf7a64636
Remove unused parameter.
2018-06-04 22:26:52 -03:00
DrabWeb
d8154f8cad
Fix BeatmapSetInfos with OnlineBeatmapSetID set to null being marked as downloaded.
2018-06-04 21:11:27 -03:00
DrabWeb
61e1358410
Add OnAlreadyDownloading animations.
2018-06-04 21:07:17 -03:00
DrabWeb
c524289b24
Update DirectListPanel to properly handle hiding DownloadButton.
2018-06-04 21:01:15 -03:00
DrabWeb
01c5060bcf
Move BeatmapSetDownloader to osu.Game.Beatmaps.Drawables
2018-06-04 20:30:54 -03:00
DrabWeb
9377ffb784
Update BeatmapSetOverlay to use BeatmapSetDownloader.
2018-06-04 20:27:34 -03:00
DrabWeb
698a42f145
BeatmapSetDownloadButton -> BeatmapSetDownloader
...
Allows it to integrate better with existing buttons, like HeaderButton.
2018-06-04 20:12:43 -03: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
5d45664669
Merge branch 'master' into handle-web-request-failures
2018-06-04 19:49:12 +09:00
Dan Balasescu
f9b6de67b8
Merge branch 'master' into hide-flash-gap
2018-06-04 19:29:10 +09:00
DrabWeb
4bdc1fb781
Remove unused using.
2018-06-04 07:10:33 -03:00
DrabWeb
416384956d
Use a protected Downloaded bindable instead of abstract methods.
2018-06-04 06:47:39 -03:00
DrabWeb
7eeba2cf9a
Unsubscribe from BeatmapManager events in Dispose.
2018-06-04 06:34:48 -03:00
DrabWeb
b332c22fe5
Update DirectPanel to use BeatmapSetDownloadButton.
2018-06-04 06:29:35 -03:00
DrabWeb
7b7236929a
Add BeatmapSetDownloadButton.
2018-06-04 06:08:39 -03: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
Dan Balasescu
0f7b23d765
Add param explanatory blurb to xmldoc
2018-06-04 11:11:07 +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
Dean Herbert
3a823d6c25
Fix multiple issues causing database reset to fail
2018-06-04 02:12:16 +09:00
Joehu
7101533926
Remove 'description' field
2018-06-03 08:02:57 -07: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
Dean Herbert
645f6efce7
Fix web request failures not being correctly handled at an APIRequest level
2018-06-03 13:01:52 +09:00
smoogipoo
2ccffb9ac4
Add difficulty calculation mod types
2018-06-03 10:59:56 +09:00
Joehu
0f13acf67e
Use updateExpanded method
2018-06-02 12:52:31 -07:00
Roman Kapustin
9b69e1825d
Make PreviewTrack.owner private
2018-06-02 22:06:45 +03: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
Dean Herbert
88628812c6
Logexceptions when loading ruleset DLLs
2018-06-03 00:28:29 +09:00
Roman Kapustin
5bb6757cbd
Remove unused previewTrackManager parameter
2018-06-02 13:03:17 +03:00
Roman Kapustin
70120aa14c
Remove unused previewTrackManager variable
2018-06-02 12:28:16 +03: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
Roman Kapustin
330ce19041
Make PreviewTrack a component and use LoadComponentAsync
2018-06-01 23:36:25 +03: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
a103acbd97
Merge https://github.com/ppy/osu into multiplayer-match
2018-06-01 16:27:38 -03:00
DrabWeb
97b473ef30
Expose tabs and hide beatmap select button in Header.
2018-06-01 16:23:11 -03:00
Roman Kapustin
5566732664
Get rid of PreviewTrackManager.onTrackStart and PreviewTrackManager.onTrackStop delegates
2018-06-01 21:36:30 +03:00
Roman Kapustin
88ac427ba6
PreviewTrack.Owner
2018-06-01 21:06:37 +03:00
DrabWeb
cc32adf51f
Move max text updating into updateMax.
2018-06-01 14:28:24 -03:00
Dean Herbert
9b7741b353
Avoid using update for fading logic
2018-06-01 22:19:11 +09:00
Dean Herbert
ae6f603d16
Merge branch 'master' into match-panel-with-web
2018-06-01 21:31:18 +09: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
Dean Herbert
8bde1fd327
Merge branch 'master' into updateable-beatmap-set-cover
2018-06-01 15:20:59 +09:00
Joehu
729f2ec725
Match authorinfo with web
2018-05-31 14:34:47 -07:00
miterosan
34378964e7
Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
2018-05-31 22:34:50 +02:00
Joehu
b4d621a2cb
Add link colour to beatmap source
2018-05-31 10:21:22 -07:00
Joehu
1095669a55
Match panel with web
2018-05-31 08:09:19 -07:00
Dean Herbert
b68a5f5eab
Tidy up Loader logic
2018-05-31 20:07:44 +09:00
smoogipoo
4eb7a34944
Always update children when ruleset input manager is updated
2018-05-31 18:02:10 +09:00
DrabWeb
6781b81336
Cleanup.
2018-05-31 05:48:42 -03: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
Dean Herbert
49a683e386
Merge remote-tracking branch 'upstream/master' into miterosan-Private_Messages
2018-05-31 14:50:20 +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
smoogipoo
9da7bfd615
Merge remote-tracking branch 'origin/master' into fix-beatmap-import-conflicts
...
# Conflicts:
# osu.Game/Database/ArchiveModelManager.cs
2018-05-31 14:02:52 +09:00
Dan Balasescu
a9db479b27
Merge branch 'master' into import-fixes
2018-05-31 13:49:12 +09:00
Dean Herbert
0f6c623ebb
Tidy up some unnecessary lines
2018-05-31 12:44:59 +09:00
Dean Herbert
205aa1a3cd
Fetch colour from OsuColour palette
2018-05-31 12:44:11 +09:00
Dean Herbert
319faf12f7
Fix incorrect naming of label
2018-05-31 12:39:56 +09:00
Dean Herbert
2f21b9c4ea
Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits
2018-05-31 12:36:37 +09:00
Dean Herbert
7f0cb0bbf6
Add key bindings for scroll speed
...
Closes #2689 .
- [ ] Depends on ppy/osu-framework#1569 being fixed.
2018-05-31 12:10:53 +09:00
DrabWeb
ff93a54a64
Default Type to Title, use ToLower for the screen type title.
2018-05-30 23:16:54 -03:00
