Shawdooow
|
f0dbf2e18c
|
Merge remote-tracking branch 'refs/remotes/ppy/master'
|
2018-01-19 11:04:17 -05:00 |
|
為什麼
|
feb79ff9e7
|
Merge branch 'master' into mania_stage_fix
|
2018-01-19 20:08:24 +08:00 |
|
Dean Herbert
|
652f273961
|
Ensure previews stop playing when they are removed from the draw hierarchy
|
2018-01-19 15:46:42 +09:00 |
|
Dan Balasescu
|
64c32f5715
|
Merge pull request #1926 from Aergwyn/preview-fixes
Minor preview fixes
|
2018-01-19 00:12:41 +09:00 |
|
Dan Balasescu
|
250e936099
|
Merge branch 'master' into preview-fixes
|
2018-01-19 00:03:47 +09:00 |
|
Aergwyn
|
56619ae926
|
use ternary expression
|
2018-01-18 15:53:53 +01:00 |
|
Dan Balasescu
|
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 |
|
smoogipoo
|
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 |
|
Dan Balasescu
|
46ba2cda10
|
Remove unused using
|
2018-01-18 21:19:06 +09:00 |
|
Dean Herbert
|
1a83770a06
|
Fix incorrect math
|
2018-01-18 21:16:15 +09:00 |
|
Dean Herbert
|
065d2a4887
|
Add licence header
|
2018-01-18 21:12:53 +09:00 |
|
Dean Herbert
|
01ff1584c2
|
Fix repeat points not following slider snaking correctly
|
2018-01-18 21:06:47 +09:00 |
|
Dan Balasescu
|
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 |
|
Dean Herbert
|
e2965e1682
|
Remove unused using
|
2018-01-18 20:46:57 +09:00 |
|
Dean Herbert
|
063767e381
|
Prioritise hit normal
It's always first but not strictly guaranteed anywhere yet.
|
2018-01-18 20:37:46 +09:00 |
|
Dean Herbert
|
97884e1d05
|
Remove unnecessary null checks
|
2018-01-18 19:57:49 +09:00 |
|
Dean Herbert
|
b4f2bea37b
|
Fix slider samples playing twice when additions are present
|
2018-01-18 19:50:26 +09:00 |
|
smoogipoo
|
a94ea7025e
|
Register/Unregister -> BeginTracking/StopTracking and add exceptions
|
2018-01-18 18:45:48 +09:00 |
|
Dan Balasescu
|
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 |
|
smoogipoo
|
dee298c395
|
No more statics + better unregistration
|
2018-01-18 17:40:05 +09:00 |
|
Dean Herbert
|
7ceed8b5eb
|
Stop any playing preview when closing the direct overlay
Resolves #1925
|
2018-01-18 17:28:56 +09:00 |
|
smoogipoo
|
89f4bfa7b5
|
Track mania scroll speed
|
2018-01-18 17:00:41 +09:00 |
|
smoogipoo
|
7910b47868
|
Move ConfigManager registration/dependency injection to RulesetContainer
|
2018-01-18 17:00:23 +09:00 |
|
smoogipoo
|
c2c478750d
|
Remove generics from OSD registration methods
|
2018-01-18 16:57:32 +09:00 |
|
smoogipoo
|
09dfea7e29
|
Use tracked settings from ConfigManager changes
|
2018-01-18 15:26:03 +09:00 |
|
Aergwyn
|
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 |
|
Aergwyn
|
f86cb30e47
|
prevent negative width on progress bar
|
2018-01-17 20:35:28 +01:00 |
|
ANDY840119-PC\andy840119
|
6c67f96fdb
|
fix ci error
|
2018-01-18 02:01:01 +09:00 |
|
Dean Herbert
|
95a1556376
|
Merge pull request #1923 from smoogipoo/fix-replays
A lot of fixes to replay playback
|
2018-01-18 01:36:58 +09:00 |
|
Dean Herbert
|
864d106635
|
Merge branch 'master' into fix-replays
|
2018-01-18 00:49:02 +09:00 |
|
Dan Balasescu
|
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 |
|
smoogipoo
|
a05032779f
|
Remove unneeded event binding
|
2018-01-18 00:04:33 +09:00 |
|
ANDY840119-PC\andy840119
|
3b291abf60
|
Merge branch 'master' of https://github.com/ppy/osu into mania_stage_fix
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
# osu.Game/Rulesets/UI/Playfield.cs
|
2018-01-17 22:27:32 +09:00 |
|
smoogipoo
|
c79603290d
|
Move TriggerChange to LoadComplete()
|
2018-01-17 21:52:57 +09:00 |
|
Dean Herbert
|
e7524445ee
|
Use Restart()
|
2018-01-17 21:33:19 +09:00 |
|
Dean Herbert
|
54ed608ddb
|
Mute global track volume when a beatmap preview is playing
|
2018-01-17 21:26:12 +09:00 |
|
smoogipoo
|
db27faa471
|
Add a ScrollTime config setting to osu!mania
|
2018-01-17 21:13:14 +09:00 |
|
smoogipoo
|
d96234bf40
|
Enforce that there's only one configmanager per ruleset
|
2018-01-17 21:08:23 +09:00 |
|
smoogipoo
|
92da02db87
|
Add extension to filename
|
2018-01-17 21:07:37 +09:00 |
|
smoogipoo
|
9f4ebad6e3
|
Add mania config manager
|
2018-01-17 20:21:25 +09:00 |
|
smoogipoo
|
379688e2f2
|
Add todo
|
2018-01-17 20:15:17 +09:00 |
|
smoogipoo
|
da22b3ec49
|
No more sorting
|
2018-01-17 20:12:39 +09:00 |
|
smoogipoo
|
0b7e1ce667
|
Add a way to have ruleset-specific configs
|
2018-01-17 19:45:18 +09:00 |
|
Dan Balasescu
|
be225eff90
|
Merge branch 'master' into fix-replays
|
2018-01-17 18:01:41 +09:00 |
|
smoogipoo
|
a01e46bb68
|
Fix ScoreStore replays not getting users
|
2018-01-17 17:55:55 +09:00 |
|
smoogipoo
|
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 |
|
smoogipoo
|
da793d91ea
|
Make a testcase for replay vs autoplay
|
2018-01-17 17:35:27 +09:00 |
|
smoogipoo
|
52b48f2b7e
|
Fix replays not correctly considering negative time diffs
|
2018-01-17 15:23:07 +09:00 |
|
Dean Herbert
|
18cdd1caac
|
Merge pull request #1919 from smoogipoo/fix-cursor-hiding
Fix cursor not showing in visualtests
|
2018-01-17 08:20:13 +09:00 |
|
Dean Herbert
|
87d2cce61d
|
Update framework
|
2018-01-17 00:47:14 +09:00 |
|