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
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
Dean Herbert
1d687c470c
Fix clock not incrementing beyond last frame of replay
2018-02-01 18:49:14 +09:00
Dean Herbert
1cc7c23982
Hits -> JudgedHits
2018-02-01 18:08:15 +09:00
Dan Balasescu
c1d5a68e4d
Merge branch 'master' into VisualSettingsOverlay
2018-02-01 16:37:04 +09:00
smoogipoo
1b99e54005
Fix IsMaskedAway not being up-to-date when fastfowarding replays
2018-02-01 15:21:23 +09:00
Dean Herbert
cd37be9440
Merge branch 'master' into better-slider-objects
2018-02-01 08:39:39 +09:00
Dean Herbert
888d2362fd
Merge branch 'master' into fix-taiko-fastforwarding
2018-01-31 18:30:15 +09:00
smoogipoo
c97ea3ed60
Post-process beatmap before applying defaults
2018-01-30 15:49:55 +09:00
smoogipoo
ef3fb8c05a
InputManager -> Container where KeyBindings are involved
2018-01-30 14:49:12 +09:00
TocoToucan
615c831069
Merge from ppy/master
2018-01-26 21:56:17 +03:00
smoogipoo
5742e61e68
Merge remote-tracking branch 'origin/master' into ruleset-configs
2018-01-26 15:39:09 +09:00
smoogipoo
0a505dde2e
Remove MaskingAffectsInput override
2018-01-26 14:47:16 +09:00
Dean Herbert
03154dbc63
Fix incorrect initial migration
...
Also adds variant to settings
2018-01-25 23:41:03 +09:00
smoogipoo
57cd50c45e
Reorder the way input is handled for replays
...
Fixes https://github.com/ppy/osu/issues/1625 .
2018-01-25 17:39:50 +09:00
smoogipoo
b77f08941c
Make mania play the next note's sounds if no note is hit
...
Fixes #1911 .
This follows what osu!stable does, which is rather unfortunate, since it just plays _every_ sound for the note :|.
2018-01-24 20:05:37 +09:00
Dean Herbert
5a00ae36d1
Add database-based configuration for rulesets
2018-01-24 17:45:28 +09:00
Dean Herbert
b197cd56af
Allow DI'd OnScreenDisplay to be null
2018-01-23 16:42:31 +09:00
Dean Herbert
c01f67b0d8
Merge remote-tracking branch 'upstream/master' into ruleset-configs
2018-01-23 16:23:25 +09:00
smoogipoo
d37844c068
Clean up off-by-one offsets from repeat-related properties
2018-01-23 13:37:25 +09:00
smoogipoo
c1331cef1b
Disallow DualStages for non-converted beatmaps
2018-01-22 15:52:54 +09:00
smoogipoo
9ac035f3d5
Merge branch 'bdl-cache-changes' into ruleset-configs
2018-01-22 13:11:45 +09:00
TocoToucan
e88f514cf4
Resolve merge conflicts
2018-01-21 18:32:21 +03:00
為什麼
feb79ff9e7
Merge branch 'master' into mania_stage_fix
2018-01-19 20:08:24 +08:00
smoogipoo
a94ea7025e
Register/Unregister -> BeginTracking/StopTracking and add exceptions
2018-01-18 18:45:48 +09:00
smoogipoo
dee298c395
No more statics + better unregistration
2018-01-18 17:40:05 +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
ANDY840119-PC\andy840119
6c67f96fdb
fix ci error
2018-01-18 02:01:01 +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
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
52b48f2b7e
Fix replays not correctly considering negative time diffs
2018-01-17 15:23:07 +09:00
Dean Herbert
9b33499fe7
Merge remote-tracking branch 'upstream/master' into RefactorInputQueues
2018-01-16 20:04:34 +09:00
Dean Herbert
56df27fcc2
Merge branch 'master' into fix-event-bindings
2018-01-16 17:49:01 +09:00
Dean Herbert
976f7cec39
Merge branch 'master' into playfield-judgements
2018-01-16 15:26:13 +09:00
Dean Herbert
807e455a58
Merge branch 'master' into more-nested-playfields
2018-01-16 14:50:09 +09:00
TocoToucan
a81f32a388
PlayerGroup -> PlayerSettingsGroup
2018-01-15 20:52:52 +03:00
aQaTL
65ecc18141
Cap ApproachRate in HardRock mod at 10.0f
2018-01-15 16:11:00 +01:00
smoogipoo
8c5ef0a330
Remove base OnJudgement from Playfield to properly accomodate nested playfields
2018-01-15 20:48:57 +09:00
smoogipoo
c32ff9c43b
Move nested playfields to the base Playfield
2018-01-15 20:39:57 +09:00
smoogipoo
0ae0dac192
Fix DrawableHitObject not binding nested hitobject events
2018-01-15 20:35:38 +09:00
smoogipoo
28586317dd
Give stages a size again
2018-01-15 19:44:42 +09:00
Dean Herbert
053a29f9a7
Make judgements visually smaller
...
This is a temporary change based on people's feedback. Makes judgements feel a lot better.
nb: This is one of my changes that I've had deployed sinfce the end-of-year 2017 build.
2018-01-15 17:41:17 +09:00
Dean Herbert
0796d33e66
Merge branch 'master' into fix-skipbutton-ordering
2018-01-15 15:54:18 +09:00
TocoToucan
d3afbdaac6
Resolve merge conflict
2018-01-13 22:32:56 +03:00
TocoToucan
43d2ae348a
Rename ReplaySomething -> PlayerSomething
2018-01-13 22:25:09 +03:00
Aergwyn
8ac6818639
expose IsHit
2018-01-13 16:26:14 +01:00
Dan Balasescu
ebb8550f53
Merge branch 'master' into shrink-drawablehitobject_t
2018-01-14 00:16:42 +09:00
Aergwyn
7875f0cb01
remove unnecessary internal
2018-01-13 16:15:41 +01:00
Aergwyn
356bb5da1e
move sample logic up too
2018-01-13 12:55:52 +01:00
Aergwyn
70fc09f81e
move judgement + state logic up to DrawableHitObject
2018-01-13 12:42:42 +01:00
Aergwyn
ae1adfd2f2
remove unnecessary empty lines
...
codefactor.io \(o.o)/
also one unnecessary semicolon
2018-01-12 19:30:34 +01:00
smoogipoo
512e4d2c9f
Rewrite the way that cursor overrides are done game-wide
2018-01-12 18:13:17 +09:00
Dean Herbert
354d781002
Merge remote-tracking branch 'upstream/master' into fix-mod-implementation-check
2018-01-12 17:49:31 +09:00
Dean Herbert
b55adf655f
Yeah, cinema mod isn't going to work
2018-01-12 17:46:24 +09:00
Dean Herbert
7f189080b9
Move fail override back to abstract implementation
2018-01-12 17:43:56 +09:00
smoogipoo
8a04c954a9
Cleanup
2018-01-12 17:19:59 +09:00
smoogipoo
441e8aced5
Better namings for the speed change "algorithms"
2018-01-12 17:18:34 +09:00
Dean Herbert
9a77005d2e
Make sure unimplemented auto mods aren't consumable
2018-01-12 14:26:23 +09:00
Dean Herbert
057efa24c7
Move a few interfaces to base classes
2018-01-12 14:26:09 +09:00
smoogipoo
4b2d971b00
Add some comments
2018-01-12 13:06:17 +09:00
smoogipoo
712d586d41
Revert "Add OSD + config value for scroll speed"
...
This reverts commit a6d8b28221
2018-01-12 12:28:43 +09:00
smoogipoo
ab762045d6
Move back to using load(), fix testcase
2018-01-11 16:51:46 +09:00
smoogipoo
d998936e9e
Fix testcase errors
2018-01-11 15:50:44 +09:00
smoogipoo
9ae67b519b
Optimise nested hitobject position computations
2018-01-11 15:25:15 +09:00
smoogipoo
9d00e5bb7d
Make ScrollingHitObjectContainer handle nested hitobjects
2018-01-11 15:08:30 +09:00
smoogipoo
a6d8b28221
Add OSD + config value for scroll speed
2018-01-11 13:40:46 +09:00
smoogipoo
3a869edf36
Add a flag to disable user scroll speed adjustments
2018-01-11 12:44:39 +09:00
smoogipoo
6a5a3b01b2
Fix license headers
2018-01-11 12:39:06 +09:00
smoogipoo
6255aaab68
Per-hitobject lifetime management
2018-01-10 19:17:43 +09:00
smoogipoo
9036ea92eb
Run child updates for nested hitobjects when parent hitobjects are masked
2018-01-10 18:29:46 +09:00
smoogipoo
86b5591583
Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite
2018-01-10 18:02:49 +09:00
Dean Herbert
58626e3b30
Allow rulesets to create their own instantiation info
2018-01-10 17:04:07 +09:00
Dean Herbert
9d099feadc
Merge branch 'master' into fix-catcher-width
2018-01-10 10:04:10 +09:00
smoogipoo
c4d1922c8b
Add scrolling algorithm to global settings
2018-01-08 11:34:37 +09:00
TocoToucan
ae032cbf23
Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties
2018-01-07 23:40:00 +03:00
smoogipoo
4ab3b0d76b
Implement local scrolling hit object container
2018-01-07 13:24:09 +09:00
smoogipoo
117ab8a26d
Split out scrolling algorithm
2018-01-07 13:23:16 +09:00
smoogipoo
98fd4f6ff2
Fix up precision + sizing issues
2018-01-07 11:33:59 +09:00
smoogipoo
7526225282
Use DP for most of the code to avoid unnecessary computations
2018-01-05 20:56:21 +09:00
Dean Herbert
37d393bca0
Update licence headers
2018-01-05 20:21:19 +09:00
smoogipoo
5d12682e83
Initial implementation of the new (old) mania scrolling calculations
2018-01-05 20:18:18 +09:00
smoogipoo
d2b135d2a8
Give hitobjects lifetimes
2018-01-05 15:48:19 +09:00
smoogipoo
1276e2c71a
Merge branch 'master' into scrolling-hitobjects-rewrite
2018-01-05 14:58:57 +09:00
smoogipoo
af86220dcc
Merge remote-tracking branch 'origin/master' into update-branch
2018-01-05 12:08:50 +09:00
Dean Herbert
01038bd9bb
Merge branch 'master' into mania-rc-cleanup
2018-01-05 10:18:15 +09:00
smoogipoo
5eb2dc3d64
Cleanup some possible CI errors
...
Not sure why these aren't being detected on master right now - they should be...
2018-01-05 01:20:24 +09:00
smoogipoo
36e9232472
Merge master into netstandard
2018-01-05 00:42:48 +09:00
smoogipoo
add68ff068
Fix swells not stopping at the hit position
2018-01-04 21:45:29 +09:00
smoogipoo
585df22c88
Add a way to calculate length of IHasEndTime objects
2018-01-04 20:56:18 +09:00
smoogipoo
a7aab21a29
Re-namespace files
2018-01-04 19:22:15 +09:00
smoogipoo
e0c921ff5c
Split out ScrollingHitObjectContainer into new file
2018-01-04 19:20:43 +09:00
smoogipoo
651e24e3cc
Implement proper scrolling directions
2018-01-04 19:17:40 +09:00
smoogipoo
f34131f8f4
Initial game-wide replacement of scrolling playfields
2018-01-04 18:50:17 +09:00
smoogipoo
0c5ab98965
Make MultiplierControlPoint's StartTime variable
2018-01-04 18:35:33 +09:00
smoogipoo
2b79ad879f
Add a way to access alive hitobjects
2018-01-04 16:37:48 +09:00
Dean Herbert
c8ec27c4de
Remove redundant prefix
2018-01-04 16:31:41 +09:00
Dean Herbert
152b846cff
Fix incorrect scaling of hitobjects in catch
2018-01-04 16:29:53 +09:00
smoogipoo
697efba5e2
Replace .OfType with .Cast
2018-01-04 15:55:35 +09:00
smoogipoo
6d253fd33c
Add a way to adjust the conversion process with mods
2018-01-03 19:06:20 +09:00
Dean Herbert
b8fa33459a
Merge branch 'master' into disable-unimplemented-mods
2018-01-03 13:39:29 +09:00
Felix Ang
3e6f0c198c
Remove tab
2018-01-02 18:02:04 +01:00
Felix Ang
dccc134efa
Don't allow auto to fail
2018-01-02 17:53:29 +01:00
Dean Herbert
c0dd812a4c
Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods
2018-01-02 15:33:08 +09:00
Dean Herbert
f419518887
Make comment xmldoc
2018-01-02 15:33:00 +09:00
Aergwyn
ccb69d16d9
move HitResult in Scoring namespace to replace HitCount
2017-12-30 21:23:18 +01:00
Dean Herbert
d9a80dae5d
Male NoFail use an applicable interface
2017-12-31 04:10:29 +09:00
Dean Herbert
fea4e1ff68
Add a base interface for applicable mods
2017-12-31 04:09:51 +09:00
Aergwyn
138d78309f
add HitCount enum and replace string usage with enum
2017-12-30 18:07:30 +01:00
smoogipoo
714d93dd92
Merge remote-tracking branch 'origin/master'
2017-12-30 16:17:14 +09:00
Dean Herbert
a0966305d4
Remove unnecessary new event
2017-12-30 14:46:44 +09:00
Aergwyn
f547c7986d
created option to override values before UpdateState is called
2017-12-29 17:50:55 +01:00
Dean Herbert
27cb445c24
Always recrusively apply custom sequence to nested hitobjects
2017-12-29 17:48:05 +09:00
Aergwyn
dbcf87267d
Merge branch 'master' into standard-hd-support
2017-12-27 21:26:39 +01:00
Dean Herbert
18eb74d38c
Merge branch 'master' into sliderbouncers-fix
2017-12-28 00:13:04 +09:00
smoogipoo
6dfc596319
Post-merge fixes
2017-12-27 20:59:26 +09:00
smoogipoo
7a793eaded
Merge master into netstandard
2017-12-27 20:48:53 +09:00
Dean Herbert
496b0fef01
Merge branch 'master' into proper-taiko-hitsounds
2017-12-27 20:40:16 +09:00
smoogipoo
b87e6c8b2a
Add a method to get ruleset by name
2017-12-27 17:33:34 +09:00
Aergwyn
4c2554595e
implement hidden (mostly)
...
some things work and others don't, I dunno
2017-12-26 17:25:18 +01:00
Dean Herbert
94449ed597
Merge branch 'master' into notification-verbosity
2017-12-26 20:48:59 +09:00
smoogipoo
9690591593
Make taiko use namespaced hitsounds
...
This is a temporary solution for now that uses DrawableHitObject.SampleNamespace for the override. We will not want to do this going forward, and instead have the rulesets add their custom resource stores to the games', but that requires deciding where/when to apply/remove such resource stores, and is probably left to skinning.
2017-12-26 19:55:56 +09:00
Aergwyn
f5d4ed2a22
add interface to adjust DrawableHitObjects
2017-12-26 11:49:42 +01:00
smoogipoo
14162b5d46
Make InputDrum handle all Normals/Claps, hitobjects all others
2017-12-26 14:18:23 +09:00
Dean Herbert
6f5f4f76e5
Use Logger.Error when exceptions are involved
2017-12-25 18:21:15 +09:00
smoogipoo
0fb620a8d3
Make HitObject.Samples non-nullable
2017-12-25 16:41:18 +09:00
smoogipoo
d288d8a51f
Remove SampleInfoList
2017-12-25 15:40:01 +09:00
smoogipoo
68d76d4380
Fix taiko strong hits not being handled
2017-12-23 20:58:09 +09:00
Dean Herbert
aeafa5645a
Make Samples null by default and prepopulate in mania
2017-12-23 18:06:46 +09:00
Dean Herbert
2db68df999
Simplify DrawableHitObject's sample load code
2017-12-23 17:20:14 +09:00
Dean Herbert
5026c7a95e
SoundControlPoint -> SampleControlPoint
2017-12-23 16:34:34 +09:00
Dean Herbert
ff0927e71b
Remove unnecessary newline
2017-12-23 16:23:33 +09:00
Dean Herbert
46865bbacd
Merge remote-tracking branch 'upstream/master' into taiko-hitsounds-fix
...
# Conflicts:
# osu.Game/Audio/SampleInfo.cs
2017-12-23 14:50:35 +09:00
Dean Herbert
1fa9dac1bb
Merge remote-tracking branch 'origin/master' into taiko-hitsounds-fix
2017-12-23 14:20:16 +09:00
smoogipoo
6a29f6020a
Make HitObjects construct nested hit objects
2017-12-22 21:42:54 +09:00
smoogipoo
cb7e192aff
Determine SampleInfo defaults in DrawableHitObject
2017-12-21 16:02:33 +09:00
smoogipoo
c99ea32574
Merge branch 'master' into beatmap-serialization
2017-12-21 13:39:39 +09:00
Dean Herbert
051a3c4d47
Fix line endings
2017-12-18 21:51:00 +09:00
smoogipoo
fabf1bf60a
Make the captured objects not update for now
...
Since this is not the intended functionality.
2017-12-18 19:31:03 +09:00
smoogipoo
5493493f82
FinishCapture -> FinishDrag from Handles
2017-12-18 19:24:41 +09:00
smoogipoo
09c51df2bd
Marker* -> Handle
2017-12-18 19:21:26 +09:00
smoogipoo
3999940538
DragSelector -> HitObjectSelectionBox
2017-12-18 19:17:26 +09:00
Dan Balasescu
812181190e
Update SelectionLayer.cs
2017-12-18 14:10:14 +09:00
Dan Balasescu
17c58678cf
Update SelectionInfo.cs
2017-12-18 13:59:46 +09:00
Ninjaprawn
71e59bc9e7
Removed the IgnoreTooltip property
2017-12-16 20:16:40 +11:00
smoogipoo
66b19b6c97
Expose selected objects from SelectionLayer
2017-12-15 14:48:24 +09:00
smoogipoo
b28b86dea9
Use Lazy for threadsafety on playfield
2017-12-14 20:27:51 +09:00
smoogipoo
3d51301e03
Add license headers
2017-12-11 22:21:33 +09:00
smoogipoo
666dcdbd62
Give HitObjectComposer a SelectionLayer
2017-12-11 22:20:02 +09:00
smoogipoo
a303bf71cf
Give control over screen space conversion to DrawableHitObject
2017-12-11 22:19:02 +09:00
smoogipoo
2f1063c5c0
Refactor into separate files + add xmldocs + rename some methods
2017-12-11 21:56:58 +09:00
smoogipoo
c12c241633
Implement hover colours
2017-12-11 21:27:19 +09:00
smoogipoo
25d80a36be
Finish up logical implementation of markers
2017-12-11 21:03:34 +09:00
smoogipoo
5147b342dc
More refactorings + add markers
...
Move
2017-12-11 19:07:40 +09:00
smoogipoo
b28306d3c0
Fix incorrect SelectionPoint
2017-12-11 18:08:16 +09:00
smoogipoo
4573cc3322
Refactor into a new DragBox class, representing a single drag
2017-12-11 17:45:03 +09:00
smoogipoo
7189446943
Merge remote-tracking branch 'origin/master' into editor-selection-tool
2017-12-11 16:34:27 +09:00
Dean Herbert
77592ed15f
Fix comment formatting
2017-12-11 14:52:15 +09:00
Dean Herbert
d02e1ae896
Update RulesetInfo and add migration
2017-12-10 12:15:55 +09:00
Dean Herbert
679134c030
Add ShortName to rulesets
2017-12-08 18:55:25 +09:00
smoogipoo
5341e79102
Remove SelectionDragger for now
2017-12-08 17:51:15 +09:00
smoogipoo
faa921ba05
Fix up post-merge issues
2017-12-08 17:41:10 +09:00
FreezyLemon
9e3d439f0a
Merge branch 'master' of https://github.com/ppy/osu into taiko-hitsounds-fix
2017-12-08 08:30:02 +01:00
smoogipoo
f41af191ed
Merge remote-tracking branch 'origin/master' into editor-selection-tool
2017-12-08 15:13:18 +09:00
Ninjaprawn
9b3e666a07
Added IgnoreTooltip to all classes required
2017-12-08 14:10:23 +11:00
FreezyLemon
43c270ea49
Rolled back the bad earlier implementation
2017-12-07 21:18:51 +01:00
Dean Herbert
c35c8263b9
Merge remote-tracking branch 'upstream/master' into input-revamp
2017-12-07 18:07:26 +09:00
Dean Herbert
44ee11e75f
Merge branch 'master' into fix-beatmap-carousel-lag
2017-12-07 15:30:50 +09:00
smoogipoo
e573db04d4
Don't serialize HitObject.Kiai
2017-12-07 14:42:36 +09:00
Dean Herbert
a78441bc5a
Apply changes in line with framework input adjustments
2017-12-07 13:16:59 +09:00
smoogipoo
41b607c165
Dont serialize hitobject sample properties copied from the control point
2017-12-07 03:40:43 +09:00
smoogipoo
b584178e85
Make Beatmap ISerializable and add more JsonIgnores
2017-12-06 00:37:37 +09:00
smoogipoo
a80059032c
Remove PlayfieldOverlay
2017-12-02 20:24:10 +09:00
smoogipoo
5a7c4772bd
Remove PlayfieldUnderlay for now
2017-12-02 19:53:20 +09:00
Aergwyn
db50ad794e
CI adjustments
...
- removing unnecessary `using`s
- name Fields/Methods according to rules
- removing unnecessary initializations
2017-12-01 17:58:11 +01:00
Aergwyn
806c0e3b26
restructured OsuLegacyDecoder into LegacyDecoder
...
Beatmap works, Storyboard not...
2017-12-01 17:43:33 +01:00
smoogipoo
cf859a6cf2
Make the dragger attach to objects it surrounds
...
Plus a lot more implementation.
2017-12-02 00:26:02 +09:00
smoogipoo
f6591851c3
Implement a selection dragger box
2017-12-01 13:15:58 +09:00
smoogipoo
52ba68e25d
Add/fix up license headers
2017-11-30 22:21:02 +09:00
smoogipoo
c0c051aa32
Remove unused parameter for now
2017-11-30 21:58:41 +09:00
smoogipoo
e8cbde3ae1
Add overlay/underlay
2017-11-30 21:56:19 +09:00
smoogipoo
7e34b0f08d
Remove SelectionTool, make Select the default tool
2017-11-30 19:53:52 +09:00
smoogipoo
677f3653eb
Hide osu! playfield cursor
2017-11-30 19:19:34 +09:00
smoogipoo
efa39f38ca
CI fixes
2017-11-30 18:49:08 +09:00
smoogipoo
e5353bb53e
Add border to playfield, add shadow to toolbox buttons
2017-11-30 17:38:55 +09:00
smoogipoo
456bbe25f3
Implement toolbox into HitObjectComposer
2017-11-30 16:58:14 +09:00
smoogipoo
fd3049fd65
Merge remote-tracking branch 'origin/master' into editor-composer
2017-11-30 13:47:47 +09:00
smoogipoo
267bb75458
Merge remote-tracking branch 'Aergwyn/master' into netstandard
2017-11-29 23:45:29 +09:00
Dean Herbert
93d7cd5a6d
Merge branch 'master' into performance-calculator
2017-11-29 18:37:07 +09:00
smoogipoo
309eb4edd7
Integrate HitObjectComposer into Compose
...
Also removes the other rulesets' HitObjectComposers for now.
2017-11-29 17:46:21 +09:00
smoogipoo
8c30fd490c
Add HitObjectComposer class
2017-11-29 16:22:11 +09:00
FreezyLemon
bc3f11fdb8
Added PlaysSamples property to prevent certain DrawableHitObjects from playing their samples on hit. Also added this to TaikoObjects so their hitsounds won't be played (will be done by the TaikoRulesetContainer)
2017-11-29 06:24:13 +01:00
smoogipoo
1136db1556
Fix mania replays not defining important frames
...
Resolves https://github.com/ppy/osu/issues/1495 .
2017-11-29 14:20:15 +09:00
smoogipoo
a9cc156d7a
Merge remote-tracking branch 'origin/master' into performance-calculator
2017-11-28 21:38:26 +09:00
smoogipoo
de7c571be3
Merge remote-tracking branch 'origin/master' into netstandard
2017-11-22 19:46:17 +09:00
Brayzure
782a739370
Fix Results Screen After Failing Last Note
...
Fixes a bug where if you failed on the last hitobject, the AllJudged event will have already been invoked.
2017-11-21 23:00:00 -05:00
smoogipoo
f9ad4b6acb
Make categoryDifficulties return doubles to improve decimal accuracy
2017-11-21 19:55:09 +09:00
smoogipoo
0f8d4a455a
Merge remote-tracking branch 'origin/master' into performance-calculator
2017-11-21 19:18:06 +09:00
smoogipoo
217554f587
Remove redundant interface
2017-11-21 18:06:24 +09:00
Dan Balasescu
142b74cc47
Merge branch 'master' into sudden-death
2017-11-21 17:32:31 +09:00
smoogipoo
fea56322f0
Fix SD not failing for the first note
2017-11-21 17:28:51 +09:00
smoogipoo
18b9828c49
Merge UpdateFailed and CheckAlternateFailConditions
2017-11-21 17:11:07 +09:00
smoogipoo
1b27ce6198
Cleanup + renaming
2017-11-21 17:09:22 +09:00
smoogipoo
b3bf6e7bee
Merge master into netstandard
2017-11-21 16:39:21 +09:00
Dean Herbert
2610cadd3c
CI fixes
2017-11-21 12:11:29 +09:00
Dean Herbert
4f6263ef86
Make many internal classes and methods public
...
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +09:00
Brayzure
2b0295ed86
Proper Public Method Case
...
- onFailCheck to OnFailCheck
2017-11-20 20:49:31 -05:00
Brayzure
6d74fd254c
Remove Extraneous Using Statement
...
- System.Collections.Generic was leftover from a previous attempt
2017-11-20 20:25:14 -05:00
smoogipoo
aac41d2de6
Disable resharper inspections on case-by-case basis
2017-11-20 18:55:48 +09:00
Brayzure
da30d76f9b
Implement Score Processor Mod Interface
...
- Add a delegate whenever we want to register an additional fail condition
2017-11-20 02:15:29 -05:00
Brayzure
de4d8eb196
Implement Sudden Death and Perfect
...
- Two additional fail conditions
2017-11-18 01:28:09 -05:00
smoogipoo
433f4f03a1
Actually initialise DifficultyCalculator with mods
2017-11-17 20:19:49 +09:00
smoogipoo
bf44b3d0ef
Cleanups
2017-11-17 16:54:50 +09:00
smoogipoo
825aa6570e
Fix rebase issues
2017-11-17 14:37:19 +09:00
smoogipoo
1e023f0419
Implement PerformanceCalculator testcase
2017-11-17 14:37:19 +09:00
smoogipoo
ac6213d1fa
CI fixes
2017-11-17 14:26:33 +09:00
smoogipoo
18f2e92a48
Rework mod applications to hitobject/rulesetcontainer for DifficultyCalculator
2017-11-17 12:36:13 +09:00
smoogipoo
62155e6dd5
Make DifficultyCalculator support mod applications
...
Fixes https://github.com/ppy/osu/issues/476 .
2017-11-17 12:36:07 +09:00
Dean Herbert
f912744acc
Fix sizing of ModIcon
2017-11-16 00:15:27 +09:00
Dean Herbert
ae6d4aa38d
Merge remote-tracking branch 'upstream/master' into fix-replay-clock
2017-11-13 20:03:29 +09:00
smoogipoo
495155874c
Make sure that the clock is only updated once per time value
2017-11-13 19:30:57 +09:00
smoogipoo
0cec51110a
Fix replay clock always running 1 frame behind
...
* Fixes swells never completing.
* Fixes forward playback missing notes every now and then.
* Probably more stuff.
2017-11-13 17:55:21 +09:00
smoogipoo
ae8407a3f3
Fix nested hitobject judgements not being removed
2017-11-13 14:00:35 +09:00
smoogipoo
5277c3c164
Set the frame time appropriately to reverse judgements a little better
2017-11-10 22:11:25 +09:00
smoogipoo
66ee9d1631
Update in-line with framework changes
2017-11-09 17:04:04 +09:00
smoogipoo
348083f589
Update with framework state transformation
...
Removes explicit initial state setting in DrawableOsuHitObjects.
2017-11-09 14:05:05 +09:00
smoogipoo
0620d0bd7a
AllJudged does not need to be virtual anymore
2017-11-02 21:56:09 +09:00
smoogipoo
326891f51c
Add "Final" to better determine when to stop processing the hitobject
2017-11-02 21:54:28 +09:00
smoogipoo
8ee13ef0ae
Properties are unnecessary
2017-11-02 21:33:31 +09:00
smoogipoo
fe00ac7e41
Make DrawableHitObject/ScoreProcessor support rewinding
2017-11-02 21:21:07 +09:00
smoogipoo
f219b7f9fb
Fix bonusScore being stored locally instead of incrementally changing
2017-11-02 19:31:30 +09:00
Dean Herbert
90af472717
Cache available rulesets as they are pretty static for now
2017-10-25 22:14:36 +09:00
TocoToucan
5107489cda
Remove DatabaseBackedStore Reset functions
2017-10-25 15:12:14 +03:00
TocoToucan
63fe569afa
Remove DatabaseBackedStore Prepare functions
2017-10-25 14:53:20 +03:00
Jacob Odgård Tørring
493fe1d621
Makes HasFailed private set and removes alreadyFailed
2017-10-24 08:34:10 +02:00
Jacob Odgård Tørring
9b54e834d9
Implements virtual Failcondition in scoreprocessor and enforces nofail in UpdateFailed
2017-10-22 20:32:59 +02:00
Dean Herbert
5d5ea5fb2e
Fix all remaining db structure issues
2017-10-19 14:05:11 +09:00
Dean Herbert
e487b6f82a
Standardise context retrieval
2017-10-17 15:50:42 +09:00
Dean Herbert
cd41862e3b
Add back transaction support for beatmap importing
2017-10-17 15:00:27 +09:00
Dean Herbert
66894d11ea
Connection -> context
2017-10-17 12:46:29 +09:00
Dean Herbert
acc299c7b9
Correct and simplify RulesetStore
2017-10-16 17:02:31 +09:00
Dean Herbert
7049a73490
Remove ValidTypes from databased stored; explicitly expose query methods instead
2017-10-16 14:47:33 +09:00
Dean Herbert
4981630131
Fix formatting regressions
2017-10-16 13:12:51 +09:00
Dean Herbert
8a0b184dd6
Revert "Return back DatabaseBackedStore's query and populate functions"
...
This reverts commit 7cf5d63cd3
2017-10-16 12:59:59 +09:00
TocoToucan
7cf5d63cd3
Return back DatabaseBackedStore's query and populate functions
2017-10-15 00:40:41 +03:00
smoogipoo
b178be21d1
Let's not rename columns yet
2017-10-14 14:30:58 +09:00
smoogipoo
b83d7cd4df
Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore
...
# Conflicts:
# osu-framework
# osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
# osu.Game/Beatmaps/BeatmapInfo.cs
# osu.Game/Online/API/Requests/GetBeatmapSetsResponse.cs
2017-10-14 12:38:59 +09:00
Dean Herbert
ead88224c5
Move ModIcon tooltip to base implementation
2017-10-13 19:14:43 +09:00
Dean Herbert
520b806305
Merge remote-tracking branch 'upstream/master' into ranks-section
2017-10-13 18:49:05 +09:00
Dean Herbert
bb6b656ec6
Fix code review issues
2017-10-12 22:27:22 +09:00
Dean Herbert
1a88ffe862
Merge remote-tracking branch 'upstream/master' into catch-improvements
2017-10-11 19:10:18 +09:00
TocoToucan
4653470779
Fix RulesetStore preparation
2017-10-10 22:29:16 +03:00
TocoToucan
8b01f8671f
Merge from ppy/master
2017-10-10 21:07:36 +03:00
Dean Herbert
03fbf47bc2
Add juicy streams
2017-10-10 20:22:42 +09:00
TocoToucan
ef417c6388
Small DB-related refactoring
2017-10-09 23:30:32 +03:00
Dean Herbert
d5892cf54e
Add a bool to specify whether judgements should be visible for certain DrawableHitObjects
2017-10-09 20:17:05 +09:00
TocoToucan
887aa7496b
Rework EF Core usage in model classes
2017-10-06 00:23:26 +03:00
TocoToucan
6a4198d0d6
Initial EF Core commit
2017-10-04 22:52:12 +03:00
EVAST9919
aafead5057
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-10-03 01:34:42 +03:00
Dean Herbert
66afba6219
Allow TestCasePlayer to instantiate only one ruleset type
2017-10-02 20:48:24 +08:00
EVAST9919
c2f487aa3e
Add Rank as a property to the Score Processor
2017-10-02 05:56:38 +03:00
EVAST9919
e7632b6e6f
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-09-28 14:44:31 +03:00
Dean Herbert
4eaf6b4b94
Remove single usage of dynamic and stop referencing Microsoft.CSharp.dll
2017-09-28 00:14:04 +08:00
EVAST9919
0615f375e1
Show current grade
2017-09-23 19:52:44 +03:00
Jorolf
5b90f45691
Merge branch 'master' of git://github.com/ppy/osu into ranks-section
2017-09-19 21:26:05 +02:00
Dean Herbert
99b512cce5
Output ruleset assemblies to the game folder rather than adding special logic
2017-09-19 19:27:14 +09:00
Dean Herbert
f2a9e95d56
Fix type resolution in RulesetStore
2017-09-19 17:22:24 +09:00
Dean Herbert
296ebbfc54
Read ruleset assemblies from project folders
2017-09-19 16:07:00 +09:00
Dean Herbert
6d3d485565
And then everything became one
2017-09-19 16:06:58 +09:00
Dean Herbert
98b847b025
Add API retrieval support
2017-09-14 20:08:07 +09:00
Dean Herbert
9c4876d135
Merge remote-tracking branch 'upstream/master' into ranks-section
2017-09-14 18:52:44 +09:00
Dean Herbert
b78c516b74
Merge branch 'master' into scoring-revamp
2017-09-13 20:47:14 +09:00
smoogipooo
5e32d95ad2
Remove Ruleset's CreateScoreProcessor method
2017-09-13 16:37:05 +09:00
smoogipooo
f1130eb899
Add default implementation for ScoreProcessor using Exponential scoring
2017-09-13 16:35:13 +09:00
smoogipooo
093d82ac45
Set depths from playfield add methods instead of DrawableHitObject
2017-09-13 16:17:01 +09:00
smoogipooo
e146bcacf1
Make BasePortion and ComboPortion constants
2017-09-13 16:13:27 +09:00
smoogipooo
e472518e4f
Standardized is default for now
2017-09-13 15:58:50 +09:00
smoogipooo
d83a2d4dc6
Disable masking optimisations for scrolling hit objects
...
Lifetime is very tightly controlled here, so all should be okay.
2017-09-13 15:57:40 +09:00
smoogipooo
05ac23f99a
Remove AffectsAccuracy for now
2017-09-13 15:44:03 +09:00
smoogipooo
ba3e44cd71
Simplify standardized scoring to BasePortion (raw scoring) + ComboPortion (highest combo)
2017-09-13 15:17:32 +09:00
smoogipooo
3619f7c1eb
Fix possible NaN accuracy
2017-09-13 00:38:52 +09:00
smoogipooo
7b44ad300f
Remove accurateHits, make Accuracy once again tied to comboScore
2017-09-13 00:33:01 +09:00
smoogipooo
2a45451308
Fix combo duplication.
2017-09-13 00:19:17 +09:00
smoogipooo
7dd79f5a0b
Fix incorrect accuracy calculation
2017-09-13 00:11:56 +09:00
smoogipooo
ba4f81d022
Woops, fix incorrectly deleted line
2017-09-12 23:30:15 +09:00
smoogipooo
4269533bab
Remove remaining AllObjectsJudged in RulesetContainer
2017-09-12 22:29:44 +09:00
smoogipooo
89cb38386c
Set accuracy
2017-09-12 22:28:16 +09:00
smoogipooo
dc9b47559a
Multiply standardised combos by the HighestCombo to make higher combos matter more
2017-09-12 22:28:10 +09:00
smoogipooo
b5f48c2368
Add storeResults as a parameter to Reset
...
Whether to store the current state of the ScoreProcessor for future use.
2017-09-12 22:27:27 +09:00
smoogipooo
2e0218f388
Move AllObjectsJudged into ScoreProcessor as AllJudged
...
Changes to OsuScoreProcessor were required to make sure that ticks and slider heads weren't ignored.
2017-09-12 22:01:08 +09:00
smoogipooo
cc6bb81a73
Reimplement Exponential scoring with a simpler and more intuitive calculation
...
Default for all rulesets for now.
2017-09-12 21:47:09 +09:00
smoogipooo
d0774c7bc6
ComputeTargets -> SimulateAutoplay + improve xmldoc
2017-09-12 21:16:47 +09:00
smoogipooo
3e3618d724
More cleanups
2017-09-12 21:12:57 +09:00
smoogipooo
abab2a4878
Revamp score processing to once more unify scoring methods
2017-09-12 21:05:50 +09:00
smoogipooo
0b94939474
Make Accuracy = 1, Health = 1 the default for ScoreProcessor
2017-09-12 20:53:26 +09:00
Dean Herbert
28a25c201f
Merge remote-tracking branch 'upstream/master' into ranks-section
2017-09-12 19:50:58 +09:00
smoogipooo
195c2d7a31
Keep track of maximum hits + combo at base ScoreProcessor level
2017-09-12 19:48:17 +09:00
smoogipooo
cba642f781
Reduce nesting, because we don't have partial judgements any more
2017-09-12 19:45:14 +09:00
smoogipooo
c07e831b17
Move HasFailed override to base ScoreProcessor
2017-09-12 19:39:54 +09:00
smoogipooo
3af8345068
Add AffectsAccuracy to Judgement
2017-09-12 19:39:44 +09:00
smoogipooo
112429051e
Fix XMLDoc CI errors
2017-09-12 19:05:37 +09:00
Dan Balasescu
ee8ec31c6e
Merge branch 'master' into judgement-revamp
2017-09-12 18:57:37 +09:00
smoogipooo
d5bd005c01
Remove unused code for now
...
I don't think we'll ever be using this anyway.
2017-09-12 18:52:15 +09:00
smoogipooo
92b3e203e8
judgementOccurred should be passed upwards
...
So only one hit object is ever judged in a single frame.
2017-09-12 18:50:30 +09:00
smoogipooo
a38e0062a4
Fix checking judgements even if we don't provide a judgement, if we have a result, or if a nested hit object handled a judgement.
2017-09-12 18:49:50 +09:00
Dean Herbert
86de4fa2e2
Apply CI fixes
2017-09-12 18:36:19 +09:00
Dean Herbert
f32d444d68
Remove generics from Playfield (fixes catch)
2017-09-12 18:19:28 +09:00
Dean Herbert
d7ac02d090
Ensure judgements aren't updated when ArmedState is not idle
2017-09-12 18:00:41 +09:00
Dean Herbert
1194e46ef1
Merge remote-tracking branch 'upstream/master' into judgement-revamp
2017-09-12 17:46:21 +09:00
Dean Herbert
20dae5ee11
Minor refactors
2017-09-12 17:36:46 +09:00
Dan Balasescu
3be9d3c747
Merge branch 'master' into mania-autoplay
2017-09-12 16:44:05 +09:00
smoogipooo
8737a1b1a5
Implement osu!mania auto replay generation.
2017-09-12 15:52:32 +09:00
smoogipooo
d6bf5c38b7
Move Kiai bool to HitObject.
2017-09-12 10:01:07 +09:00
Dean Herbert
7b92bbfa86
Merge branch 'master' into mania-hit-explosions
2017-09-11 17:34:14 +09:00
smoogipooo
f3c6f6f959
Merge branch 'blending-equations' into mania-holdnote-niceness
2017-09-11 15:09:01 +09:00
smoogipooo
4683319156
Merge remote-tracking branch 'origin/master' into mania-hit-explosions
2017-09-11 14:48:40 +09:00
Dean Herbert
5ce76d8023
Merge remote-tracking branch 'upstream/master' into judgement-revamp
2017-09-11 14:36:51 +09:00
Dean Herbert
512232c1c8
Fix regression causing autoplay to fail
2017-09-11 14:25:01 +09:00
smoogipooo
0cadee998c
Set default AccentColour for hit objects
2017-09-11 13:44:05 +09:00
smoogipooo
2086ed209d
Fix hold note tick input.
2017-09-11 04:51:44 +09:00
MrTheMake
0b1403683b
Moved OnlineScore inside GetScoresRequest.cs
2017-09-08 12:21:35 +02:00
MrTheMake
526ee107b8
Use a method to apply a beatmap, its ruleset and the mods.
2017-09-08 12:17:16 +02:00
MrTheMake
01553fc9ef
Moved all online related score parsing to its class
2017-09-08 02:46:54 +02:00
MrTheMake
e71f907f89
CI fix
2017-09-07 18:36:16 +02:00
MrTheMake
a7f874e5b6
Merge branch 'master' into leaderboard-scores
2017-09-07 18:25:33 +02:00
MrTheMake
709aa1ed3d
Moved all online score related parsing to its own class
2017-09-07 18:20:14 +02:00
Dean Herbert
5822a6cc96
Merge branch 'master' into ranks-section
2017-09-07 15:11:07 +09:00
Dean Herbert
e834e0e958
Fix incorrect initialisation order causing mania key bindings to not work
2017-09-06 21:07:57 +09:00
smoogipooo
0cc443e618
Remove all generic judgements.
2017-09-06 18:05:51 +09:00
smoogipooo
e85d511645
No more partial judgements.
2017-09-06 17:48:01 +09:00
smoogipooo
63b61ce669
Make TimeOffset internal set.
2017-09-06 17:20:51 +09:00
smoogipooo
f158ce814c
Fix state never getting set.
2017-09-06 17:20:41 +09:00
smoogipooo
ac8ec31b61
Make judgements able to be "added" plus make everything compile and run.
2017-09-06 17:02:13 +09:00
Dean Herbert
84c22df3f5
Combine Judgement.HitResults into one.
2017-09-06 17:01:48 +09:00
Dean Herbert
d7d0e96e6b
Merge branch 'master' into ranks-section
2017-09-01 18:46:53 +09:00
Dean Herbert
2b667cf789
Fix typos
2017-08-24 20:32:55 +09:00
Dean Herbert
c9f90efb8a
Add more checks and remove direct cast
2017-08-24 20:31:57 +09:00
Dean Herbert
f0635af40d
Add documentation and regions to RulesetInputManager
2017-08-24 15:51:31 +09:00
Dean Herbert
a7a7e0323f
Update autoplay and replay handling to result in actions, not keys
2017-08-24 15:36:42 +09:00
Dean Herbert
189988236b
Move PlayerInputManager logic inside RulesetInputManager
2017-08-24 15:23:17 +09:00
smoogipooo
115e5c95af
Make ScrollingPlayfield.Reversed protected; make ManiaPlayfield 'invertible'.
2017-08-23 20:50:03 +09:00
Dean Herbert
1f04995a73
Merge branch 'master' into hardrock-flipping
2017-08-23 17:00:41 +09:00
smoogipooo
8ddc13e394
Fix replays not loading.
2017-08-23 16:48:13 +09:00
smoogipooo
7639e096d8
No longer flip legacy replay mouse positions.
2017-08-23 15:30:17 +09:00
smoogipooo
68e7cf854f
Add variant names.
2017-08-23 14:19:14 +09:00
smoogipooo
84dd1283de
Fix nullref.
2017-08-23 13:39:51 +09:00
smoogipooo
be96fb32b3
Make RulesetContainer load KeyBindingInputManager in load()
2017-08-23 12:47:47 +09:00
Dean Herbert
ef2d9ffede
Fix redundant initialiser
2017-08-22 23:43:10 +09:00
Dean Herbert
6f8e85c2e1
Merge branch 'master' into fix_taiko_sizing
2017-08-22 23:19:41 +09:00
Dean Herbert
83bd430f89
Merge branch 'master' into fix-speed-adjustments
2017-08-22 23:07:42 +09:00
smoogipooo
f8576d44b1
Add some more xmldoc.
2017-08-22 21:08:27 +09:00
smoogipooo
d080a7e970
Determine size of ScrollingContainer a bit better to avoid taiko weirdness
2017-08-22 20:53:19 +09:00
smoogipooo
db27551709
Make hit objects put in ScrollingContainers strictly ordered by start time
...
This won't change anything as is since all hit objects are given a depth at the moment.
2017-08-22 20:51:20 +09:00
jorolf
3025fcdb25
Merge branch 'master' into ranks-section
2017-08-22 13:19:03 +02:00
Dean Herbert
9f52ecbb8a
Merge branch 'master' into mania-key-conversion
2017-08-22 20:08:39 +09:00
smoogipooo
322dfe0250
Fix ScrollingContainer possibly not getting the correct size to cover hit objects.
2017-08-22 19:17:26 +09:00
smoogipooo
ad63cbf455
Fix default comparator being inverted.
2017-08-22 18:54:41 +09:00
smoogipooo
1964bc72e5
Should be FirstOrDefault for hit objects occuriung before the first control point.
2017-08-22 18:39:09 +09:00
smoogipooo
e5d985838f
Set ScrollingAxes and RelativeChildOffset a bit more safely.
2017-08-22 18:37:49 +09:00
smoogipooo
137964b792
Fix hit objects not getting added to the correct speed adjustment container.
2017-08-22 18:37:10 +09:00
smoogipooo
b46a51fd8b
Make the speed adjustment containers ordered decreasingly by their control point start time.
2017-08-22 18:36:32 +09:00
smoogipooo
0189f01402
Explicitly store defaultSpeedAdjustment, and make it un-removable
2017-08-22 16:15:50 +09:00
smoogipooo
5a3c0de7ad
Fix further incorrect comparison.
2017-08-22 16:10:58 +09:00
smoogipooo
a737f5fe0d
CI fixes.
2017-08-22 16:06:25 +09:00
smoogipooo
d20ea97e7f
Add NUnit test for ScrollingHitObjectContainer
...
Tests ordering of SpeedAdjustmentContainers and DrawableHitObjects added to the ScrollingHitObjectContainer.
2017-08-22 16:06:19 +09:00
smoogipooo
c3cfad4eb5
Add RemoveSpeedAdjustment
2017-08-22 16:06:14 +09:00
smoogipooo
4fc77be624
Fix incorrect sorting of hit objects into SpeedAdjustmentContainers
2017-08-22 16:06:09 +09:00
smoogipooo
6f662d721c
Fix possible CollectionModifiedException while adding new SpeedAdjustmentContainers
2017-08-22 16:06:04 +09:00
smoogipooo
b7b8d8b764
Let's not construct scrolling containers in load() for now
...
This isn't utilized at the moment, and we should be avoiding this here in the first place.
2017-08-22 16:05:59 +09:00
smoogipooo
5fcd94880d
Fix incorrect inequality with multiple speed adjustments at the same start time.
2017-08-22 16:05:53 +09:00
smoogipooo
68c7226d12
Fix cherry pick issues.
2017-08-22 14:18:17 +09:00
smoogipooo
88151eff3f
Fix dofficulty calculators not working and make mania set the correct key count for non-mania specific maps.
2017-08-22 14:07:39 +09:00
smoogipooo
4eec59f669
Only set the number of availableColumns once, at ManiaRulesetContainer level.
...
# Conflicts:
# osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
# osu.Game/Rulesets/UI/RulesetContainer.cs
2017-08-22 14:07:37 +09:00
smoogipooo
964982e2e6
Remove now unneeded ApplyBeatmap.
2017-08-22 14:05:28 +09:00
Dean Herbert
250fb33fbc
Merge branch 'master' into ranks-section
2017-08-22 12:46:28 +09:00
Dean Herbert
881eecb528
Merge branch 'master' into master
2017-08-22 12:35:36 +09:00
Dean Herbert
7903f49d27
Merge branch 'master' into action-key-counter
2017-08-21 17:47:19 +09:00
Dean Herbert
52dadad1e1
Merge branch 'master' into fix-taiko-barlines
2017-08-21 16:46:25 +09:00
Dean Herbert
ea450fecf5
Merge branch 'master' into action-key-counter
2017-08-21 16:25:44 +09:00
smoogipooo
6e0d2182cb
CI.
2017-08-21 16:24:16 +09:00
smoogipooo
5d13efa76d
Remove the concept of "queued hit objects", add a default speed adjustment.
2017-08-21 16:17:00 +09:00
smoogipooo
7a5708ce92
Further support for null judgements.
2017-08-21 15:35:16 +09:00
Dean Herbert
a63923a497
Remove type check for now
2017-08-21 12:50:48 +09:00
Dean Herbert
16e96888ab
Update KeyCounterCollection to support action-based buttons
2017-08-21 12:39:22 +09:00
smoogipooo
6a7b410bc3
Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147
2017-08-21 11:58:54 +09:00
MrTheMake
f831832c59
CI fix
2017-08-19 00:13:06 +02:00
MrTheMake
6d401b5f21
Merge branch 'master' into leaderboard-scores
2017-08-19 00:00:40 +02:00
Dean Herbert
bc7621607a
Merge upstream/master in.
2017-08-18 22:20:45 +09:00
smoogipooo
90885a31ae
Round 2 of CI fixes.
2017-08-18 15:09:54 +09:00
smoogipooo
a47b6526a2
Fix CI issues.
2017-08-18 14:40:36 +09:00
Dan Balasescu
68303accef
Merge branch 'master' into make-rulesetinfo-iequatable
2017-08-18 14:28:42 +09:00
tgi74000
dc31a0f0ac
Merged ppy/master
2017-08-17 13:01:42 +02:00
MrTheMake
586a652b08
Changed Mods to be a property
2017-08-17 12:24:22 +02:00
MrTheMake
105048500a
Made modString private and moved the beatmap assignment inside GetScoresRequest
2017-08-15 15:30:53 +02:00
MrTheMake
2c287e1348
CI and comment fix
2017-08-15 12:27:51 +02:00
MrTheMake
21ced32297
Formatted and commented the GetAllMods() function
2017-08-15 12:03:43 +02:00
MrTheMake
e908a3675e
Formatted the GetAllMods() function
2017-08-14 18:24:54 +02:00
MrTheMake
5ed717ef86
Shortened GetAllMods() using LINQ
2017-08-14 15:16:22 +02:00
MrTheMake
920710e7d0
Assign a score's beatmap and cleanup to the Score class
2017-08-14 13:30:54 +02:00
Dean Herbert
7c9d6c9c83
Initial refactoring of key binding logic
2017-08-14 20:19:25 +09:00
MrTheMake
e54f659916
Suggested changes
2017-08-13 22:37:39 +02:00
MrTheMake
2f89fc432b
Removed unused function
2017-08-13 20:28:30 +02:00
MrTheMake
81289db33b
CI fix, fixed nullref and removed abstraction of GetAutoplayMod
2017-08-13 20:12:01 +02:00
MrTheMake
d9c26f98c7
Suggested changes
2017-08-13 19:54:07 +02:00
MrTheMake
997d0c9053
CI fix
2017-08-13 17:45:46 +02:00
MrTheMake
4c2d7bf343
Parse the mods of a leaderboard's score
2017-08-13 17:41:13 +02:00
Shane Woolcock
d19c8f56be
Make RulesetInfo implement IEquatable since EqualityComparer was sometimes giving false negatives and causing Bindable observers to fire
2017-08-13 15:03:01 +09:30
MillhioreF
e42c279229
More generic catching for broken hitobject strings
2017-08-10 01:50:20 -05:00
MillhioreF
c16dbc05aa
Add new error for malformed (too many variables) hit objects during import
2017-08-09 23:41:22 -05:00
jorolf
934c2a1dc8
Merge branch 'master' into ranks-section
2017-08-09 18:47:25 +02:00
smoogipooo
d83c218e08
Remove various scrolling container optimisations (removing when not alive).
2017-08-09 16:19:09 +09:00
tgi74000
b00d1cd077
Merged ppy:master
2017-08-09 08:49:29 +02:00
Dean Herbert
976cff9af6
Merge remote-tracking branch 'upstream/master' into catch
...
# Conflicts:
# osu.Desktop.Tests/Visual/TestCaseScrollingPlayfield.cs
2017-08-09 15:08:43 +09:00
smoogipooo
2715324a76
Fix possible incorrect reversing behavior for horizontal playfields.
2017-08-09 14:50:52 +09:00
smoogipooo
f70c00423a
Missed one.
2017-08-09 14:25:49 +09:00
smoogipooo
346aebebc0
Fix origins not being set correctly when reverting from reversed playfield.
2017-08-09 14:24:48 +09:00
smoogipooo
a20753abc6
Applied suggested changes.
2017-08-09 14:24:47 +09:00
smoogipooo
431a9649a4
Remove unused using.
2017-08-09 13:38:12 +09:00
Dean Herbert
723e27353c
HitRenderer -> RulesetContainer
2017-08-09 13:28:29 +09:00
Dean Herbert
7c0e7ebcd0
Give HitRenderer a reference to Ruleset
...
Used to get correct bindings for a mode (ActionMappingInputManager).
2017-08-09 13:05:52 +09:00
smoogipooo
1c5584f068
Make ScrollingPlayfield store a list of SpeedAdjustments instead of a Container.
...
Because they're removed from the container when they're not alive, and any further adding methods fail.
2017-08-09 12:45:50 +09:00
smoogipooo
dfb47b571a
Make HitRenderer's Playfield public so it can be used in testing.
2017-08-09 12:24:38 +09:00
Dean Herbert
b88f37de45
Add custom actions for Catch
...
Reworks input management for rulesets
2017-08-09 11:50:34 +09:00
Jorolf
7d7cfe5d92
Merge branch 'master' of git://github.com/ppy/osu into ranks-section
2017-08-08 23:13:25 +02:00
tgi74000
3d4db427ff
Pass RuleSet to ScoreStore, compute and store MD5 for legacy replays compatibility
2017-08-08 17:17:53 +02:00
smoogipooo
cae21869d0
Use CompositeDrawable for HitObjectContainer. Removes a looooooot of generics 👍 .
2017-08-08 17:37:11 +09:00
smoogipooo
25202b522d
Fix not setting Origin + Anchors properly when reversing.
2017-08-08 14:10:26 +09:00
smoogipooo
e54abe8d0a
Fix not removing queued hit objects.
2017-08-08 13:23:46 +09:00
Dean Herbert
a95aa90adc
Allow DrawableHitObjects to be removed from a Playfield
...
(cherry picked from commit 3926238be9
2017-08-08 13:02:51 +09:00
Dean Herbert
ee7bb1b4f5
Don't set RelativePositionAxes when setting ScrollingAxes
...
(cherry picked from commit debe13629f
2017-08-08 13:02:23 +09:00
smoogipooo
c5ce86b9f3
Add reversing capability to ScrollingPlayfield.
2017-08-08 12:59:50 +09:00
smoogipooo
bd2ef4dc6b
Line endings + license headers.
2017-08-07 18:03:44 +09:00
smoogipooo
62ee613da3
Merge remote-tracking branch 'origin/master' into timingchange-improvements
2017-08-07 17:35:53 +09:00
smoogipooo
f3c05fe232
CI fixes.
2017-08-07 17:34:57 +09:00
smoogipooo
9c0a0b1e2c
Rewrite/add comments.
2017-08-07 17:27:50 +09:00
smoogipooo
933740664c
SpeedAdjustedHitRenderer -> ScrollingHitRenderer for consistent naming.
2017-08-07 16:43:54 +09:00
smoogipooo
fc252f8888
Remove exception (this is set in SpeedAdjustmentContainer).
2017-08-07 16:24:51 +09:00
smoogipooo
a3efca9c35
Reduce implementation overhead in actually positioning hitobjects and making them scroll.
2017-08-07 16:02:38 +09:00
smoogipooo
068dfcb19a
Default CreateSpeedAdjustmentContainer implementation.
2017-08-07 15:22:31 +09:00
smoogipooo
c6447e40f9
Reduce implementation overhead for nested playfields (e.g. playfield + columns).
2017-08-07 14:56:26 +09:00
smoogipooo
376f99c1e3
Make VisibleTimeRange transform work again.
2017-08-07 14:32:55 +09:00
smoogipooo
e1dfe364b2
Fix lifetime performance regression.
2017-08-07 14:07:49 +09:00
Dean Herbert
eb190d83bd
Adjust CS multiplier to match stable
2017-08-07 10:43:33 +09:00
Dean Herbert
6f93aa6131
Fix incomplete comment
2017-08-07 09:01:47 +09:00
Dean Herbert
e75f438c29
Add difficulty application mods
...
Also fixes circular references when using IJsonSerializable.
2017-08-07 08:54:54 +09:00
Dean Herbert
224de9cc1e
Implement NoFail mod
2017-08-07 08:54:54 +09:00
Dean Herbert
3416925233
Fix alignment of icons on mod buttons
2017-08-07 08:54:53 +09:00
smoogipooo
b1d25ed388
Implement ScrollingPlayfield, now containing ScrollingHitObjectContainer (prev. SpeedAdjustmentCollection).
...
Also removing a lot of mania code relating to gravity mod for now.
2017-08-04 23:07:08 +09:00
smoogipooo
54503eef71
Rename *ScrollingDrawableTimingSection -> *ScrollingContainer, move LinearScrollingContainer to osu.Game, make SpeedAdjustmentContainer non-abstract.
2017-08-04 22:50:29 +09:30
smoogipooo
4a9f3aa70d
Merge remote-tracking branch 'origin/master' into timingchange-improvements
2017-08-04 20:11:24 +09:30
smoogipooo
0f901c99a0
Implement SpeedAdjustedPlayfield and a new HitRenderer derivation.
2017-08-04 20:11:18 +09:30
Huo Yaoyuan
62b3540fd6
Merge branch 'master' into fixes
2017-08-04 13:49:03 +08:00
Huo Yaoyuan
eb9972581e
Provide Autoplay mod in Ruleset.
2017-08-04 00:25:24 +08:00
Dean Herbert
0d9ea97828
Allow Rulesets to create a non-FontAwesome icon
...
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
Dean Herbert
3b1166d1e6
Optimise file lookups and other database operations
...
FirstOrDefault when called on a TableQuery with a predicate doesn't use table indices
2017-08-01 17:37:21 +09:00
Jorolf
4720a47363
Merge branch 'master' of git://github.com/ppy/osu into ranks-section
2017-07-29 00:45:14 +02:00
Jorolf
0fc36065f4
replace Play with Score
2017-07-29 00:31:52 +02:00
Dean Herbert
5f53426a9a
*Database -> *Store
...
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
Dean Herbert
cbe7b08642
Make BeatmapStore's BeatmapDatabase private
2017-07-27 15:34:13 +09:00
Dean Herbert
9e20a02c0a
Split out BeatmapDatabase into BeatmapStore
...
Hide database functionality at a lower level in preparation from eventually making it private.
2017-07-26 16:31:34 +09:00
Dean Herbert
fce580d717
Reshuffle namespaces
2017-07-26 13:22:46 +09:00
Thomas Müller
e68675f970
Rename EasingTypes to Easing
2017-07-22 20:53:53 +02:00
Thomas Müller
87bcd526f3
Get rid of raw AddDelay calls within osu.Game
2017-07-17 16:51:21 +03:00
Thomas Müller
032e9df67b
ApplyDelay -> AddDelay
2017-07-16 17:47:29 +03:00
Thomas Müller
71105bb9ee
Delay -> ApplyDelay; DelayReset -> ResetDelay
2017-07-16 14:06:46 +03:00
Thomas Müller
a5e610a7ba
Update framework and fix compilation
...
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
Dean Herbert
fc28617099
Merge remote-tracking branch 'upstream/master' into ruleset-settings
2017-07-13 15:35:53 +09:00
Dean Herbert
e1e7cb7178
Remove unnecessary using statements
2017-07-12 12:55:52 +09:00
Jorolf
f7c9e449d4
add ruleset settings
2017-07-11 20:25:24 +02:00
Thomas Müller
4045083dcd
Update sorting comparers in line with framework changes
2017-07-11 21:21:58 +03:00
Thomas Müller
22a987f6cc
Update test cases to new framework and fix old crashes
2017-07-07 15:05:55 +03:00
Dean Herbert
2f8e6f20a6
Fix CI issues
2017-07-05 13:46:53 -07:00
Thomas Müller
2d7eefa6fe
Update Cached usage according to framework
2017-07-02 13:00:02 +03:00
Thomas Müller
f5829860a2
Get rid of AlwaysReceiveInput
2017-06-23 18:02:24 +02:00
smoogipooo
3389c8a4dc
CI fixes.
2017-06-21 20:17:15 +09:00
smoogipooo
34ac932fe2
Reduce pollution in DrawableHitObject in favor of a loosely-coupled IScrollingHitObject.
2017-06-19 10:54:23 +09:00
smoogipooo
38f2bd47c5
Even saner default.
2017-06-16 20:00:16 +09:00
smoogipooo
9fea187788
A bit more commenting.
2017-06-16 19:58:43 +09:00
smoogipooo
28e48eab2b
CI fixes.
2017-06-16 19:30:30 +09:00
smoogipooo
4afe83e74e
Rework DrawableHitObject to provide default life times and proper DrawableTimingSection autosizing.
...
This exposes LifetimeOffset from DrawableHitObject which is used by the XSRG rulesets to adjust the life time range by the VisibleTimeRange.
2017-06-16 19:21:54 +09:00
smoogipooo
ea87aca032
We no longer need to pass in the control point.
2017-06-16 13:12:36 +09:00
smoogipooo
874db28478
CI fixes.
2017-06-16 13:09:06 +09:00
smoogipooo
5bac0919f0
Remove gross autoSizingAxes and life time.
2017-06-16 13:00:08 +09:00
Dan Balasescu
6bfb716cc6
CI fixes.
...
Update SpeedAdjustmentCollection.cs
2017-06-16 11:48:14 +09:00
smoogipooo
41c6140435
We don't need to use Cached just yet.
...
This was here to support dynamic re-ordering of hit objects and speed adjustment containers, however there needs to be more work done to TimingControlPoints/MultiplierControlPoints in general before this is possible.
2017-06-16 10:53:02 +09:00
smoogipooo
5d7336b235
A bit more cleanup.
2017-06-16 10:06:47 +09:00
smoogipooo
ff84a11c37
We don't need this to be protected anymore.
2017-06-16 09:54:16 +09:00
smoogipooo
03b2b254ba
Make SpeedAdjustmentCollection support unordered adds of speed adjustments and hit objects.
2017-06-16 09:38:06 +09:00
smoogipooo
fda220acbc
Move speed adjustment code from ManiaHitRenderer to SpeedAdjustedHitRenderer.
2017-06-15 19:34:28 +09:00
smoogipooo
aa830e435a
Add comment.
2017-06-15 16:15:41 +09:00
Dean Herbert
32226f90db
Enforce exception better
2017-06-15 14:53:39 +09:00
Dean Herbert
585e7ba312
Add a check to make sure all hitobjects use relativepositionaxes
2017-06-15 14:42:25 +09:00
