Commit Graph

10025 Commits

Author SHA1 Message Date
060d80efbe Continue showing progress bar on direct panels when importing
Previously the progrress bar would fade out once downloads completed, which felt unintuitive.
2018-01-22 13:05:07 +09:00
64c32f5715 Merge pull request #1926 from Aergwyn/preview-fixes
Minor preview fixes
2018-01-19 00:12:41 +09:00
250e936099 Merge branch 'master' into preview-fixes 2018-01-19 00:03:47 +09:00
56619ae926 use ternary expression 2018-01-18 15:53:53 +01:00
66c1568fd2 Merge pull request #1934 from peppy/fix-repeat-point-snaking
Fix repeat points not following slider snaking correctly
2018-01-18 23:52:46 +09:00
6908597b95 Fix inverted ternary
See #1935 - repeat index 1 is at the end of the slider, not the start.
2018-01-18 23:44:00 +09:00
46ba2cda10 Remove unused using 2018-01-18 21:19:06 +09:00
1a83770a06 Fix incorrect math 2018-01-18 21:16:15 +09:00
065d2a4887 Add licence header 2018-01-18 21:12:53 +09:00
01ff1584c2 Fix repeat points not following slider snaking correctly 2018-01-18 21:06:47 +09:00
cc6f541374 Merge pull request #1932 from peppy/fix-slider-tick-sample-doubling
Fix slider samples playing twice when additions are present
2018-01-18 20:58:50 +09:00
e2965e1682 Remove unused using 2018-01-18 20:46:57 +09:00
063767e381 Prioritise hit normal
It's always first but not strictly guaranteed anywhere yet.
2018-01-18 20:37:46 +09:00
97884e1d05 Remove unnecessary null checks 2018-01-18 19:57:49 +09:00
b4f2bea37b Fix slider samples playing twice when additions are present 2018-01-18 19:50:26 +09:00
754f3216ab Merge pull request #1928 from peppy/stop-direct-previews
Stop any playing preview when closing the direct overlay
2018-01-18 18:25:30 +09:00
7ceed8b5eb Stop any playing preview when closing the direct overlay
Resolves #1925
2018-01-18 17:28:56 +09:00
65bac6d31a return preview instead of nothing if it exists already
allows listening to it again after reaching the end
2018-01-17 20:36:47 +01:00
f86cb30e47 prevent negative width on progress bar 2018-01-17 20:35:28 +01:00
95a1556376 Merge pull request #1923 from smoogipoo/fix-replays
A lot of fixes to replay playback
2018-01-18 01:36:58 +09:00
864d106635 Merge branch 'master' into fix-replays 2018-01-18 00:49:02 +09:00
afb55b5c43 Merge pull request #1924 from peppy/mute-global-track-when-preview
Mute global track volume when a beatmap preview is playing
2018-01-18 00:48:46 +09:00
a05032779f Remove unneeded event binding 2018-01-18 00:04:33 +09:00
c79603290d Move TriggerChange to LoadComplete() 2018-01-17 21:52:57 +09:00
e7524445ee Use Restart() 2018-01-17 21:33:19 +09:00
54ed608ddb Mute global track volume when a beatmap preview is playing 2018-01-17 21:26:12 +09:00
379688e2f2 Add todo 2018-01-17 20:15:17 +09:00
da22b3ec49 No more sorting 2018-01-17 20:12:39 +09:00
be225eff90 Merge branch 'master' into fix-replays 2018-01-17 18:01:41 +09:00
a01e46bb68 Fix ScoreStore replays not getting users 2018-01-17 17:55:55 +09:00
2ebb3d6e0e Fix ReplayLoader not being treated as having a replay loaded
Player checks for HasReplayLoaded in Player.load(), but the replay is attached in ReplayPlayer.LoadComplete(), which is too late.
2018-01-17 17:37:14 +09:00
da793d91ea Make a testcase for replay vs autoplay 2018-01-17 17:35:27 +09:00
52b48f2b7e Fix replays not correctly considering negative time diffs 2018-01-17 15:23:07 +09:00
18cdd1caac Merge pull request #1919 from smoogipoo/fix-cursor-hiding
Fix cursor not showing in visualtests
2018-01-17 08:20:13 +09:00
87d2cce61d Update framework 2018-01-17 00:47:14 +09:00
5212194e3f Merge remote-tracking branch 'ppy/master' into fix-cursor-hiding 2018-01-17 00:44:42 +09:00
0ee9bcd70c Merge pull request #1920 from peppy/input-queue-code-quality
Simplify some mouse/keyboard handling overrides
2018-01-16 20:52:45 +09:00
06f0f2093c Add a sample way to have local cursors move beyond their bounds 2018-01-16 20:35:39 +09:00
a5415b99ae Visualise the hovered drawabe 2018-01-16 20:35:13 +09:00
5e1cd8ddc4 Apply conditionals directly rather than using an in-between property 2018-01-16 20:34:40 +09:00
e7a0a02466 Don't limit keyboard input based on menu button scale 2018-01-16 20:34:40 +09:00
39af9321cf Remove unnecessary overrides 2018-01-16 20:34:40 +09:00
1174f34489 Update framework post-merge 2018-01-16 20:21:09 +09:00
02564db43f Merge remote-tracking branch 'origin/master' into fix-cursor-hiding 2018-01-16 20:20:47 +09:00
12f14bdaa6 Merge pull request #1901 from UselessToucan/RefactorInputQueues
Store handleability of input separate for keyboard and mouse
2018-01-16 20:20:19 +09:00
9b33499fe7 Merge remote-tracking branch 'upstream/master' into RefactorInputQueues 2018-01-16 20:04:34 +09:00
4f7ccb8d93 Update framework 2018-01-16 18:38:47 +09:00
d8275c4f9b Fix beatmap query not including beatmap files 2018-01-16 18:20:46 +09:00
5edff5c5fc Merge branch 'master' into fix-cursor-hiding 2018-01-16 18:15:22 +09:00
ae10aa4042 Merge pull request #1913 from smoogipoo/fix-event-bindings
Fix DrawableHitObject not binding nested hitobject events
2018-01-16 18:05:22 +09:00