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 |
|
Dean Herbert
|
bdd88303b3
|
Merge branch 'master' into editor-hitobject-overlays
|
2018-02-26 17:53:50 +09:00 |
|
Dean Herbert
|
9cbed461c4
|
Merge branch 'master' into sliderbody-rework
|
2018-02-26 15:00:18 +09:00 |
|
Dean Herbert
|
4a52df2dd4
|
Apply review
|
2018-02-24 23:07:02 +09:00 |
|
Dean Herbert
|
768e0a4e2a
|
Add SkinnableSound class
Tidy things up, move logic out of SampleInfo.
|
2018-02-24 22:47:14 +09:00 |
|
smoogipoo
|
066abfbdbc
|
Rename PositionAt -> CurvePositionAt to represent its new meaning
|
2018-02-24 02:43:36 +09:00 |
|
smoogipoo
|
8c90abe0dc
|
Make slider control points relative to start position
|
2018-02-23 20:59:27 +09:00 |
|
smoogipoo
|
278b25bcbd
|
Fix border being the wrong size
|
2018-02-23 15:29:56 +09:00 |
|
smoogipoo
|
d72290ee24
|
Make ScaledContainer private
|
2018-02-23 15:06:08 +09:00 |
|
Dean Herbert
|
6ceabfe19e
|
Add basic hitsound skinning
|
2018-02-23 13:38:12 +09:00 |
|
smoogipoo
|
0cdf6fa7e2
|
Make HitObjectOverlay into an OverlayContainer
|
2018-02-22 14:36:58 +09:00 |
|
smoogipoo
|
45c579630d
|
Make selectionLayer handle input below object overlays
|
2018-02-22 14:34:37 +09:00 |
|
Dan Balasescu
|
6cc54a464c
|
Merge branch 'master' into editor-hitobject-overlays
|
2018-02-22 14:25:27 +09:00 |
|
smoogipoo
|
07252254eb
|
Fix post-merge issues
|
2018-02-22 14:22:04 +09:00 |
|
smoogipoo
|
99e9eb81f2
|
Merge remote-tracking branch 'origin/master' into editor-hitobject-overlays
|
2018-02-22 14:16:01 +09:00 |
|
Dean Herbert
|
a3336f2577
|
Merge branch 'master' into fix-editor-osu-scale
|
2018-02-22 14:14:41 +09:00 |
|
smoogipoo
|
ded2644df8
|
Merge branch 'master' into editor-hitobject-overlays
|
2018-02-22 14:08:36 +09:00 |
|
Dean Herbert
|
7c942eb592
|
Tidy up layer container logic
|
2018-02-22 13:42:36 +09:00 |
|
Dean Herbert
|
b74cfffc6f
|
Merge branch 'master' into editor-hitobject-movement
|
2018-02-22 13:19:39 +09:00 |
|
smoogipoo
|
5faec5c2f1
|
Add a separate property to control playfield area
|
2018-02-21 20:54:33 +09:00 |
|
smoogipoo
|
6757be2007
|
Fix incorrect RelativeChildSize in Catch
|
2018-02-21 20:15:51 +09:00 |
|
smoogipoo
|
f012cce668
|
Rewrite some xmldocs to make methods easier to understand
|
2018-02-21 17:33:22 +09:00 |
|
smoogipoo
|
4934ef7429
|
Add playfield aspect ratio + scaling modifications to composer layers
|
2018-02-21 11:07:42 +09:00 |
|
smoogipoo
|
7fd7dc1538
|
Extract playfield scaling into a separate class
And make it more general.
|
2018-02-21 11:07:42 +09:00 |
|
Dean Herbert
|
ba10eb5e50
|
Merge branch 'master' into osu-rulesetcontainer-aspect
|
2018-02-21 10:13:44 +09:00 |
|
smoogipoo
|
7fe0989427
|
Merge branch 'general-slider-improvements' into editor-hitobject-overlays
|
2018-02-20 23:51:47 +09:00 |
|
smoogipoo
|
ad2f556133
|
Add hitobject overlays to selected hitobjects
|
2018-02-20 18:01:45 +09:00 |
|
smoogipoo
|
2a5bfdb4b8
|
Deselect hitobjects that are now not in the selection quad
|
2018-02-20 15:06:51 +09:00 |
|
smoogipoo
|
2f4925d031
|
Add some xmldocs
|
2018-02-20 15:06:14 +09:00 |
|
smoogipoo
|
285df52f43
|
Encapsulate logic for selecting/deselecting further
|
2018-02-20 14:54:45 +09:00 |
|
smoogipoo
|
995ecb7d94
|
Make selectedHitObjects into a HashSet for quick Contains checks
|
2018-02-20 14:48:35 +09:00 |
|
smoogipoo
|
87065a0b13
|
Rename + publicise DeselectAll
|
2018-02-20 14:38:57 +09:00 |
|
smoogipoo
|
423fe4eba8
|
Combine border radiuses of selection and capture boxes
|
2018-02-20 14:25:42 +09:00 |
|
Dan Balasescu
|
3d7f998c9b
|
Merge branch 'master' into osu-rulesetcontainer-aspect
|
2018-02-20 14:07:04 +09:00 |
|
smoogipoo
|
8f25a5da66
|
Add playfield aspect ratio + scaling modifications to composer layers
|
2018-02-20 14:01:33 +09:00 |
|
smoogipoo
|
4a5cd6520c
|
Extract playfield scaling into a separate class
And make it more general.
|
2018-02-20 13:50:31 +09:00 |
|
Dean Herbert
|
f41a40be15
|
Merge branch 'master' into editor-hitobject-movement
|
2018-02-19 17:59:50 +09:00 |
|
smoogipoo
|
4898c321f8
|
Merge branch 'osu-rulesetcontainer-aspect' into editor-hitobject-movement
|
2018-02-19 17:07:03 +09:00 |
|
smoogipoo
|
b7be162f28
|
Remove AspectAdjust property (override GetAspectAdjustedSize instead)
|
2018-02-19 17:05:10 +09:00 |
|
smoogipoo
|
cd2c9a9de6
|
Adjust xmldoc and rename to GetAspectAdjustedSize
|
2018-02-19 17:04:18 +09:00 |
|
smoogipoo
|
cbac4de9c2
|
Expire + dispose CaptureBoxes
|
2018-02-15 19:11:29 +09:00 |
|
smoogipoo
|
ebcdb62570
|
Remove now unneeded hide
|
2018-02-15 19:10:55 +09:00 |
|
smoogipoo
|
9583191556
|
Dispose SelectionBoxes when they die
|
2018-02-15 19:08:03 +09:00 |
|
smoogipoo
|
4ac0c48ba6
|
Add fadein to SelectionBox
|
2018-02-15 19:07:53 +09:00 |
|
smoogipoo
|
dcbc8c3dcd
|
Remove animated capture boxes for now
|
2018-02-15 18:06:33 +09:00 |
|
Dean Herbert
|
a0a65abcac
|
Crentalise all import logic
|
2018-02-15 14:22:39 +09:00 |
|
smoogipoo
|
115484741d
|
Capture -> Select
|
2018-02-14 17:54:43 +09:00 |
|
smoogipoo
|
a9d14eadac
|
Add clearSelection method
|
2018-02-14 17:53:04 +09:00 |
|
smoogipoo
|
344da5965c
|
Add a CaptureBox that encloses hitobjects from the drag selection
|
2018-02-14 14:38:37 +09:00 |
|
Dean Herbert
|
58f20c3723
|
Merge branch 'master' into editor-hitobject-movement
|
2018-02-13 18:56:16 +09:00 |
|
Dean Herbert
|
a738664167
|
Add interface for database context factory
|
2018-02-12 23:10:05 +09:00 |
|
smoogipoo
|
87baa6febd
|
Merge remote-tracking branch 'origin/master' into editor-pattern-adjustments
|
2018-02-12 19:08:13 +09:00 |
|
smoogipoo
|
bfedd1cee0
|
Remove nested container
|
2018-02-12 19:01:50 +09:00 |
|
smoogipoo
|
c3212d36ef
|
Remove handles for now (will be re-implemented)
|
2018-02-12 18:36:16 +09:00 |
|
smoogipoo
|
e10bb2db05
|
Unify SelectionLayer and HitObjectCapturer, rename SelectionBox
|
2018-02-12 18:35:01 +09:00 |
|
smoogipoo
|
20c0dee17d
|
Remove SelectionInfo
|
2018-02-12 18:22:52 +09:00 |
|
smoogipoo
|
ee168f9a77
|
Split out drag selection box from post-capture box
Cleans up a lot of code, removes handles for now.
|
2018-02-12 18:20:05 +09:00 |
|
Dean Herbert
|
edc3638175
|
DatabaseWriteUsage
|
2018-02-12 17:55:11 +09:00 |
|
smoogipoo
|
1adbe3585c
|
HitObjectSelectionBox -> SelectionDragger
|
2018-02-12 16:03:59 +09:00 |
|
smoogipoo
|
cfb2b3f1e8
|
Rework SelctionLayer to support click-selections
|
2018-02-12 16:02:42 +09:00 |
|
smoogipoo
|
77149b00ce
|
Merge branch 'codestyle-fixes' into update-branch
|
2018-02-08 23:47:31 +09:00 |
|
smoogipoo
|
4699b5ad7c
|
Fix a few code styling issues
These are present in the netstandard branch (the rules aren't working there - probably using the wrong configuration).
|
2018-02-08 23:47:03 +09:00 |
|
smoogipoo
|
b500b76407
|
Merge branch 'master' into update-branch
|
2018-02-08 23:35:48 +09:00 |
|
smoogipoo
|
0511728fbe
|
Remove "keypress" from comment
|
2018-02-08 17:38:46 +09:00 |
|
smoogipoo
|
46284c61ae
|
Return HitResult.None instead of null
|
2018-02-08 14:25:59 +09:00 |
|
smoogipoo
|
c537af0289
|
Fix/improve commends
|
2018-02-08 14:25:44 +09:00 |
|
smoogipoo
|
a6f1a4689e
|
Fix incorrect value copy-pasta
|
2018-02-08 14:16:37 +09:00 |
|
smoogipoo
|
802aaefe35
|
Give rulesets a way to disable/enable perfect/ok hit results
|
2018-02-08 13:54:08 +09:00 |
|
smoogipoo
|
cfdeac6428
|
Make hit windows settable by derived classes
|
2018-02-08 13:38:31 +09:00 |
|
smoogipoo
|
beaecbafbd
|
Merge branch 'master' into unified-hitwindows
|
2018-02-08 13:22:44 +09:00 |
|
smoogipoo
|
9225e883c1
|
Add + use HalfHitWindow
|
2018-02-02 20:29:50 +09:00 |
|
smoogipoo
|
6976347d64
|
Protect hit window values
|
2018-02-02 20:28:59 +09:00 |
|
smoogipoo
|
e45b26c742
|
Cleanup/minify HitWindows
|
2018-02-02 19:35:44 +09:00 |
|
smoogipoo
|
d371425c87
|
BAD -> MEH
|
2018-02-02 18:56:44 +09:00 |
|
smoogipoo
|
70462ebee3
|
Make HitWindows settable by derived HitObjects
|
2018-02-02 18:53:05 +09:00 |
|
smoogipoo
|
acf20c079c
|
General improvements around usage of HitWindows for mania
|
2018-02-02 18:47:54 +09:00 |
|
smoogipoo
|
558c53a6ba
|
Give HitObject some HitWindows
|
2018-02-02 18:47:10 +09:00 |
|
smoogipoo
|
a0c1662fb7
|
Move mania's HitWindows to osu.Game
|
2018-02-02 17:52:55 +09:00 |
|
smoogipoo
|
75858bd3de
|
Update in-line with framework changes
|
2018-02-02 15:41:54 +09:00 |
|
Dean Herbert
|
5ba84a67f1
|
Merge branch 'master' into catmull-sliders
|
2018-02-01 20:58:33 +09:00 |
|
Dan Balasescu
|
c486609174
|
Merge branch 'master' into fix-replay-time-stop
|
2018-02-01 20:08:58 +09:00 |
|
smoogipoo
|
13f16077d4
|
Implement Catmull-Rom curve approximator
|
2018-02-01 20:04:41 +09:00 |
|
Dean Herbert
|
9d4ec6f8b5
|
Merge branch 'master' into ismaskedaway-input-fix
|
2018-02-01 19:29:10 +09:00 |
|