Dan Balasescu
61ba39d89f
Merge branch 'master' into fix-direct-queries
2019-03-12 12:02:17 +09:00
Dan Balasescu
246b214fa6
Merge pull request #4457 from peppy/fix-hold-to-quit
...
Fix HoldForMenuButton getting stuck in a confirming state
2019-03-12 11:58:43 +09:00
Dean Herbert
1be4c7b813
Fix excess newline
2019-03-12 02:23:23 +09:00
Dean Herbert
38e75421ab
Fix HoldForMenuButton getting stuck in a confirming state
...
Closes #4446 .
2019-03-12 02:21:34 +09:00
Dean Herbert
941a72d69a
Fix osu!direct firing excess queries during initial search characters
...
Due to faulty debounce fire logic, a web request would always fire with a single character search, followed by the real search. This caused unwanted delays and display weirdness.
2019-03-12 01:49:47 +09:00
Dan Balasescu
7805b95a1e
Merge pull request #4438 from peppy/extract-slider-tick-creation
...
Extract slider tick creation so it can be shared with osu!catch
2019-03-11 15:01:32 +09:00
Dean Herbert
63fea65c0c
Clarify repeat index
2019-03-11 14:53:21 +09:00
Dean Herbert
489153579a
Add xmldoc and clarify struct variables
2019-03-11 14:36:29 +09:00
Dean Herbert
2029cf93fd
Rename and reuse variables
2019-03-11 14:33:21 +09:00
Dean Herbert
26f78b659b
Merge remote-tracking branch 'upstream/master' into extract-slider-tick-creation
2019-03-11 14:31:12 +09:00
Dean Herbert
61330a690e
Merge pull request #4448 from Joehuu/naming-convention-1
...
Fix file naming on ParticipantCountDisplay
2019-03-10 20:48:34 +09:00
Joehu
0fc6fa7245
Fix file naming on ParticipantCountDisplay
2019-03-09 20:29:56 -08:00
Dean Herbert
312efbdc34
Merge pull request #4440 from peppy/update-framework
...
Update framework
2019-03-08 22:46:43 +09:00
Dean Herbert
10734b774c
Update framework
2019-03-08 20:48:50 +09:00
Dean Herbert
c6194d5487
Merge branch 'master' into extract-slider-tick-creation
2019-03-08 20:40:03 +09:00
Dean Herbert
843a37721d
Merge pull request #4157 from LeNitrous/mod-wind
...
Add "Wind Up" and "Wind Down" mods
2019-03-08 20:32:43 +09:00
Dean Herbert
48e54c84c1
Merge branch 'master' into mod-wind
2019-03-08 20:23:02 +09:00
Dean Herbert
28a1baa07e
Merge branch 'extract-slider-tick-creation' of https://github.com/peppy/osu into extract-slider-tick-creation
2019-03-08 20:13:58 +09:00
Dean Herbert
eadd7ce913
Update catch dfificulty test
...
Likely the result of fixing https://github.com/ppy/osu/issues/4426 .
2019-03-08 20:13:55 +09:00
Dean Herbert
93a999396e
LegacyFinalTick -> LegacyLastTick to match existing variable
2019-03-08 20:13:11 +09:00
Dean Herbert
165a353a83
Add extensive commenting about LegacyLastTick usage
2019-03-08 20:12:48 +09:00
Dean Herbert
f59b9e933e
Merge branch 'master' into extract-slider-tick-creation
2019-03-08 20:00:12 +09:00
Dean Herbert
dd50c5dc1a
Add player test for osu! ruleset
2019-03-08 19:57:39 +09:00
Dean Herbert
355705f0a5
Fix legacy tick handling
2019-03-08 19:57:30 +09:00
Dan Balasescu
a40a0f10bd
Merge pull request #4431 from peppy/gameplay-clock-container
...
Simplify gameplay clock logic with a dedicated container
2019-03-08 16:05:48 +09:00
smoogipoo
d055b248ac
Remove blank line
2019-03-08 15:56:36 +09:00
smoogipoo
7c5ca67691
Merge remote-tracking branch 'origin/master' into gameplay-clock-container
...
# Conflicts:
# osu.Game/Screens/Play/Player.cs
2019-03-08 15:54:15 +09:00
Dan Balasescu
253a37c8a7
Merge pull request #4436 from peppy/fix-non-async-load
...
Fix some non-async load scenarios
2019-03-08 15:49:02 +09:00
Dean Herbert
973f29b765
Apply review
2019-03-08 15:14:57 +09:00
Dan Balasescu
c967875ff6
Merge branch 'master' into fix-non-async-load
2019-03-08 15:14:37 +09:00
smoogipoo
e00702f4e4
Merge remote-tracking branch 'origin/master' into fix-non-async-load
2019-03-08 15:14:14 +09:00
smoogipoo
09b5cf4891
Move sizing to ctor
2019-03-08 15:14:07 +09:00
Dan Balasescu
7bf60934a5
Merge pull request #4418 from peppy/cursor-in-playfield
...
Fix gameplay cursor discrepancies
2019-03-08 15:12:26 +09:00
Dean Herbert
ed8c9bc88a
Merge remote-tracking branch 'upstream/master' into gameplay-clock-container
2019-03-08 15:07:55 +09:00
Dean Herbert
42efea1e06
Apply review
2019-03-08 15:05:45 +09:00
Dean Herbert
a73e3d9700
Move cursor construction to BDL
2019-03-08 15:01:45 +09:00
Dean Herbert
2c98ba1c0c
Split out consumption and creation into two separate code paths
2019-03-08 14:59:45 +09:00
Dean Herbert
3ccc76e18f
Merge remote-tracking branch 'upstream/master' into cursor-in-playfield
2019-03-08 14:50:46 +09:00
Dean Herbert
551380dd42
Extract slider tick creation so it can be shared with osu!catch
2019-03-08 14:46:26 +09:00
Dan Balasescu
398c330934
Merge pull request #4420 from nekodex/fix-roomstate-on-cancel
...
Fix RoomInspector image inadvertently changing when cancelling MP room creation
2019-03-08 14:30:17 +09:00
Dan Balasescu
969d5bcbd0
Merge branch 'master' into fix-roomstate-on-cancel
2019-03-08 14:10:24 +09:00
Dan Balasescu
93ae058681
Merge pull request #4410 from peppy/fix-cursor-in-scale-container
...
Fix menu cursor not displaying outside of gameplay scaling area
2019-03-08 14:06:58 +09:00
Dean Herbert
400514630d
Fix incomplete comment
2019-03-08 12:44:33 +09:00
Dan Balasescu
d1c18c52ab
Merge branch 'master' into fix-cursor-in-scale-container
2019-03-08 12:43:57 +09:00
Dean Herbert
c4cc72cad9
Merge pull request #4437 from peppy/fix-resharper-inspection
...
Fix stuck r# inspection
2019-03-08 12:43:17 +09:00
Jamie Taylor
08fc42f8e9
Merge branch 'master' into fix-roomstate-on-cancel
2019-03-08 12:39:29 +09:00
Dean Herbert
3a634b7d72
Merge pull request #4419 from nekodex/fix-duplicate-bg-sprites
...
Fix UpdateableBeatmapBackgroundSprite not disposing of previously loaded sprites
2019-03-08 12:34:56 +09:00
Dean Herbert
75e94eba35
Merge branch 'master' into gameplay-clock-container
2019-03-08 12:32:48 +09:00
Dean Herbert
345c7f4fa8
Fix test regression
2019-03-08 12:30:52 +09:00
Dean Herbert
5ade51f030
Merge branch 'master' into fix-resharper-inspection
2019-03-08 12:29:56 +09:00
