Commit Graph

10103 Commits

Author SHA1 Message Date
68a6323168 Remove SpecialColumnPosition for now
This needs to be re-implemented in the future, perhaps in a way that allows it to be dynamically changed.
2018-01-22 16:19:05 +09:00
8a8b3f25e7 SpecialColumn -> SpecialColumnPosition 2018-01-22 16:12:45 +09:00
351be4308f Oops, forgot to commit OnJudgement change 2018-01-22 16:12:35 +09:00
90d8ee8d36 Fix stage background being too transparent
This is the original colour for the background. Not sure why this was changed.
2018-01-22 16:12:15 +09:00
3d36fd3676 Update xmldoc to be more descriptive of single/dual stages 2018-01-22 16:11:26 +09:00
0ef6384de0 Fix hitexplosions not working in the testcase 2018-01-22 16:11:06 +09:00
c1331cef1b Disallow DualStages for non-converted beatmaps 2018-01-22 15:52:54 +09:00
ba58b25f01 Fix showing too many keybindings 2018-01-22 15:47:31 +09:00
1350b68f15 DualStages always doubles the column count in lazer 2018-01-22 15:18:39 +09:00
eede8333ba getVariantType -> getPlayfieldType 2018-01-22 15:18:11 +09:00
17d75b349d Dual stages is not ranked ಠ_ಠ 2018-01-22 15:11:45 +09:00
77c4da5f0f KeyCoop -> DualStages 2018-01-22 15:11:15 +09:00
583aa9922f IKeyBindingMod -> IPlayfieldTypeMod 2018-01-22 15:07:14 +09:00
65a2e09593 Privatise VariantMappingGenerator to ManiaRuleset 2018-01-22 15:03:05 +09:00
2674859b54 ManiaKeyBindingVariantType -> PlayfieldType 2018-01-22 14:59:17 +09:00
286b1bb81f Solo -> Single, Coop -> Dual 2018-01-22 14:57:25 +09:00
3b47c0fea0 Remove versus-mode variant 2018-01-22 14:54:47 +09:00
293023d99a Fix keybinding offsets due to special keys 2018-01-22 14:38:41 +09:00
feb79ff9e7 Merge branch 'master' into mania_stage_fix 2018-01-19 20:08:24 +08: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
6c67f96fdb fix ci error 2018-01-18 02:01:01 +09: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
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
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