smoogipoo
|
8d7453c251
|
Rework construction of nested hitobjects
|
2019-10-16 22:10:50 +09:00 |
|
smoogipoo
|
4ac2e1c58e
|
Move load() to below ctor()
|
2019-10-16 21:41:18 +09:00 |
|
Dean Herbert
|
51bf600ea7
|
Use empty hitwindows instead of null
|
2019-10-09 19:08:31 +09:00 |
|
Dean Herbert
|
b09d9b7e1f
|
Add todo in slider tail to avoid confusion
|
2019-10-08 17:56:56 +09:00 |
|
smoogipoo
|
c5540048ab
|
Fix tail circle not moving with slider position changes
|
2019-10-01 19:39:06 +09:00 |
|
smoogipoo
|
45f2bcc440
|
Fix combo bindings not being bound to nested hitobjects
|
2019-09-26 17:39:19 +09:00 |
|
smoogipoo
|
3155a90501
|
Use bindables for displayed circle piece numbers
|
2019-09-26 16:58:20 +09:00 |
|
smoogipoo
|
bbf0544a8d
|
Add bindables for IHasComboInformation properties
|
2019-09-26 16:55:08 +09:00 |
|
Dan Balasescu
|
13f922211f
|
Merge branch 'master' into decrease-disc-rotation-on-rewind
|
2019-09-24 12:58:27 +09:00 |
|
iiSaLMaN
|
57310c86c7
|
Remove unnecessary fields
|
2019-09-20 15:09:51 +03:00 |
|
iiSaLMaN
|
093ed8421e
|
Remove "allow slider ball tinting" ruleset setting
|
2019-09-20 15:08:00 +03:00 |
|
iiSaLMaN
|
1b45014ff6
|
Use logical-OR
|
2019-09-20 00:25:16 +03:00 |
|
iiSaLMaN
|
f6291170b1
|
Implement tinting slider ball with combo colour
|
2019-09-20 00:11:37 +03:00 |
|
Dan Balasescu
|
027d6194f2
|
Merge branch 'master' into add-hit-lighting
|
2019-09-19 18:07:29 +09:00 |
|
Dean Herbert
|
cfdac956c2
|
Fix issues with colour and skin application
|
2019-09-18 20:04:49 +09:00 |
|
Dean Herbert
|
ba76f09c99
|
Add initial implementation of hit lighting
Requires a supporting skin, like osu!classic for now.
|
2019-09-18 02:49:54 +09:00 |
|
smoogipoo
|
5c2c055614
|
Set lifetime on initial state update
|
2019-09-13 18:49:21 +09:00 |
|
Dean Herbert
|
f21e47d6d2
|
Move expire to DrawableHitObject
|
2019-09-12 19:29:08 +09:00 |
|
iiSaLMaN
|
aec04dcf90
|
Use Clock.ElapsedFrameTime instead
|
2019-09-09 15:36:20 +03:00 |
|
iiSaLMaN
|
c4aee11fe0
|
Revert renaming changes
|
2019-09-09 15:35:18 +03:00 |
|
iiSaLMaN
|
9defcb0e99
|
Remove redundant using directive
|
2019-09-08 21:37:50 +03:00 |
|
iiSaLMaN
|
f5f2713a17
|
Account angle change negatively on rewind
|
2019-09-08 16:14:14 +03:00 |
|
iiSaLMaN
|
3d8b27abfa
|
RotationAbsolute -> BidirectionalRotation
|
2019-09-08 16:13:36 +03:00 |
|
Dean Herbert
|
f925e781a9
|
Refactor HitWindows for legibility
|
2019-09-06 15:24:14 +09:00 |
|
Dean Herbert
|
2983918f71
|
Merge remote-tracking branch 'upstream/master' into skin-configuration-refactor
|
2019-09-04 13:40:41 +09:00 |
|
Dean Herbert
|
f8c1afa539
|
Fix two more cases of judgements appearing on hit error display when they shouldn't
|
2019-09-03 20:17:39 +09:00 |
|
Dean Herbert
|
858828d4ef
|
Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Game.Resources-2019.903.1' into fix-catch-catcher
|
2019-09-03 18:31:19 +09:00 |
|
Dean Herbert
|
bebc3309ce
|
Refactor skin configuration to be infinitely extensible
|
2019-09-03 17:57:34 +09:00 |
|
Dan Balasescu
|
3854bc68e0
|
Merge branch 'master' into fix-ring-glow-lookup
|
2019-09-03 16:14:07 +09:00 |
|
Dean Herbert
|
d1cdf49dd5
|
Revert SkinnableSprite lookups to old behaviour
|
2019-09-03 14:21:54 +09:00 |
|
Dean Herbert
|
05ed9d3802
|
Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements
|
2019-09-03 13:07:58 +09:00 |
|
Dean Herbert
|
4f3511e8e9
|
Fix ring glow lookup being incorrect
|
2019-09-03 12:32:10 +09:00 |
|
smoogipoo
|
8302658186
|
Fix other potential nullref cases that rider missed
|
2019-09-02 18:31:33 +09:00 |
|
smoogipoo
|
0c73c5acf3
|
Expose full hitobject rather than hit windows
|
2019-09-02 17:14:40 +09:00 |
|
smoogipoo
|
f2bdf94a1d
|
Add HitWindows to JudgementResult to indicate timing errors
|
2019-09-02 16:28:14 +09:00 |
|
smoogipoo
|
f3656475de
|
Return null hitwindows for non-time-based objects
|
2019-09-02 16:10:30 +09:00 |
|
Dean Herbert
|
70e417533f
|
Update naming
|
2019-08-30 15:13:29 +09:00 |
|
Dean Herbert
|
a15828ab25
|
Introduce the concept of SkinComponents
Removes reliance on string lookups and better defines elements for introduction into database
|
2019-08-30 14:55:52 +09:00 |
|
Dean Herbert
|
9a98f39f06
|
Share logic with other rulesets (and make default)
|
2019-08-28 18:12:47 +09:00 |
|
Dean Herbert
|
9752dbf950
|
Fix osu! approach circles fading in too late
|
2019-08-28 18:10:58 +09:00 |
|
Dean Herbert
|
745bd58f37
|
Merge remote-tracking branch 'upstream/master' into update-framework-blending
|
2019-08-21 15:10:08 +09:00 |
|
Dean Herbert
|
48716f8f2b
|
Update framework
|
2019-08-21 13:29:50 +09:00 |
|
Dean Herbert
|
62a24bf16d
|
Fix a couple of rotation-related issues
|
2019-08-20 13:18:34 +09:00 |
|
Dean Herbert
|
d0766fa1cd
|
Add slider ball animation support
|
2019-08-19 19:55:47 +09:00 |
|
Dean Herbert
|
59a5df8bca
|
Update framework (with cached changes) (#5666)
Update framework (with cached changes)
|
2019-08-09 23:47:40 +09:00 |
|
Dean Herbert
|
6264a6a1c9
|
Adjust slider snaking and hitcircle fading to match stable
|
2019-08-09 20:18:02 +09:00 |
|
Dean Herbert
|
90b1fe81f3
|
Update cached usage in line with framework changes
|
2019-08-09 19:12:29 +09:00 |
|
Dean Herbert
|
8e9f8bb565
|
Merge branch 'master' into slider-ball-scaling
|
2019-07-30 23:19:28 +09:00 |
|
Dean Herbert
|
fb1f77bd04
|
Move implementation and colour logic to legacy implementation
|
2019-07-30 23:06:18 +09:00 |
|
Dean Herbert
|
e6bd02d276
|
Simplify namespace definition
|
2019-07-30 22:41:20 +09:00 |
|
Dean Herbert
|
307a6c1095
|
Remove DefaultCirclePiece
|
2019-07-30 22:38:29 +09:00 |
|
Dean Herbert
|
1fbaa97218
|
Merge branch 'master' into add-legacy-hit-animations
|
2019-07-30 22:20:29 +09:00 |
|
Dean Herbert
|
4ee20bae30
|
Merge branch 'master' into slider-ball-scaling
|
2019-07-30 07:54:40 +09:00 |
|
smoogipoo
|
c01461b951
|
Recalculate path size when path radius changes
|
2019-07-29 19:12:41 +09:00 |
|
Dean Herbert
|
766cf9295d
|
Merge remote-tracking branch 'upstream/master' into add-legacy-hit-animations
|
2019-07-29 19:03:36 +09:00 |
|
Dean Herbert
|
a4f30daf13
|
Merge pull request #5462 from peppy/skin-metric-parity
Bring playfield ratio in line with stable
|
2019-07-29 18:49:21 +09:00 |
|
Dean Herbert
|
8487ecf98a
|
Fix slider ticks being scaled incorrectly (#5460)
Fix slider ticks being scaled incorrectly
|
2019-07-29 18:48:27 +09:00 |
|
Dean Herbert
|
afd6024ba2
|
Fix repeat points being scaled incorrectly (#5459)
Fix repeat points being scaled incorrectly
|
2019-07-29 18:48:04 +09:00 |
|
Dean Herbert
|
f2e90fdb26
|
Scale follow points by circle size (#5458)
Scale follow points by circle size
|
2019-07-29 18:47:48 +09:00 |
|
Dean Herbert
|
53a91b46e0
|
Fix approach circles not scaling to circle correctly when a ski… (#5455)
Fix approach circles not scaling to circle correctly when a skin is applied
|
2019-07-29 18:47:36 +09:00 |
|
Dan Balasescu
|
b74c11ad22
|
Merge branch 'master' into explode-circle-earlier
|
2019-07-29 18:05:47 +09:00 |
|
Dan Balasescu
|
7779302e82
|
Merge branch 'master' into skin-scaling-modes
|
2019-07-29 17:47:07 +09:00 |
|
smoogipoo
|
d4f85af19c
|
Force snaking slider paths to retain a fixed size
|
2019-07-25 18:22:56 +09:00 |
|
Dean Herbert
|
6cc6aff66e
|
Fix slider ball sizing when legacy skin falls back to default
|
2019-07-25 16:30:50 +09:00 |
|
Dean Herbert
|
859233526d
|
Move circle visual implementation to new class
Allows for more precise skin control over state animations.
|
2019-07-25 16:09:20 +09:00 |
|
Dean Herbert
|
3ca41b9c0a
|
Merge branch 'skin-metric-parity' into add-legacy-hit-animations
|
2019-07-25 16:07:23 +09:00 |
|
Dean Herbert
|
73b5a39c6e
|
Merge branch 'explode-circle-earlier' into add-legacy-hit-animations
|
2019-07-25 16:06:04 +09:00 |
|
Dean Herbert
|
5e8867066c
|
Correctly handling bindable scale changes
|
2019-07-25 14:43:44 +09:00 |
|
Dean Herbert
|
46e17646ac
|
Align slider path size with legacy skins
|
2019-07-25 14:22:26 +09:00 |
|
Dean Herbert
|
5e153a3dd3
|
Use scale correctly in DrawableSliderTick
|
2019-07-25 13:50:20 +09:00 |
|
Dean Herbert
|
2cb3619b54
|
Allow scaling outside of defined area
Caters to skins which show borders outside of the circle for repeats.
|
2019-07-25 13:27:41 +09:00 |
|
Dean Herbert
|
5a9d18380c
|
Use scale correctly in DrawableRepeatPoint
|
2019-07-25 13:25:31 +09:00 |
|
Dean Herbert
|
28653e871c
|
Give repeat points a size specification
|
2019-07-25 13:24:35 +09:00 |
|
Dean Herbert
|
2b184658d1
|
Adjust follow points by circle size
|
2019-07-25 13:06:25 +09:00 |
|
Dean Herbert
|
c989185774
|
Fix incorrect approach circle scaling
|
2019-07-25 11:27:24 +09:00 |
|
Dean Herbert
|
c16af88299
|
Start exploding animation earlier (don't wait for flash)
|
2019-07-25 11:11:26 +09:00 |
|
Dean Herbert
|
efad9b3150
|
Merge branch 'master' into skin-scaling-modes
|
2019-07-24 18:37:31 +09:00 |
|
Dan Balasescu
|
9b526ef61e
|
Merge branch 'master' into move-state-logic
|
2019-07-23 20:37:57 +09:00 |
|
Dean Herbert
|
91e21688d8
|
Make AccentColour a bindable (#5420)
Make AccentColour a bindable
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
|
2019-07-23 20:37:47 +09:00 |
|
smoogipoo
|
b1a9ce85e7
|
Fix ticks being given an extra colour
|
2019-07-23 20:30:47 +09:00 |
|
Dean Herbert
|
c3b81bef4a
|
Flip default to the preferred method going forward
|
2019-07-22 15:55:38 +09:00 |
|
Dean Herbert
|
be170b4124
|
Naming and documentation improvements
|
2019-07-22 15:50:02 +09:00 |
|
Dean Herbert
|
6d889c8a37
|
Revert unintended change
|
2019-07-22 15:43:27 +09:00 |
|
Dean Herbert
|
91f86adb66
|
Move DrawableHitObject state management to base class
|
2019-07-22 15:07:12 +09:00 |
|
Dean Herbert
|
8327452fe1
|
Make AccentColour a bindable
|
2019-07-22 14:48:59 +09:00 |
|
Dean Herbert
|
74c961bcff
|
Add more flexible skin element confine modes
|
2019-07-22 14:42:56 +09:00 |
|
Dean Herbert
|
e50b70d615
|
Centralise osu! circle radius specification
|
2019-07-22 14:40:02 +09:00 |
|
smoogipoo
|
a9286fee07
|
Recycle slider paths when the parenting slider dies
|
2019-07-17 16:20:27 +09:00 |
|
smoogipoo
|
ed203cb0ff
|
Delay intial hitobject updates
|
2019-07-16 13:45:59 +09:00 |
|
Salman Ahmed
|
d11b799571
|
Add explaining comment
|
2019-06-30 18:28:20 +03:00 |
|
Salman Ahmed
|
f42ded3437
|
Move to DrawableOsuHitObject
|
2019-06-30 18:27:47 +03:00 |
|
Dean Herbert
|
60ea3d4e1a
|
Fix skinning support for combobreak
|
2019-06-30 21:58:30 +09:00 |
|
Dean Herbert
|
aca9289d89
|
Use SkinnableSprite for approach circle
|
2019-06-24 15:17:56 +09:00 |
|
smoogipoo
|
ae438213a5
|
Remove secondary buffered container from slider body
|
2019-06-06 16:32:43 +09:00 |
|
Dean Herbert
|
daa2786dbd
|
Use a constant for the default value
|
2019-05-12 23:08:42 +09:00 |
|
Dean Herbert
|
487a56549e
|
Fix CI issues
|
2019-05-12 22:53:12 +09:00 |
|
Dean Herbert
|
ce0e4c506e
|
Merge branch 'master' into dev
|
2019-05-12 21:45:52 +09:00 |
|
Dean Herbert
|
b8446fb67f
|
Fix fallbacks for SliderTrackOverride and SliderBall too
|
2019-05-12 18:51:31 +09:00 |
|
Dean Herbert
|
cbf126db25
|
Merge branch 'master' into fix-slider-border-color
|
2019-05-12 17:25:49 +09:00 |
|
smoogipoo
|
117f8bdd01
|
Merge remote-tracking branch 'Joehuu/master' into flashlight-dim
|
2019-05-08 13:25:01 +09:00 |
|
smoogipoo
|
d7c09e7dbd
|
Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
# osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
# osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
# osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
# osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
# osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Graphics/OsuFont.cs
# osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
# osu.Game/Overlays/Profile/Header/BadgeContainer.cs
# osu.Game/Overlays/Profile/ProfileHeader.cs
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/Skinning/LegacySkinDecoder.cs
|
2019-05-07 13:20:17 +09:00 |
|
David Zhao
|
732b0b22a3
|
Merge remote-tracking branch 'upstream/master' into flashlight-dim
|
2019-05-07 12:04:58 +09:00 |
|
Joehu
|
8ef6a745f7
|
Fix slider border not reverting to default color
|
2019-05-05 22:43:03 -07:00 |
|
David Zhao
|
664a4ba540
|
Implement flashlight dimming on slider slide
|
2019-04-12 10:47:22 +09:00 |
|
smoogipoo
|
772bef91fa
|
Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
# osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
|
2019-04-08 23:01:12 +09:00 |
|
Dean Herbert
|
f1952c0816
|
Update font awesome usage
|
2019-04-02 19:55:24 +09:00 |
|
smoogipoo
|
a56e29347f
|
Adjust namespaces
|
2019-04-02 14:51:28 +09:00 |
|
Dean Herbert
|
c39c37a18d
|
Apply more missed cases
|
2019-04-01 12:44:46 +09:00 |
|
Dean Herbert
|
612db31c38
|
Apply newline additions
|
2019-04-01 12:16:32 +09:00 |
|
Dean Herbert
|
176b4ecc38
|
Merge branch 'master' into sprite-icon-compatibility
|
2019-03-28 23:47:44 +09:00 |
|
Dean Herbert
|
8f5e769425
|
Fix slider ball not always receiving position in time
|
2019-03-28 12:42:28 +09:00 |
|
Dean Herbert
|
de80fc0eac
|
Update icon usage to match framework changes
|
2019-03-27 19:29:27 +09:00 |
|
Santeri Nogelainen
|
b624ecabde
|
Max = 8
|
2019-03-16 12:47:37 +02:00 |
|
Santeri Nogelainen
|
cbb7498a42
|
Border size to float, add min and max size, other small changes
|
2019-03-16 12:41:03 +02:00 |
|
Santeri Nogelainen
|
92595e43f6
|
slider border thickness
|
2019-03-14 21:57:39 +02:00 |
|
Jamie Taylor
|
5cc670cd19
|
Prevent ApplyTransformsAt from propogating to SliderBall children
|
2019-03-14 19:17:28 +09:00 |
|
Dean Herbert
|
1617e2a729
|
Merge branch 'master' into mania-judgemetns
|
2019-03-13 18:17:42 +09:00 |
|
David Zhao
|
527b77b07d
|
Make all inheritors of drawablejudgement use new method
|
2019-03-12 19:52:44 +09:00 |
|
Dean Herbert
|
63fea65c0c
|
Clarify repeat index
|
2019-03-11 14:53:21 +09:00 |
|
Dean Herbert
|
489153579a
|
Add xmldoc and clarify struct variables
|
2019-03-11 14:36:29 +09:00 |
|
Dean Herbert
|
93a999396e
|
LegacyFinalTick -> LegacyLastTick to match existing variable
|
2019-03-08 20:13:11 +09:00 |
|
Dean Herbert
|
165a353a83
|
Add extensive commenting about LegacyLastTick usage
|
2019-03-08 20:12:48 +09:00 |
|
Dean Herbert
|
355705f0a5
|
Fix legacy tick handling
|
2019-03-08 19:57:30 +09:00 |
|
Dean Herbert
|
973f29b765
|
Apply review
|
2019-03-08 15:14:57 +09:00 |
|
Dean Herbert
|
551380dd42
|
Extract slider tick creation so it can be shared with osu!catch
|
2019-03-08 14:46:26 +09:00 |
|
Dean Herbert
|
340997f505
|
Rename remaining usage of PathWidth naming convention
|
2019-03-07 20:21:59 +09:00 |
|
David Zhao
|
b3e046c4d1
|
Rename PathWidth to PathRadius
|
2019-03-07 17:39:19 +09:00 |
|
smoogipoo
|
0322bd8812
|
Make config nullable, removing testcase code
|
2019-03-05 14:40:27 +09:00 |
|
smoogipoo
|
78596dfe80
|
Merge remote-tracking branch 'origin/master' into move-osu-settings
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
# osu.Game.Rulesets.Osu.Tests/TestCaseSlider.cs
|
2019-03-05 13:25:03 +09:00 |
|
Dean Herbert
|
0788a7e9f1
|
Merge branch 'master' into more-inspections
|
2019-02-28 14:32:57 +09:00 |
|
Dean Herbert
|
42be7857d1
|
Use expression body for property get/set where possible
|
2019-02-28 13:58:19 +09:00 |
|
Dean Herbert
|
26d53d06a9
|
Fix remaining issues
|
2019-02-28 13:31:40 +09:00 |
|
Dean Herbert
|
c8793911a8
|
Enable more stringent inspectcode style inspections
|
2019-02-27 21:25:40 +09:00 |
|
smoogipoo
|
a07d797d75
|
Merge remote-tracking branch 'Joehuu/master' into use-lifetime-optimization
|
2019-02-27 12:08:43 +09:00 |
|
smoogipoo
|
d06f38b3f3
|
Cleanup
|
2019-02-25 15:57:07 +09:00 |
|
Dean Herbert
|
7f5780c615
|
Simplify SliderBall and fix incorrect key up handling
Was not processing timeToAcceptAnyKeyAfter when cursor was outside valid tracking area, but should have been.
|
2019-02-23 14:38:53 +09:00 |
|
Dan Balasescu
|
5fdd7f9bff
|
Fix typo in comment
Co-Authored-By: peppy <pe@ppy.sh>
|
2019-02-23 14:14:34 +09:00 |
|
Dean Herbert
|
3a57ff40cd
|
Add comment about other cases, rewind handling
|
2019-02-23 14:14:34 +09:00 |
|
Dean Herbert
|
8e52e2330e
|
Add extensive commenting
|
2019-02-23 14:14:34 +09:00 |
|
Dean Herbert
|
1c75ee4e82
|
Add fixes
|
2019-02-23 14:14:34 +09:00 |
|
Dean Herbert
|
7566fcf536
|
Slider press fix
|
2019-02-23 14:14:34 +09:00 |
|
Dean Herbert
|
367bc53a06
|
Revert some more instances of 'e' variable names
|
2019-02-22 20:15:25 +09:00 |
|
smoogipoo
|
d61dfe888e
|
Fix venera fonts not being correctly specified
|
2019-02-22 19:42:09 +09:00 |
|
Dean Herbert
|
3015d40f8f
|
Merge branch 'master' into osu-fontusage
|
2019-02-22 18:09:23 +09:00 |
|
smoogipoo
|
d8c55bc729
|
Adjust namespaces
|
2019-02-21 19:05:52 +09:00 |
|
smoogipoo
|
bca347427f
|
Update with framework bindable changes
|
2019-02-21 18:56:34 +09:00 |
|
smoogipoo
|
0693ab8e7d
|
Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
# osu.Game/Screens/Multi/Components/BeatmapTitle.cs
|
2019-02-20 15:04:08 +09:00 |
|
smoogipoo
|
a2aa3ec5cb
|
Adjust sprite texts in-line with framework changes
|
2019-02-20 15:03:20 +09:00 |
|
Dan Balasescu
|
c9c8cccd68
|
Merge branch 'master' into use-lifetime-optimization
|
2019-02-18 15:22:34 +09:00 |
|
Dean Herbert
|
810175235d
|
Fix incorrect application of scaling in some cases
Isolates different usages of hitcircle scale so they can't ever cause regressions.
|
2019-02-14 18:47:05 +09:00 |
|
Dean Herbert
|
5b1f111922
|
Rollback other fallthrough regressions
|
2019-02-05 18:14:43 +09:00 |
|
Dean Herbert
|
2f8f4fac64
|
Fix combo colour fallbacks when skin is not providing any
|
2019-02-05 17:54:14 +09:00 |
|
ekrctb
|
504e79b968
|
Merge branch 'master' into use-lifetime-optimization
|
2019-01-29 12:15:02 +09:00 |
|
Unknown
|
77763fde8b
|
revert accidentally renamed variables
|
2019-01-25 11:22:05 +01:00 |
|
Unknown
|
8ddff673b7
|
revert previous rename and rename ruleset specific classes instead
|
2019-01-25 11:14:37 +01:00 |
|
Unknown
|
5446c99f22
|
Merge branch 'master' into move-osu-settings
|
2019-01-25 10:57:04 +01:00 |
|
Dean Herbert
|
8617aaa2a7
|
Update licence header (and remove year)
|
2019-01-24 17:43:03 +09:00 |
|
Unknown
|
cf147083cd
|
move osu! settings into its ruleset
|
2019-01-23 13:17:29 +01:00 |
|
Unknown
|
4a9bcf4937
|
rename OsuConfigManager to GameConfigManager
also OsuSetting to GameSetting
|
2019-01-23 13:17:29 +01:00 |
|
smoogipoo
|
e44bc57a3d
|
Fix minDistanceFromEnd using seconds rather than milliseconds
Velocity in stable is defined as distance per SECOND, while lazer defines it as distance per MILLISECOND.
|
2019-01-15 19:18:56 +09:00 |
|
Unknown
|
6eff79913b
|
remove blank lines
|
2019-01-11 10:34:56 +01:00 |
|
Dean Herbert
|
881b10a18f
|
Merge remote-tracking branch 'Dragicafit/moreOptionsFromSkin.ini' into moreOptionsFromSkin.ini
|
2019-01-08 11:01:04 +09:00 |
|
Dean Herbert
|
7eed3ffe75
|
Merge branch 'master' into moreOptionsFromSkin.ini
|
2019-01-08 10:02:06 +09:00 |
|
Dean Herbert
|
4cee21f356
|
Make skinning better
|
2019-01-07 20:12:39 +09:00 |
|
Dean Herbert
|
13b077c83b
|
Merge remote-tracking branch 'upstream/master' into moreOptionsFromSkin.ini
|
2019-01-07 18:11:17 +09:00 |
|
Roman Kapustin
|
4b5fc85875
|
Use Find instead of FirstOrDefault
|
2019-01-05 19:35:33 +03:00 |
|
smoogipoo
|
3fa5a33fb1
|
Inline const
|
2019-01-03 18:58:07 +09:00 |
|
smoogipoo
|
273b14b19c
|
Add a maximum length for slider ticks to be generated
|
2019-01-03 18:51:47 +09:00 |
|
smoogipoo
|
c56d8b75c1
|
Cache slider's endposition
|
2019-01-03 17:43:10 +09:00 |
|
ekrctb
|
6f8a2e6ff2
|
Use LifetimeManagementContainer
This is a significant performance boost for gameplay,
especially for long or stroyboard-heavy maps.
|
2018-12-13 15:23:06 +09:00 |
|
Dragicafit
|
ec3c87dbea
|
Make Slider's CustumColors skinnable
|
2018-12-07 22:24:24 +01:00 |
|
Dean Herbert
|
1a974f64de
|
Initial design for user registration dialog
|
2018-12-05 12:57:26 +09:00 |
|
smoogipoo
|
aea84f737b
|
Fix taiko hitobjects potentially disappearing before being judged
|
2018-11-29 12:12:29 +09:00 |
|
smoogipoo
|
52bc47499f
|
Fix spinners not having proper lifetimes
|
2018-11-29 12:11:45 +09:00 |
|
smoogipoo
|
f27bd3ef3e
|
OpenTK -> osuTK
|
2018-11-20 17:14:59 +09:00 |
|
smoogipoo
|
050af88be9
|
Fix post-merge issues
|
2018-11-14 14:29:22 +09:00 |
|
smoogipoo
|
29422345f7
|
Merge remote-tracking branch 'origin/master' into fix-mask-disposal
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
# osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
# osu.Game.Rulesets.Osu/Objects/Slider.cs
|
2018-11-14 14:03:25 +09:00 |
|
smoogipoo
|
3aba462e52
|
Make Path.Distance a property again
|
2018-11-12 14:07:48 +09:00 |
|
smoogipoo
|
54ab256c8e
|
Instantiate a new path rather than setting properties on it
# Conflicts:
# osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
# osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
# osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
# osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/SliderPath.cs
|
2018-11-12 13:50:19 +09:00 |
|
smoogipoo
|
cc8531790a
|
Use bindables for hitobject events
|
2018-11-09 13:58:46 +09:00 |
|
smoogipoo
|
c6350c6efd
|
Remove IHasEditablePosition
|
2018-11-08 13:03:11 +09:00 |
|
smoogipoo
|
a4caaf56ef
|
Merge remote-tracking branch 'origin/master' into fix-slider-samples
# Conflicts:
# osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
# osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
|
2018-11-05 16:38:28 +09:00 |
|
Dean Herbert
|
63cbc8e0e8
|
Merge branch 'master' into slider-placement
|
2018-11-02 19:45:34 +09:00 |
|
Dean Herbert
|
7f1ee3bcb4
|
Disallow spinner movement for now
|
2018-11-02 12:06:53 +09:00 |
|
Dean Herbert
|
c1304eca1b
|
Merge remote-tracking branch 'upstream/master' into slider-placement
|
2018-11-01 17:59:37 +09:00 |
|
Dean Herbert
|
5fd21d35dc
|
Merge branch 'master' into spinner-selection
|
2018-11-01 17:47:59 +09:00 |
|
Dean Herbert
|
bb2f8deb18
|
ControlPoint -> PathControlPoint
Also Curve -> Path.
|
2018-11-01 03:56:51 +09:00 |
|
smoogipoo
|
af1de01ed6
|
Add a spinner selection mask
|
2018-10-29 18:23:23 +09:00 |
|
smoogipoo
|
08b16be3b8
|
Merge branch 'slider-controlpoint-masks' into slider-placement
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/Components/SliderBodyPiece.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
|
2018-10-29 15:55:38 +09:00 |
|
smoogipoo
|
acd703c27b
|
Make sliders respond to control point changes
|
2018-10-29 15:36:43 +09:00 |
|
smoogipoo
|
b0f5ace0e8
|
Implement slider control point visualisation
|
2018-10-29 15:29:34 +09:00 |
|
smoogipoo
|
660cd24750
|
Make sliders respond to scale changes
|
2018-10-29 15:26:28 +09:00 |
|
smoogipoo
|
619a0dfd59
|
Merge branch 'separate-slider-body' into editor-mask-placement
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs
|
2018-10-29 15:24:15 +09:00 |
|
smoogipoo
|
86e09a68f7
|
Separate slider body to bypass snaking logic
The snaking logic contains a lot of caching/optimisations and offsetting of the path which is tedious to re-compute when the path changes.
|
2018-10-29 15:15:29 +09:00 |
|
Dean Herbert
|
4f65d67e2b
|
Merge branch 'master' into skinnable-spritetext
|
2018-10-28 08:35:25 -07:00 |
|
smoogipoo
|
22c545ea8c
|
Make circle piece respond to hitobject scale
|
2018-10-26 15:26:19 +09:00 |
|
smoogipoo
|
f674fcf2c8
|
Merge branch 'mask-separation' into editor-mask-placement
# Conflicts:
# osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
# osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
# osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
|
2018-10-26 14:05:30 +09:00 |
|
smoogipoo
|
9656186b64
|
Make the hitobject masks move within their placement/selection
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/Components/HitCircleMask.cs
# osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/HitCircleSelectionMask.cs
# osu.Game.Rulesets.Osu/Edit/Masks/HitCirclePlacementMask.cs
# osu.Game/Rulesets/Edit/PlacementMask.cs
|
2018-10-26 13:45:31 +09:00 |
|
smoogipoo
|
ea6db8b793
|
Make the hitobject masks move within their placement/selection
|
2018-10-25 18:16:25 +09:00 |
|
Dean Herbert
|
cd718812b2
|
Merge branch 'master' into tighten-diffcalc-tolerances
|
2018-10-18 14:01:47 +09:00 |
|