smoogipoo
fdb3227fd7
Fix + cleanup testcases
2018-04-06 18:12:44 +09:00
smoogipoo
c7abd56fc4
Give editor a custom clock to handle seeking
2018-04-06 18:11:37 +09:00
Dean Herbert
768a5e5383
Create ManualInputManagerTestCase
...
A base class for running more input-driven tests.
2018-04-06 15:23:30 +09:00
Dean Herbert
acbdbcc3df
Update AssemblyInfo in line with framework changes
2018-04-06 13:17:26 +09:00
Dean Herbert
5426432e46
Fix drag select crashing
2018-04-06 11:47:21 +09:00
Dean Herbert
32e8d93596
Fix selection changing when clicking overlapping hitobjects
2018-04-06 11:22:36 +09:00
Dean Herbert
24b9a8c983
Allow HitObjectMasks to handle drag events directly
2018-04-06 10:29:34 +09:00
Dean Herbert
5749e71560
Apply review fixes
2018-04-05 21:06:48 +09:00
Dean Herbert
345cfb077d
No need to sort list any more
2018-04-05 21:03:39 +09:00
Dean Herbert
1a6dfcbc1c
Merge branch 'master' into selectionlayer-rewrite
2018-04-05 21:03:29 +09:00
Dean Herbert
37fb207abd
Remove TestTestCase
...
No longer necessary as we have restructured tests considerably.
2018-04-05 16:01:33 +09:00
Dean Herbert
0ad4b8a6f8
Remove TestTestCase
...
No longer necessary as we have restructured tests considerably.
2018-04-05 15:55:47 +09:00
naoey
ca4299c6fe
Remove unused using and fix possible nullref.
2018-04-04 22:07:24 +05:30
naoey
7482d5986a
Add a loading state to BeatmapSetOverlay.
...
- Handle null value in header and info sections
- Add item to context menu for carousel beatmaps to show details
2018-04-04 21:46:31 +05:30
naoey
c304c1eecf
Make LinkFlowContainer handle beatmap id lookup in game.
2018-04-04 21:23:51 +05:30
Dean Herbert
6c125683d4
Merge branch 'master' into selectionlayer-rewrite
2018-04-04 20:47:36 +09:00
Dean Herbert
216c4629e0
Fix dragging backwards not deselecting pending selection
2018-04-04 20:44:22 +09:00
Dean Herbert
b7325d73e8
Don't inherit VisbilityContainer
2018-04-04 20:44:11 +09:00
Dean Herbert
94c3f38541
Pass down input state instead of parent lookup
2018-04-04 20:06:45 +09:00
Dean Herbert
2b15555ede
Remove MaskContainer dependency in MaskSelection
2018-04-04 20:05:01 +09:00
Dean Herbert
5c036b966b
Formatting fixes
2018-04-04 20:04:54 +09:00
Dean Herbert
a997ec6139
Fix ShouldBeAlive state
2018-04-04 19:51:56 +09:00
Dean Herbert
31a7db0a35
Fix drag mishaps
2018-04-04 19:42:59 +09:00
Dean Herbert
bce114a37b
Make AliveMasks private
2018-04-04 18:55:17 +09:00
Dean Herbert
4d71f2084c
Move individual mask selection logic out of MaskSelection
2018-04-04 18:29:53 +09:00
Dean Herbert
b6b8c51657
Remove DragLayer dependency on MaskContainer
2018-04-04 18:20:32 +09:00
Dean Herbert
c2d371797e
Fix unbind failure
2018-04-04 17:38:34 +09:00
Dean Herbert
c712b29b5b
Rename dragBox to dragLayer
2018-04-04 16:24:27 +09:00
Dean Herbert
4196bb8c24
Move selection logic to MaskContainer
2018-04-04 16:24:13 +09:00
Dean Herbert
d453c2589a
Add an explanatory comment for weird override
2018-04-04 16:02:20 +09:00
Dean Herbert
788bfde002
Merge branch 'master' into selectionlayer-rewrite
2018-04-04 15:38:27 +09:00
Dan Balasescu
d418a4803f
Merge branch 'master' into colours-for-judgements
2018-04-04 15:13:52 +09:00
Dan Balasescu
bed46b1f7e
Split local variable assignment from construction of children
2018-04-04 15:13:42 +09:00
Dan Balasescu
9df525a38d
Remove extra whitespace
...
In general we don't really do this elsewhere in the codebase.
2018-04-04 15:11:16 +09:00
DrabWeb
65f0e91734
Use Interpolation function directly for resizing tab strips.
2018-04-04 03:04:26 -03:00
Dan Balasescu
b5d7a5df00
Merge branch 'master' into colours-for-judgements
2018-04-04 15:02:03 +09:00
Dan Balasescu
6dfca4b2fa
Merge branch 'master' into osu-tab-strip
2018-04-04 14:20:06 +09:00
smoogipoo
4f19059e55
DragBox -> DragLayer
2018-04-03 21:29:49 +09:00
smoogipoo
c39fb9a200
Update with framework changes
2018-04-03 20:10:26 +09:00
Dean Herbert
ddba7254ca
Merge remote-tracking branch 'upstream/master' into linq
2018-04-03 13:05:08 +09:00
Dean Herbert
d40ccbd70a
Merge branch 'master' into selectionlayer-rewrite
2018-04-03 12:03:11 +09:00
Dean Herbert
77189073b2
Merge branch 'master' into scalablecontainer-size-fix
2018-04-03 11:29:36 +09:00
Dean Herbert
57b4cdaf85
Merge branch 'master' into selectionlayer-rewrite
2018-04-03 03:05:42 +09:00
smoogipoo
e9ec544bf6
Implement joystick keybindings
2018-04-03 02:04:40 +09:00
smoogipoo
fd9480cfb6
Handle timingpoint FormatException
2018-04-02 20:08:40 +09:00
smoogipoo
d24d81d8a9
De-pluralize some methods
2018-04-02 20:07:18 +09:00
smoogipoo
69e2d4fd22
Make CarouselRoot a nested class
2018-04-02 15:24:08 +09:00
Dan Balasescu
6f88a80bde
Merge branch 'master' into alt-eagerselect
2018-04-02 15:18:22 +09:00
smoogipoo
82a847b820
Extract random selection logic into CarouselRoot
2018-04-02 15:16:10 +09:00
Dan Balasescu
83dcff2907
Merge branch 'master' into fix-songselect-exit-notimplemented
2018-04-02 13:54:06 +09:00
Dan Balasescu
32832304a7
Merge branch 'master' into fix-songselect-exit-notimplemented
2018-04-02 13:53:41 +09:00
Dan Balasescu
323534c721
Merge branch 'master' into fix-file-extension-matching
2018-04-02 13:27:14 +09:00
Huo Yaoyuan
b842f682eb
Use Linq.Append and Prepend.
2018-04-02 12:06:34 +08:00
smoogipoo
551ba6ac4b
Fix ScalableContainer irrepairably altering content size
2018-04-02 13:06:06 +09:00
Ali Rizvi
7fed8d64de
Implement Judgement Colours
2018-03-31 04:59:08 +09:00
Dean Herbert
cf3cafd9a9
Merge branch 'master' into beatmap-set-status
2018-03-30 20:55:36 +09:00
Dean Herbert
c39f056b3b
Fix skin path being ignored in extension agnostic lookups
...
Closes #2295 .
2018-03-30 18:06:18 +09:00
Endrik Tombak
7e30375443
Use selectNextRandom instead
2018-03-30 10:46:46 +03:00
Dan Balasescu
824201336a
Merge branch 'master' into hr-on-mania-is-unranked
2018-03-30 16:35:00 +09:00
smoogipoo
f1f7d978ec
Add some comments
2018-03-30 16:28:59 +09:00
smoogipoo
69a7ddbf1e
Fix ordering of display/input of HitObjectMasks
2018-03-30 16:28:49 +09:00
smoogipoo
53541a5c8d
Add license header
2018-03-30 15:53:31 +09:00
smoogipoo
5d0a636cc4
Rename SelectionBox -> Selection
2018-03-30 15:51:38 +09:00
smoogipoo
1dca1663c3
Handle all selection events within SelectionBox (incl. single-mask)
2018-03-30 15:50:55 +09:00
smoogipoo
082e5e4949
Reduce iterations of DragBox
2018-03-30 15:06:52 +09:00
Dean Herbert
31ade986a7
Scren async changes in line with framework changes
...
Makes editor not stutter on load, amongst other screens.
2018-03-30 14:58:11 +09:00
Joseph Madamba
0887dafa2c
Revert changes on hard rock mod
2018-03-29 20:36:52 -07:00
Dean Herbert
e1123c5a95
Merge branch 'master' into selectionlayer-rewrite
2018-03-30 12:29:58 +09:00
Endrik Tombak
3f65e3a7e3
Make selection at random when last was null
2018-03-30 00:15:32 +03:00
DrabWeb
e3218250d5
Fix tab strip in BreadcrumbControl, allow strip height to be overriden.
2018-03-29 15:41:27 -03:00
DrabWeb
3d05798d80
Change SearchableListOverlay to use OsuTabControl strip.
2018-03-29 15:34:53 -03:00
DrabWeb
f43b009b96
Add optional strip to OsuTabControl.
2018-03-29 15:29:45 -03:00
smoogipoo
6b2ca36657
Add license header
2018-03-29 22:52:42 +09:00
smoogipoo
6767dd3d4a
Fix hitobject masks dying with no recovery
2018-03-29 22:42:42 +09:00
smoogipoo
d9c5a0c6d1
Fix position editing not working
2018-03-29 22:38:44 +09:00
smoogipoo
4446aeaa0d
Commenting + cleanup of HitObjectMask/HitObjectMaskLayer
2018-03-29 22:38:28 +09:00
smoogipoo
d8f26f2260
Make HitObjectMaskLayer not iterate through all masks when deselecting
2018-03-29 22:22:42 +09:00
smoogipoo
1018711cc9
Cleanup SelectionBox
2018-03-29 22:20:56 +09:00
smoogipoo
346de77776
Cleanup DragBox
2018-03-29 22:13:28 +09:00
smoogipoo
04874bcda4
"overlay" -> "mask"
2018-03-29 22:09:22 +09:00
smoogipoo
6d4f94756e
Rewrite the way drag + click selections happen
...
The general idea here is that we need the masks to handle mouse down events, as they need to handle the drag (mousedown -> drag immediately).
I've rewritten the editor selections to use events, as there are some 3 different components that handle/trigger selections in different ways.
1. All selections/deselections now propagate through `HitObjectMask.Select()`/`HitObjectMask.Deselect()`.
2. Components that react to changes in the selection bind to the masks' `Selected`/`Deselected` events, and track them/change their states locally.
3. Masks provide a `SingleSelectionRequested` event which is invoked on the mouse-down event. Various components bind to this event to perform state changes locally in this scenario.
4. `DragBox` now handles all drag input locally. It triggers `Select`/`Deselect` on the masks it needs to.
5. `SelectionBox` handles the display of itself locally.
6. `SelectionBox` handles movement of groups of masks locally.
7. `HitObjectMasks` handles movement of itself locally.
2018-03-29 22:07:23 +09:00
smoogipoo
57e4281601
Make HitObjectMasks VisibilityContainers
2018-03-29 18:44:15 +09:00
smoogipoo
6314694557
Make HitObjectMaskLayer always create masks for all objects
2018-03-29 17:13:45 +09:00
smoogipoo
187a025d36
Make hitobjects sorted by their start times
2018-03-29 16:07:31 +09:00
Dean Herbert
9aae568bbe
Tidy up csproj further
2018-03-28 15:19:56 +09:00
Dean Herbert
94b1d3e4af
Make VisualTests/nUnit work again
2018-03-28 12:33:01 +09:00
DrabWeb
84bb96740f
Fix merge error.
2018-03-27 18:27:30 -03:00
DrabWeb
19bc6b9168
Merge https://github.com/ppy/osu into beatmap-set-status
2018-03-27 18:13:58 -03:00
DrabWeb
506e27a30e
Cleanup.
2018-03-27 17:59:58 -03:00
TocoToucan
458594d24d
Qualifier 'this.' is redundant
2018-03-27 18:03:57 +03:00
Dean Herbert
1a8aa87469
Make everything better
2018-03-27 18:56:54 +09:00
Dean Herbert
988141408f
Update copyright year
2018-03-27 15:26:15 +09:00
Dean Herbert
b290d2d039
Move NUnit includes to individual projects
2018-03-27 15:07:09 +09:00
DrabWeb
eb374c5774
Add beatmap set online status and display it in direct panels and the beatmap set overlay.
2018-03-26 21:04:45 -03:00
smoogipoo
dd5bbbbd9f
Define testable projects
2018-03-26 19:11:23 +09:00
smoogipoo
5159127bce
Fix SQLite failing to initialize on test projects
2018-03-26 18:07:09 +09:00
smoogipoo
35ef9d99c6
Only compile with net461 in visual studio
2018-03-26 15:44:55 +09:00
smoogipoo
96901b6498
Add msbuild/dotnet build + launch targets
2018-03-26 10:52:54 +09:00
FreezyLemon
46d859a660
exit player earlier if a dummy map is loaded
2018-03-25 13:25:48 +02:00
smoogipoo
4dc317d4df
Fix msbuild warnings
2018-03-25 03:38:52 +09:00
smoogipoo
097ab66182
Fix resharper error
2018-03-25 01:54:25 +09:00
smoogipoo
d28de89e50
Add net461 target to test projects for nunit discovery
...
Nunit "by design" will not run tests for NETStandard projects (see: https://github.com/nunit/dotnet-test-nunit/issues/122#issuecomment-329531632 ).
2018-03-25 01:35:50 +09:00
TocoToucan
e91d24f31a
Use ScreenshotCaptureMenuCursor in ScreenshotManager
2018-03-24 12:53:01 +03:00
Dean Herbert
0e669c9a3f
Fix many warnings
2018-03-24 18:23:22 +09:00
smoogipoo
ffa712dccb
Fix post-merge issues
2018-03-24 15:19:45 +09:00
smoogipoo
c29f7a4333
Merge remote-tracking branch 'origin/master' into netstandard
2018-03-24 14:49:46 +09:00
Dean Herbert
76886c8e3f
Merge branch 'master' into performance-logging-toggle
2018-03-24 13:32:49 +09:00
Dean Herbert
1996698817
Fix @1x skin elements not being used
2018-03-24 11:40:45 +09:00
Dean Herbert
923f96d940
Merge branch 'master' into performance-logging-toggle
2018-03-24 11:36:20 +09:00
Dean Herbert
3844e95656
Fix one more instance of the same thing happening
2018-03-24 05:55:56 +09:00
Dean Herbert
256baf6d60
Move binding to LoadComplete
...
Previously there was a chance that it would still never get disposed, as the event was bound in async load, before it was in a state it can be recursively disposed via the PlayerLoader call.
2018-03-24 05:40:51 +09:00
Dean Herbert
b593c47809
Add setting to toggle performance logging
2018-03-24 05:07:48 +09:00
TocoToucan
dd5cc59250
Introduce 'Capture menu cursor' setting
2018-03-23 22:53:06 +03:00
Dean Herbert
e47aa0edc0
Merge branch 'master' into fix-background-fade
2018-03-24 03:40:13 +09:00
Dean Herbert
0976e83b33
Merge branch 'master' into fix-api-abort
2018-03-24 03:13:28 +09:00
Dan Balasescu
1576b31a48
Merge branch 'master' into add-perfect-mod-icon
2018-03-23 21:32:15 +09:00
Dan Balasescu
676feb3658
Merge branch 'master' into fix-mod-button-sounds
2018-03-23 21:03:42 +09:00
smoogipoo
f0c0a51108
Convert APIAccess to use cancellation tokens
2018-03-23 20:57:04 +09:00
Dan Balasescu
9ab3610b95
Merge branch 'master' into fix-player-disposal
2018-03-23 20:45:42 +09:00
smoogipoo
afdab7895a
Fix beatmap background fade not being updated on retry
...
Fixes #2287
2018-03-23 20:41:38 +09:00
Dean Herbert
b4eaaa4fd1
Merge branch 'master' into fix-circularprogress-glow
2018-03-23 19:01:28 +09:00
smoogipoo
52fa837447
Fix volume glow being cut off
...
Fixes #2285 .
2018-03-23 18:17:23 +09:00
Dean Herbert
6c4e719e0f
Fix API never stopping its thread
2018-03-23 15:46:55 +09:00
Dean Herbert
eb751fa607
Fix event unbind not being unbound correctly
2018-03-23 15:05:28 +09:00
Dean Herbert
b56eee1927
Fix background loaded player never being disposed if early exit occurs
2018-03-23 15:04:40 +09:00
Joseph Madamba
f77dad2809
Add perfect mod icon
2018-03-22 22:49:14 -07:00
Dean Herbert
d4aeb3d00b
Fix BeatmapCarousel's flush not correctly applying selection changes
...
They may have been delayed until the next Update, which is too late in this case.
2018-03-23 12:10:13 +09:00
FreezyLemon
a3d8048aca
abort loading and exit player for dummy maps
2018-03-22 21:46:35 +01:00
Dean Herbert
fd124d2ee6
Merge branch 'master' into fix-mod-button-sounds
2018-03-22 21:55:15 +09:00
Dean Herbert
1d3c9098b8
Load component asynchronously
2018-03-22 21:42:57 +09:00
Dean Herbert
e7cb579ec4
Merge branch 'master' into take_screenshot
2018-03-22 21:34:53 +09:00
Dean Herbert
14a653aa28
Restore old auto-popout notification overlay behaviour
2018-03-22 20:55:00 +09:00
Dean Herbert
74191e1b73
Merge remote-tracking branch 'upstream/master' into take_screenshot
2018-03-22 20:49:17 +09:00
Dean Herbert
e41993ac44
Don't bother with an exception that will never happen
...
Wasn't being caught anyways
2018-03-22 20:45:26 +09:00
Dean Herbert
94847e4a23
Allow clicking notification to open screenshot folder
2018-03-22 20:44:00 +09:00
Dean Herbert
9e080028ff
Add shutter sound
2018-03-22 20:42:55 +09:00
Dean Herbert
4883e2fd5b
Merge branch 'master' into beat-snap-divisor
2018-03-22 20:24:10 +09:00
Dean Herbert
92d8781bf0
Merge branch 'master' into beat-snap-divisor
2018-03-22 20:14:50 +09:00
smoogipoo
2b7d22c4ea
Very slightly reduce size of slider bar to increase bottom padding
2018-03-22 20:11:55 +09:00
Dan Balasescu
4e2c6ccedc
Merge branch 'master' into skin-scaling
2018-03-22 20:11:30 +09:00
smoogipoo
090c78bf10
Merge remote-tracking branch 'origin/master' into fix-player-loader
2018-03-22 20:00:21 +09:00
Dean Herbert
e5f83530b8
Only allow settings or notifications to be visible at once
...
Resolves #2273 .
2018-03-22 19:49:31 +09:00
Dean Herbert
ee12d75b30
Merge branch 'master' into skin-scaling
2018-03-22 19:30:17 +09:00
Dean Herbert
2d08cee3b4
Merge branch 'master' into skin--completion
2018-03-22 19:04:22 +09:00
Dean Herbert
af65f2dd48
Move AccentColour changes local to rulesets which rely on it
2018-03-22 18:53:16 +09:00
smoogipoo
fc85bf919e
Merge remote-tracking branch 'origin/master' into focused-textbox-fix
2018-03-22 18:52:06 +09:00
smoogipoo
9f220b3b9b
Add explanatory comment
2018-03-22 18:51:03 +09:00
Dean Herbert
366b7fca65
Remove GetColour method
2018-03-22 18:50:19 +09:00
Dean Herbert
425d4aa766
Add ability to lookup arbitrary SkinConfiguration values
2018-03-22 18:10:28 +09:00
Dean Herbert
c4fe6a04c5
Use string lookups for combo colours
2018-03-22 17:32:05 +09:00
Dan Balasescu
ab9505652b
Merge branch 'master' into skin--completion
2018-03-22 16:44:00 +09:00
Dean Herbert
b8022070e8
Merge remote-tracking branch 'upstream/master' into beatmap-as-a-skin
2018-03-22 16:24:56 +09:00
Dean Herbert
dade52d15d
Fix vertical padding
2018-03-22 16:15:14 +09:00
Dan Balasescu
f872402fc4
Merge branch 'master' into accent-colour-properties
2018-03-22 16:10:52 +09:00
Dean Herbert
a4804f47a9
Merge branch 'master' into beat-snap-divisor
2018-03-22 16:06:26 +09:00
Dean Herbert
6e379f0646
Fix FocusedTextBox in line with framework changes
2018-03-22 15:54:16 +09:00
Dean Herbert
5f1bb8d753
Merge branch 'master' into fix-player-loader
2018-03-22 15:46:37 +09:00
Dan Balasescu
13a3c728dc
Merge branch 'master' into fix-dummy-ruleset
2018-03-22 15:29:43 +09:00
smoogipoo
3f3f57e51e
Use cached vertexbatch add delegate
2018-03-22 15:13:38 +09:00
Dean Herbert
7bdca0ff39
Merge remote-tracking branch 'upstream/master' into accent-colour-properties
2018-03-22 15:07:28 +09:00
Dean Herbert
9a20839b74
Merge branch 'master' into better-import-notice
2018-03-22 14:57:04 +09:00
Dan Balasescu
dd99a210e2
Merge branch 'master' into ignore-unknown-sections
2018-03-22 14:48:06 +09:00
smoogipoo
dc9fb84e25
Update progress with the current item, not the next item
...
In the case where there is no next item, the progress will not get updated, so we'll essentially skip one element from filling the progress bar further. In the future we may/will want to not hide the notification upon completion, so this will look better in such scenarios.
2018-03-22 14:46:25 +09:00
Dean Herbert
5104ba8118
Merge branch 'master' into beatmap-as-a-skin
2018-03-22 13:45:30 +09:00
Dean Herbert
917334a39a
Move cancel code to exit paths for screen
2018-03-22 13:01:40 +09:00
Dean Herbert
e39b7b8d35
Don't hard-crash when an unknown section is encountered in a legacy file
2018-03-22 12:58:02 +09:00
Dean Herbert
504c3ff0ba
BeatmapSkin -> LegacyBeatmapSkin
2018-03-22 12:50:48 +09:00
Dan Balasescu
976702aef9
Merge branch 'master' into fix-osu-logo-sounds
2018-03-22 12:50:45 +09:00
Dean Herbert
c5eecae32f
Improve shared code paths in legacy skins
2018-03-22 12:50:23 +09:00
Dean Herbert
78a8f60b39
IHasComboIndex -> IHasComboInformation
2018-03-22 12:35:17 +09:00
Dean Herbert
1a782a840c
Fix xmldoc
2018-03-22 12:34:29 +09:00
Dan Balasescu
77ebd94804
Merge branch 'master' into beatmap-as-a-skin
2018-03-22 11:33:27 +09:00
Dan Balasescu
552e7e314d
Merge branch 'master' into bail-on-invalid-archive
2018-03-22 11:32:38 +09:00
Dean Herbert
101caf3064
Apply same logic fixes to delete/restore all notifications
2018-03-22 11:28:40 +09:00
Dean Herbert
e0b74a357a
Fix osu! logo making hover beat sounds when not visible
2018-03-22 03:31:14 +09:00
Dean Herbert
8f71d53c17
Fix retry not allowing continuing beyond PlayerLoader
...
Resolves #2265 .
2018-03-22 02:10:31 +09:00
TocoToucan
4991f2ad2e
Change filename format
2018-03-21 18:27:08 +03:00
Dean Herbert
62229300c4
Fix DummyRuleset getting selected
...
Resolves #2261 .
2018-03-22 00:26:48 +09:00
Dean Herbert
4a93abcc36
Add scale adjusts to bring legacy skins in-line with lazer sizing
2018-03-21 20:07:58 +09:00
Dean Herbert
65b6a2faad
Fix mod button sounds playing when mod overlay is not visible
...
Resolves #2240 .
2018-03-21 18:41:21 +09:00
Dean Herbert
271c082606
Adjust colour assignment
2018-03-21 16:25:32 +09:00
Dean Herbert
48142602ea
Adjust text size to match design
2018-03-21 16:04:43 +09:00
Dean Herbert
63f0419d6a
Apply minor fixes
2018-03-21 15:40:43 +09:00
Dean Herbert
f944c29505
Merge remote-tracking branch 'upstream/master' into take_screenshot
2018-03-21 12:32:27 +09:00
Dean Herbert
ccdd11d7b2
Add missing licence header
2018-03-21 12:29:44 +09:00
Dean Herbert
8ac660b0c6
Fixes for keyboard handling and general code quality
2018-03-20 22:25:15 +09:00
Dean Herbert
aa8b0d017c
Adjust colours and spacing
2018-03-20 21:59:56 +09:00
Dean Herbert
dac1ba21db
Make keyboard control work
2018-03-20 21:38:22 +09:00
Dean Herbert
045610dbfe
Adjust styling and colours
2018-03-20 21:31:17 +09:00
Dean Herbert
5a10270a2a
return -> break
...
no real reason but whatever works
2018-03-20 20:32:32 +09:00
Dean Herbert
c2eb32c0e9
DrawableBeatDivisor -> BeatDivisorControl
2018-03-20 20:10:27 +09:00
Dean Herbert
6fd650777c
Move value change logic to bindable
...
Also add drag support
2018-03-20 20:09:55 +09:00
Dean Herbert
625e561fc8
Fix whitespace
2018-03-20 18:01:09 +09:00
Dean Herbert
fb3d319d0e
Make fallback bool into a function
...
Allows correct handling now that beatmap skins are also a thing.
2018-03-20 16:40:11 +09:00
Dean Herbert
f03abb3145
Add GetTexture method to ISkinSource
...
Used to shortcut lookup checks without potentially expensive drawable creation overhead.
2018-03-20 16:40:11 +09:00
Dean Herbert
9ad4e9284a
Add skin source fallback chain
2018-03-20 16:40:11 +09:00
Dean Herbert
fd0391daf7
Merge branch 'accent-colour-properties'
2018-03-20 16:25:22 +09:00
Dean Herbert
d1c2aa71d0
Add beatmap sample override support
2018-03-20 16:24:06 +09:00
Dean Herbert
9a0fc9e29a
Move combo colours completely out of beatmap
2018-03-20 16:24:06 +09:00
Dean Herbert
dbcf755618
Make Beatmaps parsable as skins
2018-03-20 16:05:29 +09:00
Dean Herbert
c38c26eacb
Move combo index processing to BeatmapProcessor
2018-03-20 15:57:43 +09:00
smoogipoo
786e6242e1
Make bdl beat divisor nullable
2018-03-20 14:01:06 +09:00
smoogipoo
50192b21e3
Give DrawableBeatDivisor a ctor
2018-03-20 13:57:25 +09:00
TocoToucan
ee73bd4568
Update ScreenshotManager inline with framework changes
2018-03-19 22:39:00 +03:00
Dean Herbert
553fd3b789
Give DefaultSkin an empty Configuration
2018-03-19 21:00:27 +09:00
smoogipoo
b1d09500f2
Integrate beat snap divisor into editor seeking
2018-03-19 20:42:06 +09:00
Dean Herbert
f565cc861d
Hard bail on attempting to import an invalid archive format
2018-03-19 20:41:12 +09:00
Dean Herbert
994c7bfabd
Further improvements to messaging
2018-03-19 20:40:14 +09:00
smoogipoo
c5eab7a227
Actually rename to DrawableBeatDivisor...
2018-03-19 20:34:24 +09:00
smoogipoo
5ecbc5612c
Integrate with dependency injection
2018-03-19 20:33:58 +09:00
Dean Herbert
b71c123214
Allow import of skins which don't have ini files
2018-03-19 20:26:16 +09:00
smoogipoo
4c0ccffe08
Merge remote-tracking branch 'origin/master' into beat-snap-divisor
2018-03-19 20:23:15 +09:00
smoogipoo
df0b8a24c5
Rename + renamespace
2018-03-19 20:21:19 +09:00
smoogipoo
879dbc75b5
Nest TickContainer in BeatSnapVisualiser
2018-03-19 20:20:29 +09:00
Dean Herbert
18368d2446
Make import notifications fail when any imports fail
2018-03-19 20:18:23 +09:00
smoogipoo
b25c564ecb
Integrate into editor's compose screen
2018-03-19 20:14:58 +09:00
smoogipoo
32fecc6ff4
Adjust icon scale + text
2018-03-19 20:14:34 +09:00
smoogipoo
e96dad441d
Offset the icon buttons a little bit to look a bit more centered
...
Maybe it's just me, but this is really triggering me.
2018-03-19 20:14:13 +09:00
Dean Herbert
7272ba2f1b
Add migration for skins which didn't get a proper name assigned
...
Also correctly imports new skins
2018-03-19 20:06:44 +09:00
Dean Herbert
ec851648da
Add better ToString output from SkinInfo
2018-03-19 20:06:44 +09:00
Dean Herbert
397b06283a
Add basic skin configuration decoding support
2018-03-19 20:06:44 +09:00
Dean Herbert
8e52d91180
Handle missing files without hard failure
...
Also adds support for lookups with file extensions
2018-03-19 20:06:44 +09:00
Dean Herbert
62e908e22c
Add default separator character
2018-03-19 20:06:44 +09:00
Dean Herbert
c4f5b46d72
Add basic structure for skin configurations
2018-03-19 20:06:44 +09:00
smoogipoo
c86ddb7ee3
Add slight easing to marker movements
2018-03-19 19:57:02 +09:00
smoogipoo
fbc92bfa01
Add previous/next divisor button actions
2018-03-19 19:55:49 +09:00
smoogipoo
070db63157
Privatise tick to TickContainer
2018-03-19 19:52:22 +09:00
smoogipoo
7182442b21
Add divisor text
2018-03-19 19:49:57 +09:00
smoogipoo
6b035e8c53
Add basic structure/layout for the beat snap visualiser
2018-03-19 19:46:26 +09:00
Dean Herbert
4b812279bb
Merge branch 'master' into fix-editor-clocks
2018-03-19 19:06:38 +09:00
smoogipoo
8d4c9eda48
Fix attempting to add selection boxes with no selection
...
E.g. because DrawableSpinner doesn't (currently) create an overlay, SelectionBox was being constructed with 0 hitobjects and then calculating a non-finite size for itself.
2018-03-19 18:00:11 +09:00
smoogipoo
e25d1f6982
Pass down editor clocks through DI
2018-03-19 16:27:52 +09:00
TocoToucan
245200d3ee
Add simple screenshot notification
2018-03-16 21:25:00 +03:00
TocoToucan
8429408974
Change screenshot file name
2018-03-16 21:05:25 +03:00
TocoToucan
604e725f3f
Remove redundant code
2018-03-16 20:42:05 +03:00
Dean Herbert
4b83278cf4
Merge branch 'master' into fix-editor-clocks
2018-03-16 23:32:54 +09:00
smoogipoo
6f7163769d
Adjust comment for readability
2018-03-16 19:57:14 +09:00
Dean Herbert
e8f7f2c8ab
Merge branch 'master' into editor-wheel-movement
2018-03-16 18:19:42 +09:00
Dean Herbert
4411758ff7
Merge branch 'master' into fix-autoplay-button-deselect
2018-03-16 17:31:14 +09:00
Dean Herbert
bca4b620b6
Merge branch 'master' into editor-wheel-movement
2018-03-16 15:56:51 +09:00
Dean Herbert
7e7f8ed7a2
Merge branch 'master' into drawable-composite-hit-object
2018-03-16 15:53:16 +09:00
Dean Herbert
23ffee3d38
Merge branch 'master' into drawable-composite-hit-object
2018-03-16 15:38:52 +09:00
Dean Herbert
46f5c0fc19
Merge branch 'master' into mod-fixes
2018-03-16 15:38:41 +09:00
smoogipoo
aa82393824
Merge master into api-as-component
2018-03-16 15:22:48 +09:00
Dan Balasescu
cdc61d5f0d
Merge branch 'master' into fix-combo-colours
2018-03-16 14:59:45 +09:00
smoogipoo
b27b6c7eb7
Merge branch 'master' into cursor-trail
2018-03-16 14:43:27 +09:00
Dean Herbert
7ed84465fb
Merge branch 'master' into mod-fixes
2018-03-16 11:27:39 +09:00
smoogipoo
fc15c63a88
Re-order methods
2018-03-15 18:28:08 +09:00
smoogipoo
c937ef5d24
Fix not being able to scroll before the first timing point
2018-03-15 18:26:53 +09:00
smoogipoo
d05947ef48
Pass adjustable clocks to components, rather than relying on the track
2018-03-15 18:19:28 +09:00
smoogipoo
c8f6a6980b
Move clock construction to Editor
2018-03-15 17:27:37 +09:00
smoogipoo
5e742eb466
Move editor constructions to BDL load
2018-03-15 17:10:08 +09:00
smoogipoo
9e0aeec574
Use a decoupled clock for accurate clock times
2018-03-15 17:03:33 +09:00
smoogipoo
50f9d810dd
Add more testcases + fix up seeking a bit more
2018-03-15 15:40:52 +09:00
Dean Herbert
0474b7ca2d
Merge branch 'master' into api-as-component
2018-03-15 14:13:23 +09:00
Dean Herbert
a42035f494
Make DrawableHitObject a CompositeDrawable
...
No reason for it to be a container.
2018-03-15 13:41:06 +09:00
Dean Herbert
cdf435aedd
Merge branch 'master' into DoNotMoveToPlayerWhileDragging
2018-03-15 11:14:30 +09:00
Dean Herbert
8d433cb4bf
Merge branch 'master' into cursor-trail
2018-03-15 11:14:21 +09:00
TocoToucan
34dc8e7375
Resolve merge conflict
2018-03-14 23:22:19 +03:00
TocoToucan
5a1af062d3
Handle GlobalAction.TakeScreenshot in ScreenshotManager
2018-03-14 22:55:24 +03:00
Dean Herbert
551b67ac16
Merge branch 'master' into fix-autoplay-button-deselect
2018-03-14 21:46:19 +09:00
smoogipoo
0da3ae0944
Add some basic tests + fixes to seek/seekforward functionality
2018-03-14 20:52:48 +09:00
FreezyLemon
070decf890
small code cleanups
2018-03-14 12:38:22 +01:00
FreezyLemon
a438e45434
make SelectTypes set mods instead of only adding new ones
...
also made the method actually take types as parameter to make it consistent
2018-03-14 12:33:08 +01:00
TocoToucan
25f738c4ae
Do not support bmp screenshots
2018-03-14 12:57:55 +03:00
Joseph Madamba
1eeacb7bf7
Change descriptions and special section
2018-03-14 01:05:19 -07:00
Dean Herbert
a0691168cb
Merge remote-tracking branch 'upstream/master' into editor-hitobject-movement
2018-03-14 15:35:24 +09:00
Dean Herbert
81f82d98a1
Rework a lot of naming and structure
2018-03-14 15:18:21 +09:00
Dean Herbert
ea649f9650
Avoid scheduling during non-current screen
2018-03-14 12:09:19 +09:00
Joseph Madamba
d122aa80e4
Edit mods description, multiplier, and code
2018-03-13 20:07:03 -07:00
Dean Herbert
ef8d595914
Apply formatting changes
2018-03-14 11:44:19 +09:00
Dean Herbert
c3a3d76b88
Merge remote-tracking branch 'upstream/master' into DoNotMoveToPlayerWhileDragging
2018-03-14 11:43:33 +09:00
Dean Herbert
13f64a1d12
Merge branch 'master' into cursor-trail
2018-03-14 11:42:40 +09:00
smoogipoo
e2dc9a975a
Merge branch 'master' into editor-wheel-movement
2018-03-14 11:39:02 +09:00
Dean Herbert
ce2997419a
Expose API scheduling internally
2018-03-14 11:37:50 +09:00
Dean Herbert
07642546bb
Make APIAccess a component
2018-03-14 11:29:54 +09:00
Dean Herbert
83cd2fd317
Move token saving logic to APIAccess
2018-03-14 10:15:05 +09:00
Dean Herbert
afc3646450
Move API configuration hooks out of OsuGameBase
...
Also makes username more private, and password completely private.
2018-03-14 10:15:05 +09:00
Dean Herbert
1d7be2ad0b
Fix incorrect variable name
2018-03-14 10:14:42 +09:00
Dean Herbert
d2a0ca6faa
Merge remote-tracking branch 'upstream/master' into fix-combo-colours
2018-03-14 10:13:48 +09:00
TocoToucan
0e69ab1615
Introduce ScreenshotManager class
2018-03-14 00:17:12 +03:00
Dean Herbert
c55d70ec13
Merge branch 'master' into fix-combo-colours
2018-03-13 19:19:45 +09:00
Dean Herbert
16eab2eebf
Fix combo colours not working until now
2018-03-13 19:19:08 +09:00
Dean Herbert
e43de68ad3
Move colour parsing to LegacyDecoder
2018-03-13 19:13:50 +09:00
vperus
ba44813c00
Fixed exit from game save username instead of email. Resolve #2156
2018-03-13 12:10:47 +02:00
smoogipoo
299de4b866
Rewrite seeking to better handle timing point boundaries
2018-03-13 16:54:34 +09:00
Dean Herbert
d6fa7d69d7
Add missing fonts section
2018-03-13 16:13:07 +09:00
smoogipoo
e97349fd63
Derive ScreenTestCase + use LoadComponentAsync
2018-03-13 16:00:56 +09:00
smoogipoo
0c705b0397
Rename to EditorTestCase
2018-03-13 15:57:05 +09:00
Dean Herbert
b93e83e3d2
Merge branch 'master' into base-editor-testcase
2018-03-13 15:53:33 +09:00
Dean Herbert
e9cd97c43a
Merge branch 'master' into test-beatmap
2018-03-13 15:42:30 +09:00
smoogipoo
e32eec9259
No more caching
2018-03-13 15:22:46 +09:00
smoogipoo
df352c98d6
Change wheel direction to match stable
2018-03-13 14:30:50 +09:00
smoogipoo
e580819621
Rename to seekAmount
2018-03-13 14:08:43 +09:00
smoogipoo
6c148930b5
Don't skip beats when scrolling in the direction of the closest beat
2018-03-13 14:02:37 +09:00
smoogipoo
8acba47a2b
Implement mouse wheel movement in the editor
2018-03-13 11:23:44 +09:00
smoogipoo
706c26c32b
Remove extra whitespace
2018-03-13 09:27:33 +09:00
FreezyLemon
95c84ea7fe
remove (now) unnecessary line
2018-03-12 23:00:06 +01:00
FreezyLemon
ddc1f03a96
deselect autoplay button after ctrl-enter play
...
before, the mod was removed, but the button was still active
2018-03-12 22:35:45 +01:00
Dean Herbert
107ad8cfff
Merge remote-tracking branch 'FreezyLemon/master' into more-skinning
2018-03-12 22:01:59 +09:00
Dean Herbert
3354849cc9
Fix code formatting regression
2018-03-12 22:01:18 +09:00
smoogipoo
d2859d779d
Create a base TestCaseEditor for rulests to derive
2018-03-12 19:43:52 +09:00
smoogipoo
13c20438ef
Fix build issues
2018-03-12 19:41:51 +09:00
smoogipoo
b91524dbba
Give TestWorkingBeatmap's track a valid length
2018-03-12 19:41:15 +09:00
smoogipoo
7406cb290f
Split out test beatmap from TestCasePlayer into instantiable class
2018-03-12 19:41:09 +09:00
smoogipoo
8c4bcb4a04
Only accept drag movement on the overlays
2018-03-12 17:33:10 +09:00
smoogipoo
212142429f
Derive from IHasPosition
2018-03-12 17:25:34 +09:00
Dean Herbert
8cbcdeb665
Merge branch 'master' into mania-difficulty
2018-03-12 14:07:14 +09:00
Dean Herbert
ab4c527ebc
Merge branch 'master' into decoders
2018-03-12 13:38:22 +09:00
Dean Herbert
9f644571ea
Merge branch 'master' into mania-difficulty
2018-03-12 13:31:48 +09:00
smoogipoo
3cd203699b
Apply beatmap converter mods in PerformanceCalculator
2018-03-12 13:09:19 +09:00
smoogipoo
81186f8423
Apply beatmap converter mods in DifficultyCalculator
2018-03-12 13:06:42 +09:00
Dean Herbert
1d0a44a0bb
Merge branch 'master' into fix-login-failure
2018-03-12 12:41:45 +09:00
Dan Balasescu
fce61943bd
Merge branch 'master' into smoother-parallax-scale
2018-03-12 12:12:01 +09:00
Dean Herbert
eb643b690a
Merge branch 'master' into more-skinning
2018-03-12 11:55:50 +09:00
Dean Herbert
1bcda4930e
Add back beatmap version set
2018-03-12 11:33:12 +09:00
Dean Herbert
c70be29eda
Move legacy conversion to LegacySkin
2018-03-12 11:30:13 +09:00
Dan Balasescu
50acab8d86
Merge branch 'master' into relative-date-drawable
2018-03-12 11:28:43 +09:00
Dan Balasescu
0da407f75c
Merge branch 'master' into fix-duplicate-judgements
2018-03-12 11:02:54 +09:00
Dean Herbert
1447ca55a3
Add xmldoc, make restrictSize private
2018-03-12 11:02:02 +09:00
smoogipoo
86d93ffe3c
Fix tooltip not working due to not handling input
2018-03-12 10:49:50 +09:00
Dean Herbert
d27cf16bf9
Merge remote-tracking branch 'ppy/master' into more-skinning
2018-03-12 10:46:37 +09:00
Dan Balasescu
96e2aca1ba
Merge branch 'master' into relative-date-drawable
2018-03-12 10:36:43 +09:00
smoogipoo
209d91fe21
Fix duplicate item in csproj
2018-03-12 10:35:37 +09:00
Dan Balasescu
8ba87dfdbd
Merge branch 'master' into fix-duplicate-judgements
2018-03-12 10:29:50 +09:00
smoogipoo
33c721bcbb
Fix post-merge errors
2018-03-12 09:51:32 +09:00
smoogipoo
6e51b74890
Merge remote-tracking branch 'origin/master' into rewrite-break-overlay
2018-03-12 09:47:05 +09:00
HoLLy
9c75c392f2
Only check by null instead of sign
2018-03-11 21:27:49 +01:00
HoLLy
a321bcf3af
Fix check against LegacyID for non-default rulesets
2018-03-11 20:19:03 +01:00
TocoToucan
e6c22e2287
Taking screenshot support initial commit
2018-03-10 21:59:20 +03:00
Dean Herbert
487a03d0d7
Merge branch 'master' into cursor-trail
2018-03-11 02:07:05 +09:00
Dean Herbert
db2a663234
Use private instead of protected
2018-03-11 01:26:03 +09:00
Dean Herbert
9233266fe1
Fix login failure for users with no country rank
...
Closes #2148 .
2018-03-11 00:44:16 +09:00
smoogipoo
4103c66cff
Move selection overlay to HitObjectOverlayLayer for extensibility
2018-03-10 00:48:57 +09:00
smoogipoo
0e8fbc47b7
Give HitObjectOverlayLayer full input state information
2018-03-10 00:03:02 +09:00
smoogipoo
376f6eec58
SetPosition -> OffsetPosition
2018-03-10 00:02:13 +09:00
smoogipoo
ad72d3816b
Allow dragging anywhere in a capture box to move objects
2018-03-09 23:43:50 +09:00
smoogipoo
4a48136e4f
Make hitobject positions adjustable
2018-03-09 23:12:34 +09:00
smoogipoo
3b766b8ec8
Make CaptureBox account for changes in hitobject states
2018-03-09 23:11:48 +09:00
naoey
56730247e3
Merge branch 'fix-unplayable-beatmaps' of github.com:naoey/osu into fix-unplayable-beatmaps
2018-03-09 19:40:00 +05:30
naoey
2c0488b1f1
Invert bool, add test, and handle ruleset change.
2018-03-09 19:39:28 +05:30
Dean Herbert
9ad9fc5aa9
Merge branch 'master' into fix-unplayable-beatmaps
2018-03-09 21:39:48 +09:00
Dean Herbert
217dd2ecdc
Initial push for better decoders
2018-03-09 21:24:15 +09:00
naoey
d04f47718f
Make song select choose random when initial selection fails.
...
- Revert TestCasePlaySongSelect to master
2018-03-09 17:36:55 +05:30
naoey
25fb527cc7
Remove previous fix and move filtered logic to carousel.
...
- Add an optional bool parameter to SelectBeatmap to skip selecting
filtered maps
2018-03-09 15:51:00 +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
6d91889ca6
Move player-specific configuration bindables back to player
2018-03-08 22:16:47 +09:00
Dean Herbert
94ed4ab01b
Add debouncing to player loading
...
Allows the mouse to temporarily exit and re-enter overlay elements without triggering a load
2018-03-08 20:28:55 +09:00
Dean Herbert
d3e91024a7
Block player enter when a drag initiates from an overlaying container
2018-03-08 18:16:23 +09:00
TocoToucan
2cb197d0c4
Replace ConfigureBackgroundUpdate with OnEntering
2018-03-08 11:35:00 +03:00
Dean Herbert
8f3f886805
Merge branch 'master' into PlayerBase
2018-03-08 16:12:12 +09:00
Dean Herbert
81c1ec2005
Merge branch 'master' into fix-unplayable-beatmaps
2018-03-08 13:02:57 +09:00
Dean Herbert
3b56999118
Add drawable to display (and update) relative dates
2018-03-08 12:58:16 +09:00
Dean Herbert
70a16667b6
Fix difficulty calculator regression when applying mods
2018-03-08 12:57:36 +09:00
Dean Herbert
91c984ed97
Merge branch 'master' into rewrite-break-overlay
2018-03-08 09:31:59 +09:00
Dean Herbert
81b778fdcf
Merge branch 'master' into cursor-trail
2018-03-08 09:31:42 +09:00
Dean Herbert
453fd83e01
Merge branch 'master' into user-profile-recent
2018-03-08 00:42:02 +09:00
naoey
983cefbe40
Add VisualTest.
2018-03-07 19:08:26 +05:30
pdrapoport
3731cbe5eb
Removing "mouse wheel disabled" checkbox from visual settings gameplay menu
2018-03-07 14:20:59 +01:00
Dean Herbert
f78538fea8
Merge branch 'master' into user-profile-recent
2018-03-07 19:41:52 +09:00
Dean Herbert
b62ed004f2
Remove judgements when deciding a new judgement for a HitObject
...
Generally happens when rewinding.
2018-03-07 19:14:42 +09:00
Dean Herbert
05eb678654
Add skin support for judgements
2018-03-07 18:21:05 +09:00
Dean Herbert
bd952ce370
Allow skinnable drawables to be of non-restricted size
2018-03-07 18:21:05 +09:00
Dean Herbert
6a768e378a
Merge branch 'master' into rewrite-break-overlay
2018-03-07 17:00:34 +09:00
Dan Balasescu
fb349e68a3
Merge branch 'master' into api-error-shouldnt-retry
2018-03-07 16:50:14 +09:00
Dan Balasescu
0c154e07ed
Merge branch 'master' into nullable-legacy-id
2018-03-07 16:12:08 +09:00
Dan Balasescu
5fda7881c3
Merge branch 'master' into fix-textbox-arrows
2018-03-07 16:01:44 +09:00
Dean Herbert
a71e5ce19c
Tidy up
2018-03-07 14:54:54 +09:00
Dean Herbert
4094ffbddd
Remove unnecessary comment
2018-03-07 14:54:15 +09:00
Dean Herbert
96ea42d3ba
Ensure initial value is set even if that value is zero
2018-03-07 14:51:34 +09:00
Dean Herbert
05a13d4d39
Improve the way bindings are done
2018-03-07 14:50:50 +09:00
Dean Herbert
51a9dd038e
Add default bindable values
2018-03-07 14:38:41 +09:00
Dean Herbert
fac4cd6a32
Move to overlayContent
2018-03-07 14:20:47 +09:00
Dean Herbert
e2f9e237e8
Use GradientHorizontal helper function
2018-03-07 14:07:04 +09:00
Dean Herbert
c176e309e1
Merge branch 'master' into volume-control
2018-03-07 14:03:09 +09:00
Dean Herbert
e82cadc811
Make LegacyID nullable
...
The -1 default was getting stored to the database.
2018-03-06 17:40:14 +09:00
Dean Herbert
07bf8549eb
Fix arbitrary API request errors getting identified as timeouts
2018-03-06 17:39:34 +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
naoey
9669c5aee3
Make locally used things local and rename method.
2018-03-06 09:33:15 +05:30
Dean Herbert
90828cca8f
Fix left and right arrows keys in chat overlay not working
...
Misplaced override. Resolves ppy/osu-framework#1444
2018-03-06 08:59:40 +09:00
TocoToucan
697ad63d72
Resolve merge conflicts
2018-03-05 22:24:25 +03:00
Dean Herbert
c4c1b0b6ff
Fix merge regression
2018-03-06 01:39:01 +09:00
Dean Herbert
7b18e8a5ca
Merge branch 'master' into fix-taiko-conversion
2018-03-06 01:16:47 +09:00
Dean Herbert
4aafc2228e
Improve skip button behaviour when mouse buttons are down
2018-03-06 00:53:40 +09:00
Dean Herbert
d115c56742
Avoid using input blocking
2018-03-06 00:27:55 +09:00
Dean Herbert
792a3ac469
SkipButton -> SkipOverlay
2018-03-06 00:10:53 +09:00
Dean Herbert
d1a115f4ec
Merge remote-tracking branch 'upstream/master' into cursor-trail
2018-03-05 23:34:04 +09:00
Dean Herbert
41727509d7
Merge branch 'master' into fix-drumroll-nullref
2018-03-05 22:46:33 +09:00
smoogipoo
2a9fb2c2c6
Make NestedHitObjects lazily-constructed
2018-03-05 21:40:26 +09:00
Dean Herbert
02690e5f25
Move to private implementation
2018-03-05 21:27:37 +09:00
Dean Herbert
0d817e8e98
Merge remote-tracking branch 'ppy/master' into fix-skin-performance
2018-03-05 21:23:18 +09:00
Dan Balasescu
25e2844e49
Merge branch 'master' into storyboard-rewind-support
2018-03-05 21:11:00 +09:00
Dan Balasescu
56550e4dd8
Merge branch 'master' into fix-parallax-during-rewind
2018-03-05 20:39:16 +09:00
Dan Balasescu
65d510baf2
Merge branch 'master' into add-internal-legacy-offsets
2018-03-05 20:27:27 +09:00
Dean Herbert
53edfedfc8
Remove unneeded HighFrequencyMousePosition from GameplayMenuOverlay
2018-03-05 19:43:57 +09:00
Dean Herbert
7d11e55d06
Only block mouse input when the shaded portion of the SkipButton is hovered
2018-03-05 19:43:33 +09:00
Dean Herbert
2003887cc8
Merge branch 'master' into clock-fixes
2018-03-05 17:45:08 +09:00
smoogipoo
d44dc1a4f9
Fix SliderMultiplier/SliderTickRate parsing inaccuracy
2018-03-05 16:01:05 +09:00
smoogipoo
49b8670dfc
Fix beatmap conversion tests not properly constructing decoder
2018-03-05 14:53:57 +09:00
