1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 10:57:27 +08:00
Commit Graph

1152 Commits

Author SHA1 Message Date
smoogipoo
73fac2115a Implement hitobject sample files 2018-07-02 14:20:35 +09:00
Dean Herbert
812929fa05 Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess 2018-07-02 13:10:42 +09:00
smoogipoo
9f85c55915 Merge remote-tracking branch 'origin/master' into legacy-custom-banks 2018-07-02 12:34:51 +09:00
Dean Herbert
98fb2e03c0 Fix rulesets not loading in debug builds after running a release build 2018-07-01 18:03:15 +09:00
Dean Herbert
e12ce3c2a8 Adjust xmldoc 2018-06-29 17:21:55 +09:00
Dean Herbert
098aeabc9e
Merge branch 'master' into catch-scoring 2018-06-29 17:16:14 +09:00
Dean Herbert
c0b65a6a73 Change default IsBonus definition and remove unnecessary overrides 2018-06-29 17:07:08 +09:00
Dean Herbert
0940715631
Merge branch 'master' into catch-scoring 2018-06-29 14:59:15 +09:00
smoogipoo
99068debc4 Split out into separate interface + add xmldocs 2018-06-29 13:24:33 +09:00
Dean Herbert
70a119dde7 Remove unused/duplicate interface 2018-06-29 12:20:53 +09:00
smoogipoo
781095b96b Encapsulate the method to apply SampleControlPoints to SampleInfos 2018-06-28 18:29:07 +09:00
Dean Herbert
b1a3f01212 Fix mania maps not being treated as mania maps in release builds 2018-06-28 17:10:30 +09:00
smoogipoo
80501de4b9 Add legacy slider offsets 2018-06-27 12:09:21 +09:00
Dean Herbert
594cc0d21d
Merge branch 'master' into mania-playfield-inversions 2018-06-25 18:36:23 +09:00
ekrctb
d6084c0b30 Adapt to new input handling changes 2018-06-22 18:10:27 +09:00
Tom Arrow
ad883e087a RulesetContainer<TObject> cannot be derived 2018-06-19 14:31:24 +02:00
Dean Herbert
57011ff13b
Merge branch 'master' into mania-playfield-inversions 2018-06-15 18:33:40 +09:00
smoogipoo
8f7334874c Fix up performance calculators 2018-06-14 16:04:48 +09:00
smoogipoo
b7a06b9594 Restructure of DifficultyCalculator to cleanup mod + attribute handling 2018-06-14 15:32:07 +09:00
smoogipoo
1431ee1867 Remove unused method 2018-06-14 14:46:25 +09:00
Dan Balasescu
0e0e64895a
Merge branch 'master' into mania-step-interval 2018-06-13 13:55:27 +09:00
Dean Herbert
bcfb092e53
Change step to 200 2018-06-12 18:03:45 +09:00
Dean Herbert
ae136e89a4
Merge branch 'master' into ruleset-configs 2018-06-12 13:13:18 +09:00
Dan Balasescu
3981f56157
Merge branch 'master' into exponential-scoring-toggle 2018-06-11 18:34:55 +09:00
Dan Balasescu
78daf1c7ad
Merge branch 'master' into exponential-scoring-toggle 2018-06-11 18:19:33 +09:00
Dan Balasescu
9994c69d58
Merge branch 'master' into fix-object-ordering 2018-06-11 17:53:33 +09:00
smoogipoo
b51e714ae5 Fix xmldoc 2018-06-11 15:44:59 +09:00
smoogipoo
563a2667d3 Merge branch 'ruleset-configs' into mania-playfield-inversions 2018-06-11 15:08:48 +09:00
smoogipoo
14b7530994 Use a global ruleset config cache 2018-06-11 15:07:42 +09:00
smoogipoo
be01dbae3a Move ruleset dependency caching to CreateLocalDependencies
In some cases we may want to refer to the cached configmanager dependency from subclasses. This prevents injection errors when doing so.
2018-06-11 15:07:29 +09:00
smoogipoo
f49b7d6e16 Add mania direction to settings 2018-06-11 14:36:19 +09:00
smoogipoo
93696fb5e5 Merge branch 'ruleset-configs' into mania-playfield-inversions
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-06-11 13:46:39 +09:00
smoogipoo
4fb6a8627e Merge remote-tracking branch 'origin/master' into mania-playfield-inversions 2018-06-11 13:45:47 +09:00
smoogipoo
f4fbf27d42 Give ruleset settings a ruleset-specific config manager 2018-06-11 13:28:50 +09:00
smoogipoo
eca016ec6c Move ruleset config managers to Ruleset 2018-06-11 13:17:08 +09:00
smoogipoo
22e8a0bb6e Make ruleset config manager variants nullable 2018-06-11 13:13:36 +09:00
smoogipoo
63ec36b3be Explicitly handle null settings case + add annotations 2018-06-11 12:57:56 +09:00
smoogipoo
b219c17115 Move dependency creation under ctor 2018-06-11 12:57:26 +09:00
Crusensis
fbc0cd6f5f Split AffectsCombo into IsBonus 2018-06-09 18:14:33 -07:00
Dean Herbert
86fb9666b2 Rename "Exponential" to "Classic" 2018-06-10 01:45:05 +09:00
Dean Herbert
cc37a355d2 Add comment about matching stable scoring
Also updated equation to be close to what is expected
2018-06-10 01:44:46 +09:00
Dean Herbert
aaa65c428f
Merge branch 'master' into diffcalc-modtypes 2018-06-09 23:35:17 +09:00
Dean Herbert
9bdb3113ce Revert "Always update children when ruleset input manager is updated"
This reverts commit 4eb7a34944.
2018-06-08 21:05:28 +09:00
smoogipoo
2a48e0e44a Fix sequential speed change visualiser not working with 0 control points 2018-06-08 15:11:43 +09:00
Dean Herbert
0b4f5af52e Add setting to toggle standardised or exponential scoring display
Also adjusts exponential scoring to be closer to stable. Log wasn't cutting it.
2018-06-08 03:17:12 +09:00
Dean Herbert
2c25e5e8da
Merge branch 'master' into mania-step-interval 2018-06-07 20:26:33 +09:00
smoogipoo
55a5dfa9b6 Add column testcase 2018-06-07 20:24:33 +09:00
smoogipoo
55475d129f Merge remote-tracking branch 'origin/master' into mania-mask-container
# Conflicts:
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
2018-06-07 19:19:20 +09:00
smoogipoo
485026da6f Merge remote-tracking branch 'origin/master' into mania-mask-container
# Conflicts:
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
2018-06-07 15:32:31 +09:00
Dean Herbert
5e9a1961cb Greatly increase the playfield scroll speed adjust step
It was so small previously that I believe many people didn't even realise it was working.
2018-06-07 14:35:33 +09:00
smoogipoo
72cc53aded Rename GameBeatmap -> BindableBeatmap 2018-06-06 20:16:20 +09:00
smoogipoo
4086ff7313 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
#	osu.Game/Screens/Menu/Intro.cs
#	osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
smoogipoo
83ff47ec80 Rewrite difficulty mod combinations 2018-06-06 16:20:17 +09:00
Dean Herbert
3567823759 Reverse order of exposed objects in HitObjectContainer
Closes #2740.
2018-06-06 15:03:47 +09:00
Dean Herbert
d3cd267036 Formatting fixes 2018-06-06 14:20:51 +09:00
smoogipoo
e19ca0c120 Add nomod mod type 2018-06-06 14:08:02 +09:00
smoogipoo
8274623ad6 Cleanup multi mod constructions 2018-06-06 14:07:50 +09:00
Dean Herbert
a5679f7bf5 Improve readability of code 2018-06-06 14:04:20 +09:00
Dean Herbert
ee92986494
Merge branch 'master' into osu-hd-setting 2018-06-06 12:09:12 +09:00
Dean Herbert
26569b434c
Merge branch 'master' into fix-replay-updates 2018-06-06 09:40:46 +09:00
Dean Herbert
4b604bf055
Merge branch 'master' into disallow-beatmap-change 2018-06-04 10:53:04 +09:00
smoogipoo
2ccffb9ac4 Add difficulty calculation mod types 2018-06-03 10:59:56 +09:00
Dean Herbert
88628812c6 Logexceptions when loading ruleset DLLs 2018-06-03 00:28:29 +09:00
smoogipoo
4eb7a34944 Always update children when ruleset input manager is updated 2018-05-31 18:02:10 +09:00
Dean Herbert
2f21b9c4ea Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits 2018-05-31 12:36:37 +09:00
Dean Herbert
7f0cb0bbf6 Add key bindings for scroll speed
Closes #2689.
- [ ] Depends on ppy/osu-framework#1569 being fixed.
2018-05-31 12:10:53 +09:00
smoogipoo
8004b8af4d Privatise the OsuGame beatmap, add local beatmap to OsuTestCase 2018-05-23 17:38:02 +09:00
Vidalee
7a31986812 resolving the lost code problem 2018-05-22 22:39:55 +02:00
Vidalee
08e423ac5b code sanity 2018-05-22 21:35:17 +02:00
Vidalee
50e2871c89 why this line was ommited 2018-05-22 21:29:41 +02:00
AlFasGD
44cf2aa7a3 Sync changes on composition tools 2018-05-22 09:00:11 +03:00
AlFasGD
61a18b952f Remove useless things 2018-05-21 23:24:10 +03:00
AlFasGD
d504a44dfb Implement mask layering (incomplete) 2018-05-21 23:08:04 +03:00
Dean Herbert
5ec349de78 Reorder methods and remove useless comments 2018-05-21 15:59:33 +09:00
Dean Herbert
f53164843d Reduce spacing changes 2018-05-21 15:56:02 +09:00
Dean Herbert
cea935ea40
Merge branch 'master' into osu-hd-setting 2018-05-21 15:21:09 +09:00
Dean Herbert
92668f07e0
Merge branch 'master' into drawable-room-improvements 2018-05-21 11:09:12 +09:00
Dean Herbert
6c00046835
Merge branch 'master' into mania-performance-calculator 2018-05-18 12:34:49 +09:00
Dean Herbert
8e784d9104
Merge branch 'master' into fix-conversion-hitwindows 2018-05-18 11:59:16 +09:00
Vidalee
2492e34d3f
resolving codefactor styling issues 2018-05-17 19:44:09 +02:00
Vidalee
6a1abf4084
Merge branch 'master' into osu-hd-setting 2018-05-17 19:39:17 +02:00
smoogipoo
43cdbec0a3 Fix hold note hitwindow lenience 2018-05-17 13:59:04 +09:00
smoogipoo
f67d263596 Move ruleset-specific hitwindows to post-converted hitobjects 2018-05-17 13:35:15 +09:00
smoogipoo
397d93660a Don't deep-clone beatmapinfo/control points 2018-05-17 13:17:33 +09:00
smoogipoo
c67f372560 Don't create nested hitobjects unless absolutely required 2018-05-17 12:29:33 +09:00
smoogipoo
de63a1b578 Remove construction of new ruleset 2018-05-16 01:43:58 +09:00
smoogipoo
3f67d04429 Cap CS to 10 also 2018-05-15 21:57:08 +09:00
smoogipoo
4101b8ddde Merge remote-tracking branch 'origin/master' into more-diffcalc-improvements 2018-05-15 21:31:58 +09:00
smoogipoo
1acfc1bbab Fix ModHardRock not properly clamping Drain/OD 2018-05-15 21:25:20 +09:00
Dean Herbert
6bf1092c7d
Merge branch 'master' into enable-distance-overflow 2018-05-15 18:56:51 +09:00
Dean Herbert
0e0cc8bb69
Merge branch 'master' into namespace-cleanup 2018-05-15 18:10:48 +09:00
smoogipoo
995fda9b6f Move base classes to osu.Game.Rulesets.Difficulty namespace 2018-05-15 17:38:08 +09:00
Dean Herbert
e39af1c906
Merge branch 'master' into convert-object-hitwindows 2018-05-15 17:33:27 +09:00
Dean Herbert
6d87ff2595
Merge branch 'master' into enable-distance-overflow 2018-05-15 16:18:17 +09:00
smoogipoo
1ee68c1c54 Make LegacyScoreParser abstract 2018-05-15 15:28:46 +09:00
smoogipoo
fe2ea17e7f Allow subclasses of LegacyScoreParser to specify beatmap/ruleset retrieval 2018-05-15 11:42:40 +09:00
smoogipoo
47cf4f27fb Fix possibility of test rulesets being discovered from assemblies 2018-05-14 19:39:23 +09:00
smoogipoo
f5068804d5 Re-enable slider distance overflow
Fixes #2467.
2018-05-14 15:14:29 +09:00
smoogipoo
a81921118d Strip whitespaces 2018-05-14 11:54:11 +09:00
smoogipoo
6e1d651087 Merge remote-tracking branch 'origin/master' into convert-object-hitwindows 2018-05-14 11:17:39 +09:00
smoogipoo
e1b8a1589b Fix TimeRate not being considered for performance calculation 2018-05-14 11:15:14 +09:00
DrabWeb
518dec0c68 Merge https://github.com/ppy/osu into drawable-room-improvements 2018-05-11 13:41:50 -03:00
smoogipoo
7e7a5f8964 Fix score accuracy not being populated 2018-05-11 21:49:10 +09:00
smoogipoo
8ca67f63ec Fix score statistics not being read 2018-05-11 21:49:06 +09:00
smoogipoo
97a523584d Make HitWindows not return null by default 2018-05-11 15:52:51 +09:00
smoogipoo
bfad101d17 Standardise naming 2018-05-11 15:42:34 +09:00
smoogipoo
5245d2d426 Add info about when CreateHitWindows is invoked 2018-05-11 15:36:53 +09:00
smoogipoo
8563291796 Add convert mania HitWindows 2018-05-11 15:32:00 +09:00
smoogipoo
c052ee71c1 Add convert osu HitWindows 2018-05-11 15:31:36 +09:00
smoogipoo
9c65d347ba Add convert taiko HitWindows 2018-05-11 15:31:12 +09:00
smoogipoo
8216bc311a Restructure HitWindows to allow outside setting 2018-05-11 15:30:26 +09:00
smoogipoo
73465c35fa Merge remote-tracking branch 'origin/master' into ruleset-beatmap-statistics
# Conflicts:
#	osu.Game/Beatmaps/Beatmap.cs
2018-05-11 14:05:40 +09:00
DrabWeb
ec53927d8e Add selection to DrawableRoom. 2018-05-10 22:48:07 -03:00
Dean Herbert
8a6ef0dabb
Merge branch 'master' into beatmap-conversion-rework 2018-05-10 19:10:07 +08:00
Dean Herbert
9e26bcd571 Merge remote-tracking branch 'upstream/master' into smoogipoo-i-beatmap 2018-05-10 19:51:52 +09:00
Vidalee
16bcd6c3ed
Appvtests (#1)
* Resolving AppVeyor's errors
2018-05-08 14:33:26 +02:00
smoogipoo
5489976c20 Implement ruleset-specific beatmap statistics 2018-05-07 15:51:08 +09:00
smoogipoo
db3e48c194 Rename GetBeatmap() to GetPlayableBeatmap() 2018-05-07 10:40:30 +09:00
smoogipoo
9128e64c9a Rename OriginalBeatmap back to Beatmap 2018-05-07 10:29:38 +09:00
smoogipoo
4ecdea8b2e Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer 2018-05-07 10:17:54 +09:00
smoogipoo
77e661489d Merge branch 'i-beatmap' into beatmap-conversion-rework 2018-05-07 10:00:24 +09:00
smoogipoo
1aefd71b65 Merge remote-tracking branch 'origin/master' into i-beatmap 2018-05-07 09:58:53 +09:00
smoogipoo
f3aa9269ff Fix mania-specific beatmap conversion 2018-05-07 09:17:12 +09:00
Vidalee
c4e45e30ef Solving conflict 2018-05-06 13:18:12 +02:00
Vidalee
d36d9643eb Missed one white space.. I guess my editor wasn't properly configured
for this file
2018-05-06 13:09:46 +02:00
Vidalee
af85102277 Should be ok now 2018-05-06 13:04:20 +02:00
Vidalee
008daf9a07 White space trimmed 2018-05-06 12:57:52 +02:00
Vidalee
095f6e1530 Code sanity 2018-05-06 12:49:15 +02:00
Vidalee
393c01ba90 Made the changes requested 2018-05-06 12:38:25 +02:00
Vidalee
1c1d58e2cb
Merge branch 'master' into osu-hd-setting 2018-05-06 12:23:12 +02:00
smoogipoo
2d6b2d10f7 Use bindable transforms 2018-05-02 18:26:23 +09:00
Adonais Romero González
06c6f55995 Apply offset to end times on legacy converter 2018-04-30 00:43:32 -07:00
Dean Herbert
76e58a51b9 Merge remote-tracking branch 'upstream/master' into Vidalee-osu-hd-setting 2018-04-25 17:28:21 +09:00
Dean Herbert
dce569c9be
Merge branch 'master' into fix-overlapping-speedchanges 2018-04-20 15:36:28 +09:00
smoogipoo
11b943c820 ComputePositions -> UpdatePositions 2018-04-20 14:22:48 +09:00
smoogipoo
52e3ffff30 Add some more commenting to lifetime calculation 2018-04-20 14:20:16 +09:00
smoogipoo
f3fddcc82c Reorder parameter for consistency 2018-04-20 14:20:04 +09:00
smoogipoo
48b421b4b4 Add comments to SequentialSpeedChangeVisualiser 2018-04-20 14:16:30 +09:00
smoogipoo
1bab601cbc Comments + xmldocs 2018-04-20 13:51:36 +09:00
smoogipoo
03a5df84c6 Initial rework of beatmap conversion process 2018-04-19 22:04:12 +09:00
smoogipoo
66b3b295e7 Use IBeatmap wherever possible 2018-04-19 20:44:38 +09:00
tgi74000
9b36cf2066 Review changes 2018-04-16 14:14:40 +02:00
smoogipoo
ea0683adb2 Fix hitobject lengths not being calculated for overlapping speed changes
Fixes #2359
2018-04-16 20:34:59 +09:00
tgi74000
73ba8e1c87 CI: remove unused directive 2018-04-13 16:10:01 +02:00
tgi74000
b23b0a445b Add support for replay mods 2018-04-13 15:41:35 +02:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
smoogipoo
fbc50d6030 Merge master into editor-clock 2018-04-12 13:35:53 +09:00
smoogipoo
248be8e35f HitObjectComposer no longer needs a beat divisor 2018-04-06 18:21:45 +09:00
smoogipoo
c7abd56fc4 Give editor a custom clock to handle seeking 2018-04-06 18:11:37 +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
Dan Balasescu
b5d7a5df00
Merge branch 'master' into colours-for-judgements 2018-04-04 15:02:03 +09:00
Dean Herbert
ddba7254ca Merge remote-tracking branch 'upstream/master' into linq 2018-04-03 13:05:08 +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
Joseph Madamba
ee14ca7cc5
Merge branch 'master' into score-multiplier-edits 2018-03-31 10:43:58 -07:00
Ali Rizvi
7fed8d64de Implement Judgement Colours 2018-03-31 04:59:08 +09:00
Dan Balasescu
824201336a
Merge branch 'master' into hr-on-mania-is-unranked 2018-03-30 16:35:00 +09:00
Joseph Madamba
0887dafa2c Revert changes on hard rock mod 2018-03-29 20:36:52 -07:00
smoogipoo
187a025d36 Make hitobjects sorted by their start times 2018-03-29 16:07:31 +09:00
Joseph Madamba
af9e3a849f
Merge branch 'master' into score-multiplier-edits 2018-03-28 20:42:35 -07:00
Joseph Madamba
78a7564acd Score multiplier edits 2018-03-24 16:00:18 -07:00
Dean Herbert
0e669c9a3f Fix many warnings 2018-03-24 18:23:22 +09:00
smoogipoo
c29f7a4333 Merge remote-tracking branch 'origin/master' into netstandard 2018-03-24 14:49:46 +09:00
Joseph Madamba
f77dad2809
Add perfect mod icon 2018-03-22 22:49:14 -07:00
Dean Herbert
92d8781bf0
Merge branch 'master' into beat-snap-divisor 2018-03-22 20:14:50 +09:00
Dean Herbert
af65f2dd48 Move AccentColour changes local to rulesets which rely on it 2018-03-22 18:53:16 +09:00
Dean Herbert
366b7fca65 Remove GetColour method 2018-03-22 18:50:19 +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
78a8f60b39 IHasComboIndex -> IHasComboInformation 2018-03-22 12:35:17 +09:00
Dean Herbert
1a782a840c Fix xmldoc 2018-03-22 12:34:29 +09:00
Vidalee
87b9ffced2 added description of the IReadFromConfig interface 2018-03-20 21:51:05 +01:00
Dean Herbert
9ad4e9284a Add skin source fallback chain 2018-03-20 16:40:11 +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
b1d09500f2 Integrate beat snap divisor into editor seeking 2018-03-19 20:42:06 +09:00
smoogipoo
e25d1f6982 Pass down editor clocks through DI 2018-03-19 16:27:52 +09: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
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
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
c8f6a6980b Move clock construction to Editor 2018-03-15 17:27:37 +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
a42035f494 Make DrawableHitObject a CompositeDrawable
No reason for it to be a container.
2018-03-15 13:41:06 +09:00
Vidalee
92b47d87ba makes more sense but not fixed 2018-03-14 23:14:03 +01:00
smoogipoo
0da3ae0944 Add some basic tests + fixes to seek/seekforward functionality 2018-03-14 20:52:48 +09: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
Joseph Madamba
d122aa80e4
Edit mods description, multiplier, and code 2018-03-13 20:07:03 -07:00
smoogipoo
e2dc9a975a Merge branch 'master' into editor-wheel-movement 2018-03-14 11:39:02 +09:00
smoogipoo
299de4b866 Rewrite seeking to better handle timing point boundaries 2018-03-13 16:54:34 +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
Dean Herbert
107ad8cfff Merge remote-tracking branch 'FreezyLemon/master' into more-skinning 2018-03-12 22:01:59 +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
Dean Herbert
eb643b690a
Merge branch 'master' into more-skinning 2018-03-12 11:55:50 +09:00
Dean Herbert
c70be29eda Move legacy conversion to LegacySkin 2018-03-12 11:30:13 +09:00
Dean Herbert
d27cf16bf9 Merge remote-tracking branch 'ppy/master' into more-skinning 2018-03-12 10:46:37 +09:00
Dan Balasescu
8ba87dfdbd
Merge branch 'master' into fix-duplicate-judgements 2018-03-12 10:29:50 +09:00
Vidalee
6d9e78a3a3 Review changes 2018-03-11 22:40:49 +01:00
Vidalee
802a6870c4 Chesterton's fence 2018-03-11 22:09:16 +01:00
Vidalee
6a8bc067cd Add license header 2018-03-11 21:30:48 +01:00
HoLLy
9c75c392f2 Only check by null instead of sign 2018-03-11 21:27:49 +01:00
Vidalee
ea6434a7a0 Why this line got deleted 🤔 2018-03-11 21:19:34 +01:00
Vidalee
eed0f3a1de Added setting to not hide the first object in Hidden mod 2018-03-11 21:02:14 +01:00
HoLLy
a321bcf3af Fix check against LegacyID for non-default rulesets 2018-03-11 20:19:03 +01: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
Dean Herbert
217dd2ecdc Initial push for better decoders 2018-03-09 21:24:15 +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
e82cadc811 Make LegacyID nullable
The -1 default was getting stored to the database.
2018-03-06 17:40:14 +09:00
smoogipoo
2a9fb2c2c6 Make NestedHitObjects lazily-constructed 2018-03-05 21:40:26 +09:00
Dean Herbert
2003887cc8
Merge branch 'master' into clock-fixes 2018-03-05 17:45:08 +09:00
Dean Herbert
8273288048 Add xmldoc 2018-03-04 02:12:45 +09:00
Dean Herbert
0e928429d4
Merge branch 'master' into ruleset-replayframes 2018-03-04 01:57:43 +09:00
Dean Herbert
0b2cbf88bb
Merge branch 'master' into clock-fixes 2018-03-02 22:18:32 +09:00
Dean Herbert
bd510e5356 Merge remote-tracking branch 'upstream/master' into clock-fixes 2018-03-02 21:01:53 +09:00
smoogipoo
8a15d4e677 Fix linear perfect-curves not being cased to CurveType.Linear
Fixes #2151.
2018-03-02 18:21:40 +09:00
Dean Herbert
c54c1699bf
Merge branch 'master' into ruleset-replayframes 2018-03-01 22:26:16 +09:00
smoogipoo
d5d4bcb558 Merge branch 'master' into editor-hitobject-overlays 2018-03-01 14:04:38 +09:00
smoogipoo
e869f7d05b Fix converted frames not getting time values 2018-03-01 02:28:15 +09:00
smoogipoo
fb16c3db87 Privatise CurrentTime's setter 2018-03-01 02:28:14 +09:00
smoogipoo
19911193cf Minify LegacyReplayFrame 2018-03-01 02:28:14 +09:00
smoogipoo
cf42d5bbd5 Remove mostly-unused Score parameter 2018-03-01 02:28:14 +09:00
smoogipoo
c9c65cab53 CreateReplayFrame -> CreateConvertibleReplayFrame 2018-03-01 02:28:14 +09:00
smoogipoo
ab4d7fa46e Remove IScoreParser interface
It's too early for this.
2018-03-01 02:28:14 +09:00
smoogipoo
a3c7755ade Implement a conversion process for ReplayFrames 2018-03-01 02:28:14 +09:00
Dean Herbert
01fcf9c813 Update in line with framework changes 2018-02-28 22:01:48 +09:00
Dean Herbert
5b4fef0180 Add bare minimum sanity checking of beatmap input values to make broken maps load
Resolves ppy/osu#1988.
2018-02-28 18:12:24 +09:00
Dean Herbert
cff17f1864 Update in line with inverse ShoudProcessClock default 2018-02-27 17:23:38 +09:00
Dean Herbert
73fb185132 Change the way ShouldProcessClock is specified in line with framework changes 2018-02-27 17:23:38 +09:00