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 |
|