Salman Ahmed
|
a9125f6544
|
Merge remote-tracking branch 'upstream/master' into fallback-to-skin-combo-colours
|
2019-12-12 12:37:51 +03:00 |
|
Dean Herbert
|
623ab1ef3b
|
Update time ramp preview on setting change
|
2019-12-12 17:38:18 +09:00 |
|
Dean Herbert
|
d15f49f60f
|
Also hide the break overlay
|
2019-12-12 16:13:02 +09:00 |
|
Dean Herbert
|
99280db694
|
Add note about AlwaysPresent requirement
|
2019-12-12 16:12:40 +09:00 |
|
Dean Herbert
|
e4297ffead
|
Hide HUD in a better way
|
2019-12-12 16:12:32 +09:00 |
|
Dean Herbert
|
37a94988a3
|
Merge branch 'improve-hud-hiding' into cinema-mod
|
2019-12-12 16:12:19 +09:00 |
|
smoogipoo
|
5861eca80d
|
Make DrawableRuleset take a converted beatmap
|
2019-12-12 15:58:11 +09:00 |
|
Dean Herbert
|
4c4199269c
|
Use protected constructors
|
2019-12-12 15:25:37 +09:00 |
|
Dean Herbert
|
9961fa7385
|
Merge branch 'master' into adjustable-rate-mods
|
2019-12-12 15:10:23 +09:00 |
|
Dean Herbert
|
d2ada90434
|
Merge branch 'master' into single-scoreprocessor
|
2019-12-12 11:36:45 +09:00 |
|
unknown
|
472fa9822c
|
make ModDifficultyAdjust incompatible with ModEasy and ModHardRock
|
2019-12-12 08:25:51 +08:00 |
|
Albie
|
4a1c6db3ed
|
Merge branch 'master' into cinema-mod
|
2019-12-11 18:00:17 +00:00 |
|
Albie
|
caa9286a90
|
update tests, change binding and reduce lines in cinema mod
|
2019-12-11 17:39:40 +00:00 |
|
unknown
|
b0cf44c3be
|
fix appveyor issues
|
2019-12-11 20:12:29 +08:00 |
|
unknown
|
b795532aa5
|
add difficulty adjustment mods
|
2019-12-11 19:43:16 +08:00 |
|
smoogipoo
|
40f918dce6
|
Remove unused using
|
2019-12-11 19:49:32 +09:00 |
|
smoogipoo
|
c34b6b59ed
|
Remove time ramp and rate adjust mod incompatibility
|
2019-12-11 19:48:57 +09:00 |
|
smoogipoo
|
404d3207ff
|
Refactor ModNightcore/ModDaycore
|
2019-12-11 19:43:32 +09:00 |
|
smoogipoo
|
48f1dad4aa
|
Remove abstract ScoreProcessor class
|
2019-12-11 17:25:06 +09:00 |
|
Dean Herbert
|
9eed64997f
|
Merge branch 'customized-mods' into adjustable-rate-mods
|
2019-12-11 13:26:05 +09:00 |
|
Albie
|
a61f8cc2c3
|
Merge branch 'master' into cinema-mod
|
2019-12-10 17:06:53 +00:00 |
|
smoogipoo
|
c378e525da
|
Extract the rest of legacy enums
|
2019-12-10 20:23:15 +09:00 |
|
smoogipoo
|
e3f925f69a
|
Extract legacy hitobject type enum
|
2019-12-10 20:19:16 +09:00 |
|
smoogipoo
|
8012b21ffa
|
Extract legacy sound type enum
|
2019-12-10 20:18:44 +09:00 |
|
Dean Herbert
|
138b83c9ea
|
Merge branch 'master' into customized-mods
|
2019-12-10 19:13:32 +09:00 |
|
Dean Herbert
|
f7f4a57c5f
|
Update bindable types in line with framework
|
2019-12-10 16:48:24 +09:00 |
|
Dan Balasescu
|
bd6a08a21b
|
Merge branch 'master' into apply-to-track
|
2019-12-10 16:15:24 +09:00 |
|
Dean Herbert
|
5f3d163772
|
Merge branch 'master' into segmented-slider-paths-3
|
2019-12-10 14:28:20 +09:00 |
|
smoogipoo
|
ab0f2e7c6a
|
Apply suggested refactorings
|
2019-12-10 13:12:54 +09:00 |
|
Dean Herbert
|
dc9775742c
|
Fix incorrect code migration
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
|
2019-12-10 02:23:17 +09:00 |
|
Dean Herbert
|
12bdb1dafd
|
Pin DC/NC pitch
|
2019-12-09 20:40:38 +09:00 |
|
smoogipoo
|
47f3c4a596
|
Don't serialise path version
|
2019-12-09 20:18:18 +09:00 |
|
Dean Herbert
|
edc8220554
|
Add time ramp settings
|
2019-12-09 19:58:51 +09:00 |
|
Dean Herbert
|
7fd52c21f5
|
Update mods and user adjust to use adjustments
|
2019-12-09 19:41:31 +09:00 |
|
Dean Herbert
|
6b667daf09
|
Update bindable types in line with framework
|
2019-12-09 19:41:18 +09:00 |
|
Huo Yaoyuan
|
04b3297a05
|
Constrain configuration lookup as enum.
|
2019-12-09 17:45:26 +08:00 |
|
smoogipoo
|
6d9cd0fafe
|
Split out complex method
|
2019-12-09 18:25:13 +09:00 |
|
smoogipoo
|
b6e2738236
|
Remove unused using
|
2019-12-09 18:15:00 +09:00 |
|
smoogipoo
|
a1798fd38d
|
Fix bad ctor implementation
|
2019-12-09 18:01:13 +09:00 |
|
smoogipoo
|
bfbb9aa18e
|
Remove outdated assert
|
2019-12-09 18:01:02 +09:00 |
|
smoogipoo
|
883d5bc11d
|
Remove automatic slider path offsetting
|
2019-12-09 17:54:22 +09:00 |
|
smoogipoo
|
9cb649436c
|
Default to linear control point type
|
2019-12-09 17:47:05 +09:00 |
|
smoogipoo
|
5a093c039c
|
Simplify path/point construction
|
2019-12-09 17:46:40 +09:00 |
|
Dean Herbert
|
ba538cf09b
|
Merge branch 'apply-to-track' into adjustable-double-time
|
2019-12-09 17:45:19 +09:00 |
|
Dean Herbert
|
eb074b7058
|
Allow mods to apply to track, not clock
|
2019-12-09 17:44:45 +09:00 |
|
Dean Herbert
|
0c7e5a2e3b
|
Add bindable adjustments for DT/HT rate
|
2019-12-09 16:54:00 +09:00 |
|
Dean Herbert
|
e37526888c
|
Merge remote-tracking branch 'upstream/master' into adjustable-double-time
|
2019-12-09 16:43:17 +09:00 |
|
smoogipoo
|
c18f2e6436
|
Merge remote-tracking branch 'refs/remotes/origin/master' into segmented-slider-paths-3
|
2019-12-09 15:34:49 +09:00 |
|
smoogipoo
|
4905709ea4
|
Remove unused usings
|
2019-12-09 13:19:21 +09:00 |
|
smoogipoo
|
16f8341a02
|
Handle control point positional updates within SliderPath
|
2019-12-06 18:49:01 +09:00 |
|
Dean Herbert
|
a5d5099868
|
Use SettingsSource for mod cusomisation
|
2019-12-06 17:09:48 +09:00 |
|
smoogipoo
|
b4e1b5fa98
|
Explose + use the full calculated length of the path
|
2019-12-06 15:53:19 +09:00 |
|
smoogipoo
|
2654710d91
|
Add tests and fix negative expected distances
|
2019-12-06 15:37:06 +09:00 |
|
Dean Herbert
|
170954bc6e
|
Merge remote-tracking branch 'upstream/master' into customized-mods
|
2019-12-06 15:31:20 +09:00 |
|
smoogipoo
|
27dd12a66d
|
Rewrite slider length calculation for readability
|
2019-12-06 15:06:31 +09:00 |
|
Dean Herbert
|
9f4c8db395
|
Add xmldoc
|
2019-12-06 12:17:41 +09:00 |
|
smoogipoo
|
23c7132c4f
|
Add missing license header
|
2019-12-06 11:53:22 +09:00 |
|
Dean Herbert
|
d8620a70fb
|
Make work in editor
|
2019-12-05 20:12:25 +09:00 |
|
smoogipoo
|
3ebbf62b2a
|
Initial game-wide update with the new SliderPath
|
2019-12-05 19:53:36 +09:00 |
|
smoogipoo
|
c9a66c0d07
|
Expose a version to indicate path changes
|
2019-12-05 18:31:28 +09:00 |
|
smoogipoo
|
1585d83b96
|
Add legacy constructor
|
2019-12-05 18:19:42 +09:00 |
|
smoogipoo
|
986ac1cee4
|
Make expected distance a bindable
|
2019-12-05 17:51:29 +09:00 |
|
smoogipoo
|
2702edfa55
|
Rename new path, replace existing one
|
2019-12-05 17:49:32 +09:00 |
|
smoogipoo
|
5e9b739b67
|
Re-implement slider paths to support multiple segments
|
2019-12-05 16:45:02 +09:00 |
|
smoogipoo
|
0149e47673
|
Expose general control point change event
|
2019-12-05 14:38:32 +09:00 |
|
smoogipoo
|
3e0f499e72
|
Add xmldocs
|
2019-12-05 14:38:21 +09:00 |
|
smoogipoo
|
40d0700fa5
|
Add structure for path control points
|
2019-12-05 13:43:38 +09:00 |
|
Huo Yaoyuan
|
05cfef92f9
|
Don't compare spans with null.
|
2019-12-03 20:09:58 +08:00 |
|
Huo Yaoyuan
|
a42f9447e6
|
Don't use Equals(object) on T?.
|
2019-12-03 20:07:22 +08:00 |
|
Dean Herbert
|
f181ee1843
|
Hide the menu cursor while inside the playfield by default
|
2019-11-29 17:35:11 +09:00 |
|
Albie
|
7864899249
|
Merge branch 'master' into cinema-mod
|
2019-11-28 16:42:01 +00:00 |
|
Dean Herbert
|
01a37771bc
|
Merge branch 'master' into customized-mods
|
2019-11-27 19:44:32 +09:00 |
|
Huo Yaoyuan
|
c0fe91a84c
|
Merge branch 'master' into sharpen
|
2019-11-26 18:21:50 +08:00 |
|
Albie
|
09158b6b08
|
Merge branch 'master' into cinema-mod
|
2019-11-26 06:57:47 +00:00 |
|
Dean Herbert
|
fbebbab5db
|
Remove excess parenthesis
|
2019-11-25 22:37:07 +09:00 |
|
Dean Herbert
|
709ec1404f
|
Centralise End/StartTime retrieval to extension method
|
2019-11-25 19:09:14 +09:00 |
|
Albie
|
0a70ec0b11
|
Merge branch 'master' into cinema-mod
|
2019-11-25 07:25:30 +00:00 |
|
Albie
|
9fdbb2a58e
|
change name of interface and expose method instead of seperate values
|
2019-11-25 07:24:29 +00:00 |
|
Albie
|
1d6665fe57
|
improve code quality using resharper and codefactor advice
|
2019-11-24 07:42:39 +00:00 |
|
Albie
|
b8e5796af5
|
add forced video/storyboard and disabled dim for mod inside new interface
|
2019-11-24 07:37:06 +00:00 |
|
andy840119
|
6126fd9a6b
|
ApplyToDrawableHitObjects should be able to get all the hitobject in nasted Playfield
|
2019-11-24 10:42:05 +09:00 |
|
Albie Spriddell
|
20edaf4ba6
|
add cinema mod support
|
2019-11-23 17:32:16 +00:00 |
|
Andrei Zavatski
|
eb2f7c1d0a
|
Rename forgotten variable
|
2019-11-21 20:37:02 +03:00 |
|
Andrei Zavatski
|
0f1a3d97c8
|
Naming adjustments
|
2019-11-21 20:34:19 +03:00 |
|
Andrei Zavatski
|
c7c8527f5f
|
Remove OnHighlightedChanged function
|
2019-11-21 20:22:15 +03:00 |
|
Andrei Zavatski
|
458496206c
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
|
2019-11-21 18:49:37 +03:00 |
|
Huo Yaoyuan
|
818553027b
|
Merge branch 'master' into sharpen
|
2019-11-21 23:42:46 +08:00 |
|
Dan Balasescu
|
a7c074ff37
|
Merge branch 'master' into math_clamp
|
2019-11-21 11:08:56 +09:00 |
|
iiSaLMaN
|
5391c752b4
|
Implement IAggregateAudioAdjustments properties for FallbackSampleStore
|
2019-11-21 03:20:08 +03:00 |
|
Berkan Diler
|
6cab517b2d
|
.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.
|
2019-11-20 13:37:47 +01:00 |
|
Huo Yaoyuan
|
374ef6ff83
|
Merge branch 'master' into sharpen
|
2019-11-20 17:30:58 +08:00 |
|
Huo Yaoyuan
|
b1b234c6fb
|
Use paramref.
|
2019-11-17 20:49:36 +08:00 |
|
Huo Yaoyuan
|
f05b83d7d4
|
Use typeparamref.
|
2019-11-17 20:48:23 +08:00 |
|
Andrei Zavatski
|
2592a0489b
|
Use existing ModNoMod
|
2019-11-15 11:57:40 +03:00 |
|
Andrei Zavatski
|
aca3690d77
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
|
2019-11-13 00:20:51 +03:00 |
|
Huo Yaoyuan
|
144812669d
|
Use static local functions.
|
2019-11-12 19:56:54 +08:00 |
|
Huo Yaoyuan
|
dcfa98414f
|
Use ??=.
|
2019-11-12 19:56:51 +08:00 |
|
Huo Yaoyuan
|
31cc0d13da
|
Use 'out var'.
|
2019-11-12 19:55:26 +08:00 |
|
Huo Yaoyuan
|
e5e8e70704
|
Use pattern matching.
|
2019-11-12 19:55:19 +08:00 |
|
Dean Herbert
|
758c304d92
|
Merge branch 'master' into fallback-to-skin-combo-colours
|
2019-11-12 19:00:05 +09:00 |
|
smoogipoo
|
10fd5ef5a7
|
Merge context menus
|
2019-11-12 15:02:27 +09:00 |
|
Andrei Zavatski
|
fa01e11a6e
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
|
2019-11-12 08:25:42 +03:00 |
|
smoogipoo
|
3f8928ca25
|
Suppress warnings
|
2019-11-12 13:41:54 +09:00 |
|
Dean Herbert
|
b37bf4ea01
|
Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition
|
2019-11-12 10:44:53 +09:00 |
|
Andrei Zavatski
|
4145e25f7b
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
|
2019-11-11 17:55:10 +03:00 |
|
Huo Yaoyuan
|
e9b8cbb516
|
Apply other styles.
|
2019-11-11 20:27:04 +08:00 |
|
Huo Yaoyuan
|
ccc8aa6fa4
|
Apply brace style.
|
2019-11-11 20:13:13 +08:00 |
|
smoogipoo
|
e924a5d51e
|
Disable ruleset input in the editor
|
2019-11-11 13:04:43 +09:00 |
|
Andrei Zavatski
|
e3d8e29cdd
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
|
2019-11-10 23:38:41 +03:00 |
|
smoogipoo
|
b4cb4c1243
|
Remove previous samples on change
|
2019-11-08 16:19:55 +09:00 |
|
smoogipoo
|
a9b4106075
|
Remove unnecessary (for now) scheduling
|
2019-11-08 16:19:43 +09:00 |
|
smoogipoo
|
53e6186b6d
|
Fix drawable hitobject samples not updating
|
2019-11-08 14:59:47 +09:00 |
|
smoogipoo
|
6fc1be64c2
|
Make hitobject samples a bindable list
|
2019-11-08 14:04:57 +09:00 |
|
iiSaLMaN
|
cee16e9419
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into fallback-to-skin-combo-colours
|
2019-11-07 19:11:29 +03:00 |
|
iiSaLMaN
|
808543885f
|
Change ComboColours type to IReadOnlyList<Color4>
Also exposes functions to modify the internal list (AddComboColours, ClearComboColours)
|
2019-11-07 15:54:30 +03:00 |
|
smoogipoo
|
f3ddc4c00b
|
Advance editor clock after a snapped placement
|
2019-11-07 14:08:02 +09:00 |
|
smoogipoo
|
64d900b387
|
Disable input for non-selected blueprints
|
2019-11-05 11:33:37 +09:00 |
|
unknown
|
2bc6932567
|
make interface mod applicable
|
2019-11-05 00:55:55 +08:00 |
|
unknown
|
1216d66a4c
|
Merge remote-tracking branch 'origin/customized-mods' into customized-mods
|
2019-11-04 23:21:45 +08:00 |
|
Dean Herbert
|
1155aacd90
|
Update sliders when control points change (#6680)
Update sliders when control points change
|
2019-11-03 19:05:48 +09:00 |
|
Dean Herbert
|
d089e47a56
|
Merge branch 'master' into master
|
2019-11-01 14:15:57 +09:00 |
|
smoogipoo
|
0171b2ae7c
|
Fix scrolling hitobjects expiring too soon
|
2019-11-01 12:10:03 +09:00 |
|
smoogipoo
|
41ae66d517
|
Update slider when control points change
|
2019-10-31 18:24:38 +09:00 |
|
smoogipoo
|
9f28b1905b
|
Expose composer method to update hitobject
|
2019-10-31 18:15:19 +09:00 |
|
nwabear
|
e35931fdfc
|
removed blank line
|
2019-10-26 14:33:59 -05:00 |
|
nwabear
|
349a2745c5
|
Merge remote-tracking branch 'origin/master'
|
2019-10-26 14:30:17 -05:00 |
|
nwabear
|
9e2e87c8d1
|
added visual tests
added small commenting
added xmldoc for CancelResume();
|
2019-10-26 14:29:52 -05:00 |
|
nwabear
|
f8354eefc4
|
Added null check in the CancelResume method
|
2019-10-25 16:49:18 -05:00 |
|
nwabear
|
b0e21c2749
|
Fixed Issue #6442
|
2019-10-25 14:57:49 -05:00 |
|
Dan Balasescu
|
3692846367
|
Merge branch 'master' into snapping-refactor
|
2019-10-25 18:26:14 +09:00 |
|
smoogipoo
|
4ca6a5a0cc
|
Interface the distance snap provider
|
2019-10-25 16:50:21 +09:00 |
|
smoogipoo
|
607b4d874a
|
Refactor flow of snapping through HitObjectComposer
|
2019-10-25 16:40:30 +09:00 |
|
Dean Herbert
|
fa3350ce2d
|
Refactor blueprint movement and selection events (#6588)
Refactor blueprint movement and selection events
|
2019-10-24 22:58:03 +09:00 |
|
smoogipoo
|
d83b9ef0e4
|
Rename grid snapping methods
|
2019-10-24 18:18:04 +09:00 |
|
smoogipoo
|
f45f17339c
|
Implement slider path distance snapping
|
2019-10-24 18:17:30 +09:00 |
|
smoogipoo
|
e04c77178c
|
Move selection events to BlueprintContainer
|
2019-10-24 14:58:02 +09:00 |
|
smoogipoo
|
714c89faa4
|
Move selection drag events to BlueprintContainer
|
2019-10-24 14:57:58 +09:00 |
|
smoogipoo
|
c03fa01fd9
|
Remove unnecessary set
|
2019-10-23 17:51:16 +09:00 |
|
smoogipoo
|
2c9b11cdfd
|
Move variable outside of if block
|
2019-10-23 17:49:21 +09:00 |
|
smoogipoo
|
64682611bb
|
Fix distance snapping grid not updating on scroll
|
2019-10-23 16:39:14 +09:00 |
|
Dean Herbert
|
e3fa5f1da3
|
Merge branch 'master' into beatsnap-grid-integration
|
2019-10-21 18:44:34 +09:00 |
|
Dean Herbert
|
ed8b8e3ad0
|
Merge pull request #6557 from smoogipoo/fix-hitcircle-selection-size
Fix hitcircle selection area being too large
|
2019-10-21 18:43:48 +09:00 |
|
Dean Herbert
|
9f004186d5
|
Ensure DrawableHitObject's HitObject is not null
|
2019-10-21 17:56:39 +09:00 |
|
Dean Herbert
|
b157aaead1
|
Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration
|
2019-10-21 17:09:43 +09:00 |
|
smoogipoo
|
38c2c328ff
|
Rename HitObject -> DrawableObject in selection blueprints
|
2019-10-21 17:04:56 +09:00 |
|
smoogipoo
|
dc222b5e4d
|
Add common path for duplicated code
|
2019-10-21 13:52:55 +09:00 |
|
Dean Herbert
|
d0eaf629af
|
Merge branch 'master' into dho-apply
|
2019-10-18 19:45:10 +09:00 |
|
smoogipoo
|
190a83da6e
|
Refresh the grid after a placement
|
2019-10-18 19:04:08 +09:00 |
|
Dean Herbert
|
07286c0cfc
|
Fix editor's clock not being processed unless composer is loaded
|
2019-10-18 18:21:53 +09:00 |
|
smoogipoo
|
31313ec9e1
|
Fix potential nullref
|
2019-10-18 17:56:31 +09:00 |
|