Dean Herbert
|
dc1046bf0c
|
Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin
|
2019-08-30 12:53:05 +09:00 |
|
smoogipoo
|
6641811125
|
Add EditorWorkingBeatmap for reuse of the playable beatmap
|
2019-08-29 19:41:12 +09:00 |
|
smoogipoo
|
6ab2b20c70
|
Add an interface for working beatmaps
|
2019-08-29 19:38:44 +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
|
7ea55a5cdd
|
Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin
|
2019-08-28 16:36:20 +09:00 |
|
Dean Herbert
|
7aeeb65ae7
|
Tidy up Player's container loading logic
Fixes drawable ruleset being loaded before skin sources are finished, by loading them as a separate operation (to avoid children being loaded first).
|
2019-08-27 18:27:21 +09:00 |
|
Dean Herbert
|
db987c6077
|
Move SliderBall colour logic to OsuLegacySkinProvider
|
2019-08-26 14:45:29 +09:00 |
|
Dean Herbert
|
7b82121b85
|
Add comment about lazy usage
|
2019-08-26 13:03:00 +09:00 |
|
Dean Herbert
|
5e362d10b1
|
Add ruleset-specific legacy skin providers
This moves implementation of osu! skinnables to OsuLegacySkin.
|
2019-08-26 12:21:49 +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
|
707911acac
|
Tidy up code formatting / variable naming
|
2019-08-12 15:05:27 +09:00 |
|
Dean Herbert
|
45b4fc9201
|
Add xmldoc
|
2019-08-12 15:00:32 +09:00 |
|
Dean Herbert
|
31fe121fe9
|
Merge remote-tracking branch 'RedMindZ/master' into autopilot
|
2019-08-12 14:40:52 +09:00 |
|
Dean Herbert
|
f7f3f4fb4a
|
Merge branch 'master' into master
|
2019-08-12 13:37:09 +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 |
|
smoogipoo
|
d47a8c0826
|
Remove unused combo result count statistic
|
2019-08-09 14:04:51 +09:00 |
|
Dean Herbert
|
73cd7b0cc2
|
Fix incorrect implementation of old stacking algorithm (#5632)
Fix incorrect implementation of old stacking algorithm
|
2019-08-07 21:53:33 +09:00 |
|
smoogipoo
|
bc3a340286
|
Fix incorrect path position being used for old stacking algorithm
|
2019-08-07 19:35:39 +09:00 |
|
smoogipoo
|
42de5934f6
|
Fix incorrect hitobject indices
|
2019-08-07 19:33:35 +09:00 |
|
Dean Herbert
|
38df49995c
|
Fix cursor scale not matching osu-stable
|
2019-08-07 18:35:07 +09:00 |
|
smoogipoo
|
f2b940f930
|
Add tests
|
2019-08-01 17:31:37 +09:00 |
|
smoogipoo
|
8a64ab0384
|
Remove generics from IApplicableToBeatmap
|
2019-08-01 12:39:32 +09:00 |
|
Dean Herbert
|
f9c95e21be
|
Merge remote-tracking branch 'upstream/master' into legacy-cursor-middle
|
2019-07-30 23:44:13 +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 |
|
smoogipoo
|
1222536f7a
|
Rename resource string
|
2019-07-30 19:10:21 +09:00 |
|
Dan Balasescu
|
114c2006c1
|
Merge branch 'master' into legacy-cursor-middle
|
2019-07-30 19:06:28 +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 |
|
Dan Balasescu
|
ef229c0f80
|
Merge branch 'master' into legacy-cursor-middle
|
2019-07-29 18:52:11 +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
|
396892da1a
|
Describe how the ratio came to be
|
2019-07-29 18:43:05 +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 |
|
Dean Herbert
|
3e74079d02
|
Add incompatibility with scale tween mods
|
2019-07-29 01:15:57 +09:00 |
|
Dean Herbert
|
07f905d21c
|
Tidy up code and fix explode animations not playing correctly
|
2019-07-29 01:00:41 +09:00 |
|
Dean Herbert
|
4204ba6014
|
Merge branch 'master' into spin-in
|
2019-07-28 22:51:09 +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
|
c1b0130857
|
Add legacy cursormiddle support
|
2019-07-25 16:23:04 +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
|
9473f6d3e3
|
Fix incorrect ratios being applied to playfield / skin elements
This now matches osu-stable 1:1.
|
2019-07-25 14:22:22 +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
|
f8feac792c
|
Return TouchDevice in GetAllMods response
|
2019-07-23 13:14:28 +09:00 |
|
Dean Herbert
|
d5ee4cbc9c
|
Move TouchDevice mod to new "system" category
|
2019-07-23 13:14:28 +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 |
|
Dean Herbert
|
3e57fcf5c5
|
Merge remote-tracking branch 'upstream/master' into cleanup-slider-bodies
|
2019-07-17 22:11:01 +09:00 |
|
smoogipoo
|
9f6ff63634
|
Fix judgement disposals causing huge LOH pressure
|
2019-07-17 19:25:41 +09:00 |
|
Dean Herbert
|
1a19cf0739
|
Fix 0-length sliders not getting correct lengths (#5033)
Fix 0-length sliders not getting correct lengths
|
2019-07-17 18:01:57 +09:00 |
|
smoogipoo
|
a9286fee07
|
Recycle slider paths when the parenting slider dies
|
2019-07-17 16:20:27 +09:00 |
|
smoogipoo
|
62b867018d
|
Refactor a bit
|
2019-07-16 17:51:17 +09:00 |
|
smoogipoo
|
b0415dc30a
|
Remove cursortrail drawnode allocs
|
2019-07-16 17:33:14 +09:00 |
|
smoogipoo
|
ed203cb0ff
|
Delay intial hitobject updates
|
2019-07-16 13:45:59 +09:00 |
|
MaxOhn
|
581ffb7fb0
|
Adjusted slider border colour
|
2019-07-08 13:52:15 +02:00 |
|
MaxOhn
|
130c50eee4
|
Merge branch 'master' of https://www.github.com/ppy/osu into traceable-mod
|
2019-07-08 13:43:16 +02:00 |
|
Salman Ahmed
|
dfabed3d85
|
Merge branch 'master' into applicable-to-hud
|
2019-07-06 16:30:02 +03:00 |
|
smoogipoo
|
5862eb172a
|
Merge remote-tracking branch 'origin/master' into fix-zero-length-sliders
# Conflicts:
# 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
|
2019-07-05 15:48:04 +09:30 |
|
smoogipoo
|
3d12c709a5
|
Add test case
|
2019-07-05 15:40:47 +09:30 |
|
MaxOhn
|
5b4640d3ea
|
Traceable no longer inherits from OsuModHidden and is no longer multi mod
|
2019-07-03 21:40:14 +02:00 |
|
MaxOhn
|
b63a7593eb
|
Merged with upstream master
|
2019-07-03 18:56:11 +02:00 |
|
MaxOhn
|
664257fbbe
|
Sliders no longer modified by HD but have transparent body now
|
2019-07-03 18:42:02 +02:00 |
|
Dean Herbert
|
cc9a28afa8
|
Add shared base class for both mod imlpementations
|
2019-07-03 19:42:16 +09:00 |
|
Dean Herbert
|
e95586857e
|
Merge remote-tracking branch 'upstream/master' into deflate-branch
|
2019-07-03 19:26:21 +09:00 |
|
Dean Herbert
|
9bed0094de
|
Merge remote-tracking branch 'upstream/master' into android
|
2019-07-02 19:40:50 +09:00 |
|
Salman Ahmed
|
744e651a37
|
Merge branch 'master' into applicable-to-hud
|
2019-07-02 05:24:56 +03:00 |
|
MaxOhn
|
4145173ac9
|
Combined hidden with traceable as multi mod
|
2019-07-02 04:04:07 +02:00 |
|
Salman Ahmed
|
a8e8650ddd
|
Move blocking fail logic into a base class
|
2019-07-02 01:47:39 +03:00 |
|
MaxOhn
|
d753f446e4
|
Updated license header
|
2019-07-01 20:20:25 +02:00 |
|
MaxOhn
|
5496b8bc58
|
Rewrote traceable mod to inherit from hidden
|
2019-07-01 20:11:50 +02:00 |
|
MaxOhn
|
845bf21f7f
|
Resolved merge with upstream master
|
2019-07-01 20:00:52 +02:00 |
|
MaxOhn
|
48a828b746
|
Removed redundant imports and fixed indentation
|
2019-07-01 17:49:37 +02:00 |
|
MaxOhnh
|
02b9e89f43
|
Removed old unnecessary change, updated license header and apply deflating onto first object regardless
|
2019-07-01 14:46:17 +02:00 |
|
MaxOhnh
|
cd5e1bc4b1
|
Replace deflate progress with modified copy-paste of grow mod
|
2019-07-01 13:55:09 +02:00 |
|
MaxOhnh
|
93b780c9a8
|
Resolved merge
|
2019-07-01 13:53:40 +02: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 |
|
iiSaLMaN
|
9c9334a8ba
|
Hide health bar in relax mod
|
2019-06-29 04:26:24 +03:00 |
|
Albert Tang
|
3cf2ffc1a7
|
Merge branch 'master' into android
|
2019-06-25 17:54:23 -05:00 |
|
smoogipoo
|
0d98d637b6
|
Fix cursor expansion state potentially being incorrect
|
2019-06-25 15:47:54 +09:00 |
|
Dean Herbert
|
aca9289d89
|
Use SkinnableSprite for approach circle
|
2019-06-24 15:17:56 +09:00 |
|
Shane Woolcock
|
17d103181c
|
Merge branch 'master' into android
|
2019-06-18 20:05:14 +09:30 |
|
Dean Herbert
|
b29b1bf254
|
Merge branch 'master' into mod-grow-improvement
|
2019-06-12 13:18:02 +09:00 |
|
Dean Herbert
|
00ee45fe46
|
Merge remote-tracking branch 'origin/update-visibility-container' into update-framework
|
2019-06-11 19:36:13 +09:00 |
|
Dean Herbert
|
d2e42b38fc
|
Merge remote-tracking branch 'smoogipoo/cursortrail-vertexbatch' into update-framework
|
2019-06-11 19:25:25 +09:00 |
|
Dean Herbert
|
5c2c4f0ada
|
Merge pull request #4878 from HoLLy-HaCKeR/expose-skills
Expose skills in DifficultyAttributes
|
2019-06-11 18:47:56 +09:00 |
|
Arphox
|
07e17518e9
|
Fix all "Maintainability" CodeFactor issues
|
2019-06-11 10:28:16 +02:00 |
|
Dean Herbert
|
609a82bc94
|
Update VisibilityContainer usage in line with framework
|
2019-06-11 15:13:58 +09:00 |
|
smoogipoo
|
2b768bef96
|
Make CursorTrail use VertexBatch
|
2019-06-10 20:29:01 +09:00 |
|
Albert Tang
|
62639d347f
|
Merge branch 'master' into android
|
2019-06-09 21:03:48 -05:00 |
|
Dean Herbert
|
8cdcf251b5
|
Make local bindable private
|
2019-06-09 16:30:04 +09:00 |
|
Ganendra Afrasya
|
afc3a08953
|
Use existing setting instead
Now it read IncreaseFirstObjectVisibility bindable instead
|
2019-06-09 13:11:40 +07:00 |
|
Ganendra Afrasya
|
8ac64b5c16
|
Make first object not applying custom state
|
2019-06-08 01:46:05 +07:00 |
|
Dean Herbert
|
ff6943e170
|
Merge branch 'master' into fix-cursor
|
2019-06-07 10:43:21 +09:00 |
|
David Zhao
|
e2118299e9
|
update comment
|
2019-06-07 10:36:36 +09:00 |
|
David Zhao
|
ac9a3e54a6
|
Fix cursor issue with stopped gameplay clock
|
2019-06-06 18:12:59 +09:00 |
|
smoogipoo
|
c7d0fcd42a
|
Update drawnodes
|
2019-06-06 16:49:35 +09:00 |
|
smoogipoo
|
ae438213a5
|
Remove secondary buffered container from slider body
|
2019-06-06 16:32:43 +09:00 |
|
HoLLy
|
7e9f5a0939
|
Add Skills to DifficultyAttributes
|
2019-05-29 11:22:51 +02:00 |
|
tangalbert919
|
07e550a950
|
Merge branch 'master' into android
|
2019-05-28 09:08:44 -05:00 |
|
Tav TaOr
|
7575af6f42
|
Merged master into autopilot
|
2019-05-17 14:15:30 +03:00 |
|
Tav TaOr
|
7c50bdd173
|
Removed redundant parentheses.
|
2019-05-15 23:48:37 +03:00 |
|
smoogipoo
|
cbf662eb56
|
Remove redundant else statement
|
2019-05-15 10:55:02 +09:00 |
|
Alten
|
37ec722a1d
|
Shorten code
|
2019-05-14 16:18:46 -04:00 |
|
Alten
|
ad5ad8ccb5
|
Fix hard crash
|
2019-05-13 23:29:24 -04:00 |
|
Dean Herbert
|
be6da833f8
|
Move constant local (and break line)
|
2019-05-14 11:11:57 +09:00 |
|
HoLLy
|
1809c996bb
|
Use Interpolation.ValueAt instead of manually interpolating FL position.
|
2019-05-13 12:09:19 +02:00 |
|
HoLLy
|
f7806bc205
|
Add smoothing to flashlight movement
|
2019-05-13 01:33:41 +02: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 |
|
Tav TaOr
|
2051be7453
|
Minor changes to pass the AppVeyor test
|
2019-05-12 15:00:59 +03:00 |
|
Tav TaOr
|
d229fed128
|
Implemented Autopilot
|
2019-05-12 14:00:43 +03:00 |
|
Tav TaOr
|
9170da46ff
|
Merge remote-tracking branch 'upstream/master'
|
2019-05-12 13:08:07 +03: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 |
|