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
|
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 |
|
David Zhao
|
527b77b07d
|
Make all inheritors of drawablejudgement use new method
|
2019-03-12 19:52:44 +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 |
|
Unknown
|
6eff79913b
|
remove blank lines
|
2019-01-11 10:34:56 +01: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 |
|
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
|
cc8531790a
|
Use bindables for hitobject events
|
2018-11-09 13:58:46 +09:00 |
|
Dean Herbert
|
63cbc8e0e8
|
Merge branch 'master' into slider-placement
|
2018-11-02 19:45:34 +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
|
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
|
70f1d17b7e
|
Merge remote-tracking branch 'origin/master' into editor-mask-placement
# Conflicts:
# osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
# osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
# osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
# osu.Game/Rulesets/UI/RulesetContainer.cs
|
2018-10-16 17:28:16 +09:00 |
|
Dan Balasescu
|
a2838d32bf
|
Merge branch 'master' into skinnable-spritetext
|
2018-10-09 16:23:43 +09:00 |
|
smoogipoo
|
42664f1c19
|
Make SliderBody use the new SmoothPath
|
2018-10-05 15:45:45 +09:00 |
|
smoogipoo
|
1cd11a6e5b
|
Fix StackHeight changes not causing position updates
|
2018-10-03 17:06:18 +09:00 |
|
ekrctb
|
68980fc477
|
Adjust usage of Handle(Non)PositionalInput to follow framework update
|
2018-10-02 14:45:33 +09:00 |
|
ekrctb
|
50091252e2
|
Adapt signature change of event handlers
|
2018-10-02 12:02:55 +09:00 |
|
ekrctb
|
99fc04c8af
|
Change signature to new event handler
|
2018-10-02 12:02:47 +09:00 |
|
smoogipoo
|
0d8276c5f8
|
Implement skinnable sprite text
|
2018-09-27 17:40:28 +09:00 |
|
smoogipoo
|
a8f156584b
|
Update framework with positional/non-positional changes
|
2018-09-26 14:01:15 +09:00 |
|
Dean Herbert
|
7cca990be4
|
Merge remote-tracking branch 'upstream/master' into framework-image-changes
|
2018-09-07 18:56:00 +09:00 |
|
Dean Herbert
|
9f67119ba9
|
Fix potential nullref in IsPresent override
|
2018-09-06 18:01:32 +09:00 |
|
Dean Herbert
|
4ff66bf531
|
Update in line with framework Image changes
|
2018-09-06 13:28:44 +09:00 |
|
Dean Herbert
|
03084aa04b
|
Revert async changes
|
2018-08-31 07:07:10 +09:00 |
|
smoogipoo
|
1b279d383f
|
Use GetAsync on all textures
|
2018-08-27 17:26:44 +09:00 |
|
Dean Herbert
|
ffcad6e0f1
|
Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake
# Conflicts:
# osu.Game.Rulesets.Osu.Tests/TestCaseHitCircle.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
|
2018-08-24 15:26:36 +09:00 |
|
smoogipoo
|
34b1abeca3
|
Remove sliderball's input override
|
2018-08-21 12:24:48 +09:00 |
|
smoogipoo
|
741ec0021e
|
Rename more judgement-related methods to "result"
|
2018-08-06 11:31:46 +09:00 |
|
smoogipoo
|
ab642b563f
|
CreateJudgementResult -> CreateResult
|
2018-08-06 11:07:41 +09:00 |
|
smoogipoo
|
2a4994e5ce
|
Make hitobjects only have one judgement + result
|
2018-08-03 15:38:48 +09:00 |
|
smoogipoo
|
4548d2c87f
|
Make Rulesets.Osu use the new judgement result structure
|
2018-08-02 20:36:38 +09:00 |
|
smoogipoo
|
462f1033c0
|
Migrate Rulesets.Osu to the new judgement system
|
2018-08-02 15:21:23 +09:00 |
|
Dean Herbert
|
51506efd1a
|
Merge remote-tracking branch 'upstream/master' into peppy-fix-repeat-arrow-interpolation
|
2018-07-31 16:49:31 +09:00 |
|
Dean Herbert
|
ea6cab498e
|
Add comment
|
2018-07-31 16:47:13 +09:00 |
|
Dan Balasescu
|
04252293a7
|
Merge branch 'master' into fix-repeat-arrow-interpolation
|
2018-07-31 16:21:15 +09:00 |
|
Dean Herbert
|
874b5636e4
|
Merge remote-tracking branch 'upstream/master' into tgi74-more-skinning
|
2018-07-31 16:15:27 +09:00 |
|
Dean Herbert
|
976653fdf9
|
Minor formatting fixes
|
2018-07-31 16:13:52 +09:00 |
|
Dean Herbert
|
132241424d
|
Apply FollowPoint alpha to inner container (should not affect legacy skins)
|
2018-07-31 15:59:06 +09:00 |
|
Dean Herbert
|
a98bb057e2
|
Fix follow circle being scaled far larger than it should be
|
2018-07-31 15:27:21 +09:00 |
|
tgi74000
|
36afae5a24
|
Remove the inner followcircle fade, Fade the entire followcircle instead
|
2018-07-30 13:43:02 +02:00 |
|
Dean Herbert
|
f4cda695e6
|
Improve rotation handling in edge cases
|
2018-07-30 18:50:59 +09:00 |
|
tgi74000
|
c6aabc6d2d
|
Move the FollowCircle border to its own container
|
2018-07-30 10:52:37 +02:00 |
|
Dean Herbert
|
a39188f762
|
Merge remote-tracking branch 'upstream/master' into peppy-fix-repeat-arrow-interpolation
|
2018-07-30 17:29:21 +09:00 |
|
tgi74000
|
84135c49ca
|
Fix small FollowPoint rotation bug
|
2018-07-29 23:21:05 +02:00 |
|
tgi74000
|
18096490b6
|
Add support for followpoint skinning
|
2018-07-29 23:20:37 +02:00 |
|
tgi74000
|
4322475ad2
|
Add support for sliderb skinning (single frame only)
|
2018-07-29 22:29:07 +02:00 |
|
tgi74000
|
257c035f30
|
Add support for sliderfollowcircle skinning
|
2018-07-29 21:28:13 +02:00 |
|
tgi74000
|
52d9461f03
|
Add support for reversearrow skinning
|
2018-07-29 20:51:06 +02:00 |
|
tgi74000
|
2a9818a128
|
Add support for sliderscorepoint skinning
|
2018-07-29 20:42:05 +02:00 |
|
smoogipoo
|
ff2a3a6e92
|
Fix hitobjects not properly expiring if scrolling in the editor
|
2018-07-26 20:07:16 +09:00 |
|
Dean Herbert
|
10656be954
|
Add interpolation to repeat point during sliding
|
2018-07-23 16:55:38 +02:00 |
|
Dean Herbert
|
0f37758314
|
Update framework
|
2018-07-21 16:21:53 +09:00 |
|
Dean Herbert
|
79af5cb0a0
|
Limit shake duration to ensure it doesn't overlap miss window
|
2018-07-06 17:24:30 +09:00 |
|
Dean Herbert
|
e041352690
|
Add comment regarding add/clear/remove overrides
|
2018-07-06 13:19:43 +09:00 |
|
Dean Herbert
|
48d90a67ae
|
xmldoc and formatting
|
2018-07-06 12:13:23 +09:00 |
|
Dean Herbert
|
aa96d91762
|
Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake
|
2018-07-06 11:57:32 +09:00 |
|
Dean Herbert
|
d453414070
|
Forward shakes from slider head objects to sliders
|
2018-07-06 11:52:58 +09:00 |
|
tgi74000
|
558b2622a7
|
Move the Shake logic to a new ShakeContainer
|
2018-07-05 15:48:54 +02:00 |
|
Dean Herbert
|
1d6609d9f3
|
Add common custom words to dotsettings dictionary
Also fixes some typos and reduces spelling suggestions to hints.
|
2018-07-05 15:54:41 +09:00 |
|
smoogipoo
|
45a4187923
|
Tidy up lookups to NestedHitObjects
|
2018-07-02 16:10:56 +09:00 |
|
Dan Balasescu
|
f35ea18755
|
Merge branch 'master' into hit-shake
|
2018-06-29 17:38:02 +09:00 |
|