smoogipoo
af218b3d8d
No need to use properties
2018-06-14 16:13:21 +09:00
smoogipoo
8f7334874c
Fix up performance calculators
2018-06-14 16:04:48 +09:00
smoogipoo
47fc18d7c4
Adjust OsuDifficultyCalculator in-line with changes
2018-06-14 15:45:16 +09:00
Dean Herbert
f4cb0d7d8d
Fix memory leak due to incorrect binding
2018-06-13 14:16:58 +09:00
Dean Herbert
ae136e89a4
Merge branch 'master' into ruleset-configs
2018-06-12 13:13:18 +09:00
Dan Balasescu
9994c69d58
Merge branch 'master' into fix-object-ordering
2018-06-11 17:53:33 +09:00
smoogipoo
f4fbf27d42
Give ruleset settings a ruleset-specific config manager
2018-06-11 13:28:50 +09:00
Crusensis
fbc0cd6f5f
Split AffectsCombo into IsBonus
2018-06-09 18:14:33 -07:00
Dean Herbert
aaa65c428f
Merge branch 'master' into diffcalc-modtypes
2018-06-09 23:35:17 +09:00
smoogipoo
ff60f69f47
Explicitly construct local beatmaps rather than using GetBoundCopy
2018-06-06 20:19:30 +09:00
smoogipoo
72cc53aded
Rename GameBeatmap -> BindableBeatmap
2018-06-06 20:16:20 +09:00
smoogipoo
4086ff7313
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
# osu.Game/Screens/Menu/Intro.cs
# osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
smoogipoo
83ff47ec80
Rewrite difficulty mod combinations
2018-06-06 16:20:17 +09:00
Dean Herbert
3567823759
Reverse order of exposed objects in HitObjectContainer
...
Closes #2740 .
2018-06-06 15:03:47 +09:00
smoogipoo
8274623ad6
Cleanup multi mod constructions
2018-06-06 14:07:50 +09:00
Dean Herbert
f253828d49
Fix regressions
2018-06-06 13:51:51 +09:00
Dean Herbert
ee92986494
Merge branch 'master' into osu-hd-setting
2018-06-06 12:09:12 +09:00
Dean Herbert
4b604bf055
Merge branch 'master' into disallow-beatmap-change
2018-06-04 10:53:04 +09:00
smoogipoo
2ccffb9ac4
Add difficulty calculation mod types
2018-06-03 10:59:56 +09:00
Dean Herbert
2f21b9c4ea
Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits
2018-05-31 12:36:37 +09:00
smoogipoo
a3470f9ec3
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
...
# Conflicts:
# osu.Game/Overlays/Music/PlaylistOverlay.cs
# osu.Game/Screens/OsuScreen.cs
2018-05-28 18:01:15 +09:00
smoogipoo
d850e34003
Actually cast to int
2018-05-26 09:25:16 +09:00
smoogipoo
215cc9fba7
Change all performance calculators to use int hitwindows
...
Has a pretty large (>6) effect on pp for some maps.
2018-05-25 20:07:14 +09:00
smoogipoo
765a50d007
Remove 0.5 offsets
...
Checked up against DB values + server-side build versions, and these 0.5s don't seem to exist. Brings calculations more in-line with osu!stable.
2018-05-25 20:05:53 +09:00
smoogipoo
8004b8af4d
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
2018-05-23 17:38:02 +09:00
Dean Herbert
cea935ea40
Merge branch 'master' into osu-hd-setting
2018-05-21 15:21:09 +09:00
smoogipoo
1f37dca7b7
Fix HR / EZ being applied twice to AR
2018-05-19 14:47:06 +09:00
Dean Herbert
8e784d9104
Merge branch 'master' into fix-conversion-hitwindows
2018-05-18 11:59:16 +09:00
Vidalee
6a1abf4084
Merge branch 'master' into osu-hd-setting
2018-05-17 19:39:17 +02:00
smoogipoo
eba1d309b6
Fix incorrect namespace of OsuPerformanceCalculator
2018-05-17 16:58:22 +09:00
smoogipoo
f67d263596
Move ruleset-specific hitwindows to post-converted hitobjects
2018-05-17 13:35:15 +09:00
smoogipoo
c1d9fcc140
Make OsuPerformanceCalculator use the new hitresult namings
2018-05-16 12:46:31 +09:00
smoogipoo
cf08293be1
Remove extra newline
2018-05-15 21:49:44 +09:00
smoogipoo
4101b8ddde
Merge remote-tracking branch 'origin/master' into more-diffcalc-improvements
2018-05-15 21:31:58 +09:00
smoogipoo
22f3bee55a
Fix incorrect iteration over difficulty sections
2018-05-15 21:26:06 +09:00
smoogipoo
bc197a88e1
Fix slider length calculation including slider head
2018-05-15 21:25:33 +09:00
smoogipoo
1b5c151e0e
Fix DeltaTime being capped incorrectly
2018-05-15 21:25:02 +09:00
smoogipoo
49c36787d7
Remove triangle pattern and remove not-implemented reading strain
2018-05-15 21:24:41 +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
smoogipoo
9fd972e0a3
Rename OsuDifficulty -> Difficulty
2018-05-15 17:36:29 +09:00
Dean Herbert
e39af1c906
Merge branch 'master' into convert-object-hitwindows
2018-05-15 17:33:27 +09:00
smoogipoo
10e2f74538
Port osu-performance HD AR fix
2018-05-15 11:53:11 +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
ce6b4cc2d3
Add more attributes to OsuPerformanceCalculator's output
2018-05-14 11:15:37 +09:00
smoogipoo
e1b8a1589b
Fix TimeRate not being considered for performance calculation
2018-05-14 11:15:14 +09:00
Dean Herbert
f6df704deb
Merge branch 'master' into diffcalc-fixes
2018-05-12 22:16:20 +09:00
smoogipoo
416ed72597
Port osu-performance changes into OsuPerformanceCalculator
2018-05-12 15:46:25 +09:00
smoogipoo
a337248999
Fix incorrect count
2018-05-11 22:06:16 +09:00
smoogipoo
224f1a0810
Fix incorrect osu! difficulty calculator combo count
2018-05-11 21:49:16 +09:00
smoogipoo
faa82f17cc
Pass original hitobject HitWindows during conversion
2018-05-11 15:30:50 +09:00
Vidalee
16bcd6c3ed
Appvtests ( #1 )
...
* Resolving AppVeyor's errors
2018-05-08 14:33:26 +02:00
smoogipoo
251bdfdee8
Simplify statistics in osu ruleset
2018-05-07 15:51:08 +09:00
smoogipoo
5f74dc2c17
Simplify osu-ruleset statistics
2018-05-07 15:51:08 +09:00
smoogipoo
5489976c20
Implement ruleset-specific beatmap statistics
2018-05-07 15:51:08 +09:00
smoogipoo
268c14813b
Fix resharper warnings
2018-05-07 11:38:41 +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
Vidalee
393c01ba90
Made the changes requested
2018-05-06 12:38:25 +02:00
Dean Herbert
76e58a51b9
Merge remote-tracking branch 'upstream/master' into Vidalee-osu-hd-setting
2018-04-25 17:28:21 +09:00
smoogipoo
0dce7a5b61
Update framework + fix CI errors
2018-04-20 18:19:17 +09:00
smoogipoo
c9e4a07e12
Merge remote-tracking branch 'origin/master' into remove-approachcircle-hax
...
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/OsuEditPlayfield.cs
# osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
2018-04-20 18:04:43 +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
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
cea3e1c7f5
Remove now unnecessary approachcircle proxy disables
...
Prereqs:
- [ ] ppy/osu-framework#1505
2018-04-09 18:44:50 +09:00
Dan Balasescu
1895111c75
Merge branch 'master' into dynamic-assembly-update
2018-04-06 20:16:13 +09:00
Dean Herbert
acbdbcc3df
Update AssemblyInfo in line with framework changes
2018-04-06 13:17:26 +09:00
Dean Herbert
6c125683d4
Merge branch 'master' into selectionlayer-rewrite
2018-04-04 20:47:36 +09:00
Dean Herbert
b7325d73e8
Don't inherit VisbilityContainer
2018-04-04 20:44:11 +09:00
smoogipoo
d4cb00e08f
Don't display judgements in OsuEditPlayfield
2018-04-04 17:12:41 +09:00
Dean Herbert
788bfde002
Merge branch 'master' into selectionlayer-rewrite
2018-04-04 15:38:27 +09:00
Dean Herbert
ddba7254ca
Merge remote-tracking branch 'upstream/master' into linq
2018-04-03 13:05:08 +09:00
Dean Herbert
d40ccbd70a
Merge branch 'master' into selectionlayer-rewrite
2018-04-03 12:03:11 +09:00
Dean Herbert
77189073b2
Merge branch 'master' into scalablecontainer-size-fix
2018-04-03 11:29:36 +09:00
Dean Herbert
57b4cdaf85
Merge branch 'master' into selectionlayer-rewrite
2018-04-03 03:05:42 +09:00
Dan Balasescu
d7b61b3c09
Merge branch 'master' into Small-Clean-Up
2018-04-02 14:13:15 +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
Dan Balasescu
824201336a
Merge branch 'master' into hr-on-mania-is-unranked
2018-03-30 16:35:00 +09:00
smoogipoo
4ad776bfde
Make slider circle masks not handle mouse input at all
2018-03-30 14:15:46 +09:00
Joseph Madamba
0887dafa2c
Revert changes on hard rock mod
2018-03-29 20:36:52 -07:00
Dean Herbert
e1123c5a95
Merge branch 'master' into selectionlayer-rewrite
2018-03-30 12:29:58 +09:00
smoogipoo
3129c2cc75
Fix slider circle masks blocking input for now
2018-03-29 22:41:49 +09:00
smoogipoo
d9c5a0c6d1
Fix position editing not working
2018-03-29 22:38:44 +09:00
smoogipoo
6d4f94756e
Rewrite the way drag + click selections happen
...
The general idea here is that we need the masks to handle mouse down events, as they need to handle the drag (mousedown -> drag immediately).
I've rewritten the editor selections to use events, as there are some 3 different components that handle/trigger selections in different ways.
1. All selections/deselections now propagate through `HitObjectMask.Select()`/`HitObjectMask.Deselect()`.
2. Components that react to changes in the selection bind to the masks' `Selected`/`Deselected` events, and track them/change their states locally.
3. Masks provide a `SingleSelectionRequested` event which is invoked on the mouse-down event. Various components bind to this event to perform state changes locally in this scenario.
4. `DragBox` now handles all drag input locally. It triggers `Select`/`Deselect` on the masks it needs to.
5. `SelectionBox` handles the display of itself locally.
6. `SelectionBox` handles movement of groups of masks locally.
7. `HitObjectMasks` handles movement of itself locally.
2018-03-29 22:07:23 +09: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
Dean Herbert
9aae568bbe
Tidy up csproj further
2018-03-28 15:19:56 +09:00
Dean Herbert
9667d54ecb
Add missing licence headers
2018-03-28 14:48:08 +09:00
Dean Herbert
0026b94cd3
Consolidate and move ruleset test projects
2018-03-28 14:41:25 +09:00
Dean Herbert
1a8aa87469
Make everything better
2018-03-27 18:56:54 +09:00
Dean Herbert
b290d2d039
Move NUnit includes to individual projects
2018-03-27 15:07:09 +09:00
smoogipoo
dd5bbbbd9f
Define testable projects
2018-03-26 19:11:23 +09:00
smoogipoo
5159127bce
Fix SQLite failing to initialize on test projects
2018-03-26 18:07:09 +09:00
smoogipoo
35ef9d99c6
Only compile with net461 in visual studio
2018-03-26 15:44:55 +09:00
smoogipoo
3f9b14704e
Fix extra semicolon
2018-03-26 13:30:58 +09:00
smoogipoo
96901b6498
Add msbuild/dotnet build + launch targets
2018-03-26 10:52:54 +09:00
Joseph Madamba
90d763fda5
Apply review changes and suggestions
2018-03-25 10:00:30 -07:00
Joseph Madamba
78a7564acd
Score multiplier edits
2018-03-24 16:00:18 -07:00
smoogipoo
31920f1866
Fix ruleset resources not getting included in build
2018-03-25 02:12:01 +09:00
smoogipoo
d28de89e50
Add net461 target to test projects for nunit discovery
...
Nunit "by design" will not run tests for NETStandard projects (see: https://github.com/nunit/dotnet-test-nunit/issues/122#issuecomment-329531632 ).
2018-03-25 01:35:50 +09:00
John Neijzen
7b39447213
Update OsuAutoGenerator.cs
2018-03-24 18:34:56 +08:00
John Neijzen
bee9af8500
Update OsuAutoGenerator.cs
2018-03-24 18:30:36 +08:00
John Neijzen
9d96aeb347
Update OsuAutoGenerator.cs
2018-03-24 17:53:50 +08:00
John Neijzen
12f785bf40
Change duplicate condition to HitResult.Good instead of HitResult.Meh
2018-03-24 17:48:43 +08:00
John Neijzen
97be022e22
Remove duplicate condition
2018-03-24 16:55:39 +08:00
smoogipoo
c29f7a4333
Merge remote-tracking branch 'origin/master' into netstandard
2018-03-24 14:49:46 +09:00
Dean Herbert
9d3529ce7b
Merge branch 'master' into cursor-skinning
2018-03-22 21:07:16 +09:00
Dean Herbert
af65f2dd48
Move AccentColour changes local to rulesets which rely on it
2018-03-22 18:53:16 +09:00
Dan Balasescu
ab9505652b
Merge branch 'master' into skin--completion
2018-03-22 16:44:00 +09:00
smoogipoo
4ccaf143b5
Give sliders a default accent colour
2018-03-22 15:50:19 +09:00
Dean Herbert
78a8f60b39
IHasComboIndex -> IHasComboInformation
2018-03-22 12:35:17 +09:00
Vidalee
505a7c14fc
was persuaded I changed the if statement...
2018-03-21 21:14:17 +01:00
Dean Herbert
d909cce8d6
Add the ability to skin the gameplay cursor
2018-03-21 20:06:10 +09:00
Vidalee
8159e219fd
increaseFirstObjectVisibility now cannot be null
2018-03-20 22:23:27 +01:00
Vidalee
cdbe6bf22d
cleared comment
2018-03-20 21:55:35 +01:00
Vidalee
4068be1293
cleared comment
2018-03-20 21:54:44 +01:00
Vidalee
9252203916
build fix
2018-03-20 18:23:41 +01:00
Dean Herbert
fb3d319d0e
Make fallback bool into a function
...
Allows correct handling now that beatmap skins are also a thing.
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
Dean Herbert
cb3d0db555
Move combo colours completely out of HitObjects
2018-03-20 15:50:12 +09:00
Vidalee
fea8f868d7
Fixing hidden test bug
2018-03-17 13:22:58 +01:00
Dean Herbert
7e7f8ed7a2
Merge branch 'master' into drawable-composite-hit-object
2018-03-16 15:53:16 +09:00
Dean Herbert
23ffee3d38
Merge branch 'master' into drawable-composite-hit-object
2018-03-16 15:38:52 +09:00
Dean Herbert
46f5c0fc19
Merge branch 'master' into mod-fixes
2018-03-16 15:38:41 +09:00
Dan Balasescu
cdc61d5f0d
Merge branch 'master' into fix-combo-colours
2018-03-16 14:59:45 +09:00
Dean Herbert
7ed84465fb
Merge branch 'master' into mod-fixes
2018-03-16 11:27:39 +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
Dean Herbert
8d433cb4bf
Merge branch 'master' into cursor-trail
2018-03-15 11:14:21 +09: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
Dean Herbert
13f64a1d12
Merge branch 'master' into cursor-trail
2018-03-14 11:42:40 +09:00
Vidalee
8a86766324
Changes requests
2018-03-13 23:21:47 +01:00
Dean Herbert
c55d70ec13
Merge branch 'master' into fix-combo-colours
2018-03-13 19:19:45 +09:00
Dean Herbert
e43de68ad3
Move colour parsing to LegacyDecoder
2018-03-13 19:13:50 +09:00
smoogipoo
0c705b0397
Rename to EditorTestCase
2018-03-13 15:57:05 +09:00
Dean Herbert
b93e83e3d2
Merge branch 'master' into base-editor-testcase
2018-03-13 15:53:33 +09:00
Dean Herbert
107ad8cfff
Merge remote-tracking branch 'FreezyLemon/master' into more-skinning
2018-03-12 22:01:59 +09:00
smoogipoo
d2859d779d
Create a base TestCaseEditor for rulests to derive
2018-03-12 19:43:52 +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
smoogipoo
2d9fcdcbd0
Fix slider circle overlays moving with the endpoints
2018-03-12 17:18:50 +09:00
Dean Herbert
eb643b690a
Merge branch 'master' into more-skinning
2018-03-12 11:55:50 +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
9516bec13d
Fix naming rule
2018-03-11 21:45:15 +01:00
Vidalee
eed0f3a1de
Added setting to not hide the first object in Hidden mod
2018-03-11 21:02:14 +01:00
Dean Herbert
ccc3c573ab
Fix resharper not fixing
2018-03-11 02:20:00 +09:00
Dean Herbert
5092fe5596
Adjust cursor trail display length
...
In line with shader change at ad5ddec7b2
2018-03-11 02:11:56 +09:00
Dean Herbert
df2815f19e
Add TestCase for GameplayCursor
2018-03-11 02:11:25 +09:00
Dean Herbert
487a03d0d7
Merge branch 'master' into cursor-trail
2018-03-11 02:07:05 +09:00
smoogipoo
92b302971f
Trim whitespace
2018-03-10 01:23:53 +09:00
smoogipoo
24501c37dd
Merge branch 'drawableslider-cleanup' into editor-hitobject-movement
2018-03-10 01:15:24 +09:00
smoogipoo
8ed5fce43a
Split out the slider head into a separate drawable hitobject
2018-03-10 01:13:59 +09:00
smoogipoo
376f6eec58
SetPosition -> OffsetPosition
2018-03-10 00:02:13 +09:00
smoogipoo
4a48136e4f
Make hitobject positions adjustable
2018-03-09 23:12:34 +09:00
Dean Herbert
81b778fdcf
Merge branch 'master' into cursor-trail
2018-03-08 09:31:42 +09:00
Dean Herbert
04f5563238
Match HP drain harshness closer to stable
...
Based on number of misses before fail on two arbitrary tests. Obviously not final, just making the game more playable for the time being.
2018-03-07 19:37:26 +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
f2d7621df3
Add skin support for explode/flash layers
...
Basically to hide them for legacy skins, though.
2018-03-07 18:21:05 +09:00
Dean Herbert
05eb678654
Add skin support for judgements
2018-03-07 18:21:05 +09:00
Dan Balasescu
1375ee8408
Merge branch 'master' into slider-tick-transform-cleanup
2018-03-07 16:59:04 +09:00
Dean Herbert
4dfd3a61cc
Remove alpha setting
2018-03-06 18:40:39 +09:00
Dean Herbert
7cf1d4450a
SliderTick transform improvements
2018-03-06 18:28:36 +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
Dean Herbert
d1a115f4ec
Merge remote-tracking branch 'upstream/master' into cursor-trail
2018-03-05 23:34:04 +09:00
Dean Herbert
3ddaf1879d
CursorTrail always present, just to be safe
2018-03-05 20:20:06 +09:00
Dean Herbert
f4965ee7d6
Use high precision updating on CursorTrail
...
Avoids bloackage
2018-03-05 20:20:06 +09:00
Dean Herbert
69c0e95d9d
Use a better fade effect for the gameplay cursor
2018-03-05 20:20:06 +09:00
Dean Herbert
60f851df3e
Add support for DrawInfo alpha when drawing CursorTrail
2018-03-05 20:15:07 +09:00
Dean Herbert
ea6e3938c0
Fix hard crash due to spinner spin requirement being zero
...
Resolves #2133 .
2018-03-04 03:01:47 +09:00
Dean Herbert
0e928429d4
Merge branch 'master' into ruleset-replayframes
2018-03-04 01:57:43 +09:00
Dean Herbert
06cf9cbd63
Merge branch 'master' into fix-perfectcurve
2018-03-02 21:49:33 +09:00
Dean Herbert
bd9d26921a
Less BeaIBeatmapConvertereatmapConverters
2018-03-02 20:39:43 +09:00
Dean Herbert
22cbbcc639
Merge branch 'master' into beatmap-conversion-testcases
2018-03-02 20:21:41 +09:00
smoogipoo
a2c239d5e3
Rename to IBeatmapConverter, move to separate file
2018-03-02 20:19:47 +09:00
smoogipoo
9fef8a3977
Prettify json
2018-03-02 20:13:48 +09:00
smoogipoo
71755f5363
Prettyfy some JSON
2018-03-02 20:12:29 +09:00
Dean Herbert
ca8e52289b
Merge branch 'master' into fix-hr
2018-03-02 19:37:48 +09:00
smoogipoo
401d3fff7b
Add colinear perfect curve test case
2018-03-02 18:38:57 +09:00
smoogipoo
820a852caf
Remove unnecessary .osu properties
2018-03-02 18:37:38 +09:00
smoogipoo
cdca7371a3
Replace testcases with a basic test suite
2018-03-02 18:20:33 +09:00
Dan Balasescu
4aff659272
Merge branch 'master' into beatmap-conversion-testcases
2018-03-02 16:04:32 +09:00
smoogipoo
3d5fefae8c
Add TestFixtureAttribute to all tests
2018-03-02 15:34:31 +09:00
smoogipoo
6fff6da751
Ignore broken testcases
2018-03-02 14:01:34 +09:00
smoogipoo
2e3ee00c19
Remove unnecessary changes
2018-03-02 13:13:01 +09:00
smoogipoo
573d6d1b5f
Allow multiple mappings to be generated for a single hitobject
2018-03-02 13:13:01 +09:00
smoogipoo
4e363664fd
Add beatmap parameter to beatmapconverter creation
2018-03-02 13:13:01 +09:00
smoogipoo
6f5acaa8f9
Remove unnecessary explicit JsonProperties
2018-03-02 13:13:01 +09:00
smoogipoo
e87be213d5
Adjust lenience a little bit
2018-03-02 13:13:01 +09:00
smoogipoo
797d03a65f
Implement basic structure for beatmap conversion testing
2018-03-02 13:13:00 +09:00
smoogipoo
cb39a88c51
Fix HR not affecting slider repeats and ticks
2018-03-02 00:25:14 +09:00
smoogipoo
49b24c2bbf
Fix HR not properly applying to sliders
2018-03-02 00:19:09 +09:00
Dean Herbert
c54c1699bf
Merge branch 'master' into ruleset-replayframes
2018-03-01 22:26:16 +09:00
Dean Herbert
0704d823a9
Fix slider selection point not being set to new origin
2018-03-01 22:03:00 +09:00
smoogipoo
e62fab6cc2
Fix overlay positions/sizes due to sliders now being fixed
2018-03-01 14:34:31 +09:00
smoogipoo
d5d4bcb558
Merge branch 'master' into editor-hitobject-overlays
2018-03-01 14:04:38 +09:00
smoogipoo
195b6642e6
Reimplement important frames
2018-03-01 02:28:15 +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
222ae70062
Populate rulesets with their replay frames
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
e2f57ae346
Merge branch 'master' into parser-sanity-checks
2018-03-01 00:38:44 +09:00
Dean Herbert
3609c685d1
Fix approach circle fading
2018-02-28 20:35:15 +09:00
Dean Herbert
065630487a
Fix slider heads fading out too late
2018-02-28 20:12:16 +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
bdd88303b3
Merge branch 'master' into editor-hitobject-overlays
2018-02-26 17:53:50 +09:00
Dean Herbert
1218a75b7f
Improve vector conditional
2018-02-26 16:11:26 +09:00
Dean Herbert
9cbed461c4
Merge branch 'master' into sliderbody-rework
2018-02-26 15:00:18 +09:00
Dean Herbert
f1ddfa0581
Fix sliders never getting a correct lifetime set
2018-02-25 16:25:56 +09:00
smoogipoo
50d1183ec2
Division-by-zero safety + reference our own size
2018-02-24 02:53:02 +09:00
smoogipoo
066abfbdbc
Rename PositionAt -> CurvePositionAt to represent its new meaning
2018-02-24 02:43:36 +09:00
smoogipoo
996e605e61
Remove temporary testcase
2018-02-24 02:39:44 +09:00
smoogipoo
1e1df2aaff
Fix up testcases
2018-02-23 21:04:19 +09:00
smoogipoo
8c90abe0dc
Make slider control points relative to start position
2018-02-23 20:59:27 +09:00
smoogipoo
08bb25347c
Make DrawableSlider contain the slider body
2018-02-23 20:27:05 +09:00
Dean Herbert
84b707f4f8
Add basic hitcircle skinning
2018-02-23 13:38:12 +09:00
Dan Balasescu
6cc54a464c
Merge branch 'master' into editor-hitobject-overlays
2018-02-22 14:25:27 +09:00
smoogipoo
844e87aafe
Use the true head position rather than capturing current position
2018-02-22 14:25:10 +09:00
Dean Herbert
a3336f2577
Merge branch 'master' into fix-editor-osu-scale
2018-02-22 14:14:41 +09:00
smoogipoo
604b0fa20a
Fix post-merge issues
2018-02-22 14:11:06 +09:00
smoogipoo
ded2644df8
Merge branch 'master' into editor-hitobject-overlays
2018-02-22 14:08:36 +09:00
Dean Herbert
b74cfffc6f
Merge branch 'master' into editor-hitobject-movement
2018-02-22 13:19:39 +09:00
Dean Herbert
3b4e4bd110
Merge remote-tracking branch 'upstream/master' into general-slider-improvements
2018-02-22 12:28:33 +09:00
smoogipoo
5faec5c2f1
Add a separate property to control playfield area
2018-02-21 20:54:33 +09:00
smoogipoo
08e52e8c15
Remove unnecessary schedules
2018-02-21 18:02:52 +09:00
smoogipoo
9cd9c83f2c
Allow changing accentcolour/bordercolour post-load
2018-02-21 18:00:46 +09:00
smoogipoo
0d60a65c94
Fix OsuAutoGenerator not considering stacking
2018-02-21 17:53:16 +09:00
smoogipoo
f903e6d241
Fix stacking not working with sliders
...
Fixes #2093 .
2018-02-21 17:46:45 +09:00
smoogipoo
f877b642da
Clean up and document better what "progress" means
2018-02-21 17:10:18 +09:00
Dean Herbert
50d0278cbd
Merge branch 'master' into general-slider-improvements
2018-02-21 11:28:45 +09:00
smoogipoo
9a9f53ddfd
Remove 0.75 scale from osu! playfield in the editor
2018-02-21 11:10:43 +09:00
smoogipoo
4934ef7429
Add playfield aspect ratio + scaling modifications to composer layers
2018-02-21 11:07:42 +09:00
smoogipoo
7fe0989427
Merge branch 'general-slider-improvements' into editor-hitobject-overlays
2018-02-20 23:51:47 +09:00
smoogipoo
ee055b8e5c
Allow customizing the snake-ability of sliders
2018-02-20 20:53:06 +09:00
smoogipoo
8270e4d758
Add BorderColour to SliderBody
2018-02-20 20:51:28 +09:00
smoogipoo
ad2f556133
Add hitobject overlays to selected hitobjects
2018-02-20 18:01:45 +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
4898c321f8
Merge branch 'osu-rulesetcontainer-aspect' into editor-hitobject-movement
2018-02-19 17:07:03 +09:00
smoogipoo
cd2c9a9de6
Adjust xmldoc and rename to GetAspectAdjustedSize
2018-02-19 17:04:18 +09:00
smoogipoo
ef11ce3dd1
Remove Size override from OsuPlayfield
2018-02-19 17:02:27 +09:00
Dean Herbert
58af66bfc0
Merge branch 'master' into editor-hitobject-movement
2018-02-16 13:59:11 +09:00
Dan Balasescu
9f7736fab3
Merge branch 'master' into restore-ruleset-tests
2018-02-14 22:48:29 +09:00
Dean Herbert
58f20c3723
Merge branch 'master' into editor-hitobject-movement
2018-02-13 18:56:16 +09:00
smoogipoo
87baa6febd
Merge remote-tracking branch 'origin/master' into editor-pattern-adjustments
2018-02-12 19:08:13 +09:00
smoogipoo
cfb2b3f1e8
Rework SelctionLayer to support click-selections
2018-02-12 16:02:42 +09:00
Aergwyn
c3ce015869
fade slider ticks with hidden mod
2018-02-11 11:03:01 +01:00
smoogipoo
b500b76407
Merge branch 'master' into update-branch
2018-02-08 23:35:48 +09:00
Dean Herbert
534eb223b3
Merge branch 'master' into unified-hitwindows
2018-02-08 17:46:29 +09:00
smoogipoo
c213e58eff
Make slider tails not play hitsounds
2018-02-08 14:40:35 +09:00
smoogipoo
46284c61ae
Return HitResult.None instead of null
2018-02-08 14:25:59 +09:00
smoogipoo
beaecbafbd
Merge branch 'master' into unified-hitwindows
2018-02-08 13:22:44 +09:00
smoogipoo
ccc948a0b9
Update framework (testing)
2018-02-08 12:45:51 +09:00
Dean Herbert
67bd375bfa
Merge remote-tracking branch 'upstream/master' into raw-input-fixes
2018-02-07 22:05:44 +09:00
Dean Herbert
62547dba51
Remove redundant test method
2018-02-06 18:15:21 +09:00
Dean Herbert
3d0ef8b3bd
Move property back to local variable
...
Never used elsewhere
2018-02-06 18:14:08 +09:00
Dean Herbert
27fd42fb17
Adjust appear animations of repeats and ticks
2018-02-06 18:10:15 +09:00
Dean Herbert
e417aaa23f
Adjust scale out effect
2018-02-06 17:46:56 +09:00
Dean Herbert
60fb78e49d
Simplify iteration code
2018-02-06 17:46:45 +09:00
Dean Herbert
dfc344b47a
Update OpenTK version
2018-02-06 13:47:54 +09:00
Dean Herbert
6b35ef7063
Update OpenTK version
2018-02-05 16:13:30 +09:00
ColdVolcano
bf26fc94d8
Merge branch 'master' into repeat-points
2018-02-03 23:56:40 -06:00
smoogipoo
b15f184261
Make osu! use HitWindows
2018-02-02 20:33:59 +09:00
smoogipoo
13f16077d4
Implement Catmull-Rom curve approximator
2018-02-01 20:04:41 +09:00
Dan Balasescu
cf665b717f
Merge branch 'master' into starrating-fix
2018-02-01 18:44:04 +09:00
Dan Balasescu
39e626f29e
Merge branch 'master' into fix-ticks-appearing-late
2018-02-01 18:28:42 +09:00
Dean Herbert
b8f6dcffaf
Merge remote-tracking branch 'upstream/master' into repeat-points
2018-02-01 13:32:53 +09:00
ColdVolcano
b656858ee6
Fix typos
2018-01-31 21:32:10 -06:00
ColdVolcano
06b615c474
Merge branch 'master' into repeat-points
2018-01-31 21:30:28 -06:00
smoogipoo
00001364c3
Better judgement visualisations in testcase
2018-01-30 18:10:14 +09:00
smoogipoo
cd4a0612c0
Properly construct slider ends using HitObject.AddNested
2018-01-30 16:53:19 +09:00
smoogipoo
4b63d25871
Add hit/miss display to TestCaseSlider
2018-01-30 16:45:48 +09:00
smoogipoo
27357e100a
Simplify condition
2018-01-30 16:28:38 +09:00
smoogipoo
702c4efb88
Give Slider a tail hitobject to make slider ends counts towards score
2018-01-30 16:28:14 +09:00
smoogipoo
b293408147
Construct the head of sliders from Slider
2018-01-30 15:50:48 +09:00
Aergwyn
f6501e73e3
remove unwanted using
2018-01-29 12:08:03 +01:00
Aergwyn
373b3871f9
update SliderTick calculation + more ticks in tests
...
math is hard >_<
2018-01-29 12:03:44 +01:00
Thomas Tan
33c5fdcedb
AppVeyor fix
2018-01-29 16:30:46 +08:00
Thomas Tan
c36859ea3a
Create Slider.StackedPositionAt method
2018-01-29 16:22:14 +08:00
Thomas Tan
f66ecae3ff
Merge remote-tracking branch 'upstream/master' into starrating-fix
2018-01-29 16:19:11 +08:00
FreezyLemon
8f0ab2040f
Add Jetbrains.Annotations NuGet package
2018-01-26 12:46:28 +01:00
Thomas Tan
b04e2cbb5c
Fix osu star rating calculation
...
The main bug was that the beatmap was not being processed prior to
having its Skill values calculated, causing stacking to be ignored in
difficulty calculation. The fix involves processing the beatmap with
OsuBeatmapProcessor.
Another minor bug was that sliders were not taking into account the
stacked position midway through the slider (PositionAt does not return
stacked position.), so I corrected by adding StackOffset.
2018-01-26 03:39:19 +08:00
Aergwyn
214938b98d
fix SliderTicks appearing too late
2018-01-25 10:52:03 +01:00
ColdVolcano
8eef81e24d
Add more cases to TestCase
2018-01-24 16:16:46 -06:00
ColdVolcano
1f51149da8
Add xmldoc
2018-01-24 15:41:51 -06:00
ColdVolcano
cee8bb50c9
Fix reference points being wrongly selected
2018-01-24 15:34:52 -06:00
Aergwyn
52c4d22c41
review changes
...
- use doubles instead of floats
- simplify logic
2018-01-24 09:44:50 +01:00
Aergwyn
4baadfdd16
fix oversight
2018-01-23 16:44:33 +01:00
ColdVolcano
efae00c149
make repeat points look better
2018-01-23 04:31:37 -06:00
Aergwyn
24b7d91f5b
Merge branch 'master' into fix-repeats-appearing-early
2018-01-23 09:04:45 +01:00
smoogipoo
33c52ba30f
Fix off-by-ones in RepeatPoint code
2018-01-23 13:58:43 +09:00
smoogipoo
d37844c068
Clean up off-by-one offsets from repeat-related properties
2018-01-23 13:37:25 +09:00
Aergwyn
b726f90c37
remove unnecessary variable
2018-01-22 12:44:55 +01:00
Aergwyn
66176f2882
fix RepeatPoint animations
...
- FadeIn and -Out for RepeatPoints are now calculated instead of fixed values
- TimePreempt is now cut down if too long for RepeatPoints following the first one to only show up to two RepeatPoints at any given time
2018-01-22 12:36:38 +01:00
Shawdooow
29466438a3
fix values
2018-01-19 20:58:43 -05:00
Shawdooow
c29eea870d
correct values
2018-01-19 20:56:41 -05:00
Shawdooow
e109d5fe20
fix slider heads
2018-01-19 11:13:49 -05:00
Shawdooow
4d1142a0ce
overall difficulty
2018-01-19 11:11:28 -05:00
smoogipoo
6908597b95
Fix inverted ternary
...
See #1935 - repeat index 1 is at the end of the slider, not the start.
2018-01-18 23:44:00 +09:00
Dan Balasescu
46ba2cda10
Remove unused using
2018-01-18 21:19:06 +09:00
Dean Herbert
1a83770a06
Fix incorrect math
2018-01-18 21:16:15 +09:00
Dean Herbert
065d2a4887
Add licence header
2018-01-18 21:12:53 +09:00
Dean Herbert
01ff1584c2
Fix repeat points not following slider snaking correctly
2018-01-18 21:06:47 +09:00
Dean Herbert
e2965e1682
Remove unused using
2018-01-18 20:46:57 +09:00
Dean Herbert
063767e381
Prioritise hit normal
...
It's always first but not strictly guaranteed anywhere yet.
2018-01-18 20:37:46 +09:00
Dean Herbert
97884e1d05
Remove unnecessary null checks
2018-01-18 19:57:49 +09:00
Dean Herbert
b4f2bea37b
Fix slider samples playing twice when additions are present
2018-01-18 19:50:26 +09:00
Dean Herbert
9b33499fe7
Merge remote-tracking branch 'upstream/master' into RefactorInputQueues
2018-01-16 20:04:34 +09:00
smoogipoo
c309cc9454
Privatise OnJudgements as much as possible
2018-01-16 15:37:32 +09:00
smoogipoo
8c5ef0a330
Remove base OnJudgement from Playfield to properly accomodate nested playfields
2018-01-15 20:48:57 +09:00
Dean Herbert
0796d33e66
Merge branch 'master' into fix-skipbutton-ordering
2018-01-15 15:54:18 +09:00
smoogipoo
5952f1e7f1
Adjust transforms for cursor transitions
2018-01-12 19:34:14 +09:00
smoogipoo
512e4d2c9f
Rewrite the way that cursor overrides are done game-wide
2018-01-12 18:13:17 +09:00
Dean Herbert
e5056e11f4
Remove extra newline
2018-01-12 18:07:40 +09:00
Dean Herbert
d0881e443b
Merge remote-tracking branch 'upstream/master' into approach-rate
2018-01-12 18:05:16 +09:00
Dean Herbert
58626e3b30
Allow rulesets to create their own instantiation info
2018-01-10 17:04:07 +09:00
Dan Balasescu
9c602f8770
Merge branch 'master' into drawable-fruit-improvements
2018-01-09 22:06:16 +09:00
Dean Herbert
b8bb0a52e3
Move mod implementations to individual files
2018-01-09 14:08:18 +09:00
TocoToucan
ae032cbf23
Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties
2018-01-07 23:40:00 +03:00
Aergwyn
54c0197eb0
remove early fadeout of sliderball on hidden
...
it shouldn't have been done because it makes fast sliders unplayable as they never appear in the first place, ooops
2018-01-07 09:08:33 +01:00
Aergwyn
006b63eb42
remove unnecessary change of spinner end sequence
...
it wasn't really visible anyways *shrug*
2018-01-07 09:05:36 +01:00
Dean Herbert
37d393bca0
Update licence headers
2018-01-05 20:21:19 +09:00
smoogipoo
36e9232472
Merge master into netstandard
2018-01-05 00:42:48 +09:00
Dean Herbert
0cc8516aa3
Remove empty cases, add initial ball scale adjust.
2018-01-04 20:53:33 +09:00
Dean Herbert
717b263b77
Comment and better stacking of FadeOuts
2018-01-04 20:47:42 +09:00
Dean Herbert
1f62fe19d5
Make animation a bit more subtle
2018-01-04 20:43:42 +09:00
Dean Herbert
ffc7f7ecf4
Add a better slider "hit" state fade out animation
2018-01-04 20:16:10 +09:00
Dean Herbert
bde957940d
Disallow SliderBall from contracting after EndTime
2018-01-04 20:09:58 +09:00
Shawdooow
94f81a1784
fix
2018-01-03 10:04:36 -05:00
Shawdooow
9122eaa28e
Merge branch 'master' into approach-rate
2018-01-03 10:02:55 -05:00
Shawdooow
23f3cb6467
address review
2018-01-03 10:01:28 -05:00
Aergwyn
1ce6219293
remove unnecessary override
2018-01-03 13:55:24 +01:00
Aergwyn
d94c313947
fix slider follow circle instantly disappearing on slider ends
2018-01-03 08:13:58 +01:00
Dean Herbert
31865b4d96
Rename conflicting variable
2018-01-03 15:12:27 +09:00
Aergwyn
9ddbed6729
crop slider length to not go out of bounds on small screens/ratios
...
+ use correct methods for short and fast sliders, ooops
2018-01-02 17:10:05 +01:00
Aergwyn
737a53d826
clean up RequiredTypes
2018-01-02 17:04:00 +01:00
Shawdooow
e0beefdfd5
make this a float
2018-01-01 10:30:55 -05:00
Shawdooow
1df79c2f1b
Move stackThreshold up where possible
2018-01-01 10:30:09 -05:00
Aergwyn
80be40ed34
ignore new test classes
2018-01-01 12:08:44 +01:00
Aergwyn
481a16b491
extended hitobject tests
2018-01-01 11:55:30 +01:00
