Dean Herbert
970bd86d2e
Remove local TimeAt usage in mania placement
2020-05-20 21:01:29 +09:00
Dean Herbert
23bf0d000e
Implement mania beat snapping support
2020-05-20 21:01:19 +09:00
Dean Herbert
ffb8d48fc3
Fix osu!mania editor placement regressions
2020-05-20 21:01:03 +09:00
Dean Herbert
c46bfc2532
Create SnapResult class to hold various snapping results
2020-05-20 21:00:47 +09:00
Dean Herbert
3354d48a38
Change snapping to be screen space coordinate based
2020-05-20 21:00:29 +09:00
Dean Herbert
0bc3073d49
Fix test failures
2020-05-20 15:01:32 +09:00
Dean Herbert
d31a59b074
Fix logic results in infinite loop on default timing point return
2020-05-20 14:55:36 +09:00
Dean Herbert
4f83bb679b
Merge branch 'master' into mania-distance-snap-grid
2020-05-20 11:44:19 +09:00
Dean Herbert
85156c62ef
Add xmldoc and address some code quality concerns
2020-05-19 23:05:08 +09:00
Dean Herbert
c28a9bdb80
Move load method up
2020-05-19 23:02:20 +09:00
Dean Herbert
a6f3dc53f7
Fix time value not being updated for next timing point
2020-05-19 23:01:36 +09:00
Dean Herbert
d56466e2b9
Add very basic pooling of grid lines
2020-05-19 19:07:35 +09:00
Dean Herbert
406f39e8bf
Construct online visible lines
2020-05-18 21:27:26 +09:00
Dean Herbert
b35b150f38
Simplify colouring logic
2020-05-18 19:48:51 +09:00
Dean Herbert
16e85ae0b1
Remove Grid class
2020-05-18 17:52:04 +09:00
Dean Herbert
d9bb90078b
Move grids to inside columns
2020-05-18 17:47:52 +09:00
Dean Herbert
3e81d6d55f
Merge pull request #9053 from smoogipoo/fix-possible-ppcalc-exception
...
Fix possible exceptions in performance calculators
2020-05-18 16:37:33 +09:00
smoogipoo
1865cd0762
Fix possible exceptions in performance calculators
2020-05-18 15:10:59 +09:00
Bartłomiej Dach
76c5be7bc1
Disallow catch-specific judgements in mania
2020-05-17 17:16:22 +02:00
smoogipoo
4719fcc291
Actually use the cancellation token
2020-05-15 18:17:39 +09:00
smoogipoo
98125102a7
Add cancellation token support to CreateNestedHitObjects()
2020-05-15 18:07:41 +09:00
smoogipoo
238d87f976
Add comment about gray usage
2020-05-15 15:56:32 +09:00
smoogipoo
1c6c128d11
Add const
2020-05-15 15:51:54 +09:00
smoogipoo
392d44e1fb
Always fully display one beat
2020-05-15 15:49:50 +09:00
smoogipoo
4cbd51feb9
Fix test errors
2020-05-15 13:08:15 +09:00
smoogipoo
3441ab457d
Fix hitobjects placed at non-beatsnapped times
2020-05-14 20:06:34 +09:00
smoogipoo
0e33494074
Fix flashing when changing beat divisor
2020-05-14 19:58:39 +09:00
smoogipoo
42c3d892cd
Only update alive lines
2020-05-14 19:55:14 +09:00
smoogipoo
91d1b15d5a
Integrate grid with the mania composer
2020-05-14 19:55:07 +09:00
smoogipoo
16585f767e
Add initial beat snap grid implementation
2020-05-14 19:17:24 +09:00
smoogipoo
0ef3bae26a
Expose playfield from IManiaHitObjectComposer
2020-05-14 18:34:51 +09:00
smoogipoo
78f1b230e9
Disable right-click placement in the mania editor
2020-05-13 14:43:50 +09:00
Dean Herbert
064e5004ed
Merge branch 'master' into fix-mania-selection
2020-04-29 17:15:48 +09:00
smoogipoo
4f332ace14
Use 0 length
2020-04-29 14:27:21 +09:00
smoogipoo
0c95d11fdb
Remove unnecessary value change binding
2020-04-29 13:27:33 +09:00
Dan Balasescu
024f10a494
Use non-generic bindable
...
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-04-29 13:24:31 +09:00
smoogipoo
1aaab40228
Fix mods affecting mania scroll speed
2020-04-28 19:34:02 +09:00
smoogipoo
ff3928465c
Add xmldoc
2020-04-28 18:58:29 +09:00
smoogipoo
db12fafc2c
Update comment
2020-04-28 18:58:29 +09:00
smoogipoo
ff24a15760
Fix vertical drag in down-scroll scenarios
2020-04-28 18:36:24 +09:00
smoogipoo
7d54d4b800
Improve test scene
2020-04-28 18:36:10 +09:00
smoogipoo
f93291e25b
Remove unused override
2020-04-28 18:35:22 +09:00
smoogipoo
a7a680b486
Fix horizontal drag not working
2020-04-28 18:34:55 +09:00
smoogipoo
e5131400e7
Remove now unnecessary position manipulation
2020-04-28 18:34:39 +09:00
smoogipoo
3eb7c8755c
Cleanup
2020-04-28 15:34:41 +09:00
smoogipoo
330521a2ae
Fix lifetime override not working
2020-04-28 15:34:10 +09:00
smoogipoo
7342e00151
Convert positions to local HOC coordinate space
2020-04-28 14:00:14 +09:00
smoogipoo
cebc0fc046
Attempt to fix multiple selection movements
2020-04-27 20:35:24 +09:00
smoogipoo
b88dd44252
Fix movement not working correctly in down-scroll
2020-04-27 19:47:25 +09:00
smoogipoo
acf95fca9c
Remove old, now unnecessary method
2020-04-27 17:14:15 +09:00
smoogipoo
7f5a1d7f44
Merge branch 'master' into fix-mania-selection
2020-04-27 17:09:40 +09:00
Dean Herbert
59bd2b3035
Merge pull request #8823 from smoogipoo/all-ruleset-encoders
...
Implement legacy beatmap encoding for all rulesets
2020-04-24 17:49:34 +09:00
smoogipoo
2b0deec491
Finish note placement on mouse down
2020-04-24 13:20:41 +09:00
smoogipoo
4ebb28d3e7
wip
2020-04-23 17:52:54 +09:00
smoogipoo
0a840a2613
Fix mania not getting its own selection handler
2020-04-23 17:41:33 +09:00
smoogipoo
12c235027d
Remove stale file
2020-04-23 13:28:27 +09:00
smoogipoo
4f0b5a34d3
Fix hold note placement body sized incorrectly
2020-04-23 12:53:23 +09:00
smoogipoo
22d2607ff5
Only commit if placement is active
2020-04-23 12:53:09 +09:00
smoogipoo
c59096a941
Fix note placement
2020-04-23 12:36:40 +09:00
smoogipoo
58af75ad57
Add back missing line
2020-04-22 13:45:12 +09:00
smoogipoo
6da0872ae5
Use the last node sample for the tail note
2020-04-22 09:06:04 +09:00
smoogipoo
1f962f5c56
Reword comment
2020-04-22 09:06:04 +09:00
smoogipoo
cc0c82aaeb
Implement IHasXPosition on ManiaHitObject
2020-04-22 09:06:04 +09:00
smoogipoo
d957614fc9
Cleanup handling of mania samples
2020-04-22 09:06:04 +09:00
smoogipoo
0a2b585c65
Apply missing scale
2020-04-21 17:14:49 +09:00
Dean Herbert
4c689c6ad2
Add constant for max stage keys
2020-04-21 10:56:04 +09:00
smoogipoo
4e271ff46f
Add support for 10K mod + 20K dual stages
2020-04-20 21:28:36 +09:00
smoogipoo
5d96d67226
Add special key definition just for sanity
2020-04-20 14:40:37 +09:00
smoogipoo
b881293b98
Allow 10k to be played on a single stage
2020-04-20 14:08:23 +09:00
smoogipoo
e534d59c80
Use another argument exception
2020-04-15 13:08:15 +09:00
Dean Herbert
d47e414fb1
Apply review feedback (unroll inner loop / xml fixes)
2020-04-15 12:35:43 +09:00
Dean Herbert
7f95418262
Fix osu!mania replays actuating incorrect keys when multiple stages are involved
2020-04-14 16:52:17 +09:00
Dean Herbert
c51bad0e35
Cache ManiaPlayfield instead
2020-04-13 13:42:21 +09:00
Dean Herbert
cdff6060d3
Remove recursive hierarchy traversal for mania sample balance
2020-04-13 13:01:27 +09:00
Dean Herbert
65b96079a0
Move dampening to base implementation and change range to 0..1
2020-04-13 13:01:02 +09:00
Fire937
22d89dbff7
Merge branch 'master' of https://github.com/ppy/osu into stereo-shifted-playback
2020-04-12 01:46:32 +02:00
Fire937
f274ec297c
Add positional sound support for all rulesets
...
The SamplePlaybackBalance is calculated in a way that the balance
remains between -0.4 and 0.4.
Positional sound is not supported in osu!taiko.
2020-04-12 01:33:25 +02:00
Dean Herbert
12c21cba7e
Add missing masking specification
2020-04-11 15:20:27 +09:00
Dean Herbert
cb6372acac
Merge branch 'master' into mania-stage-background-skinning
2020-04-09 15:37:48 +09:00
smoogipoo
d13231eff7
Use ctor for default width
2020-04-08 18:23:24 +09:00
smoogipoo
83db6cebb6
Implement bottom stage image
2020-04-08 16:20:54 +09:00
smoogipoo
cd15b672eb
Implement left and right stage images
2020-04-08 16:20:47 +09:00
smoogipoo
e429c274a9
Initial structure
2020-04-08 15:35:37 +09:00
Dean Herbert
9db996a91f
Increase size of default osu!mania skin's keys to allow clearance with HUD
2020-04-08 14:13:31 +09:00
Dean Herbert
3794b55eef
Rename ManiaStage to Stage
2020-04-08 14:13:31 +09:00
Dean Herbert
2062087155
Merge branch 'master' into more-mania-colours
2020-04-07 23:36:42 +09:00
Dean Herbert
9ff4458fd6
Merge branch 'master' into mania-skin-note-images
2020-04-07 22:41:22 +09:00
Dean Herbert
2118998243
Merge pull request #8653 from smoogipoo/better-mania-scrollspeed
...
Fix inconsistent scroll speeds in mania
2020-04-07 22:38:55 +09:00
smoogipoo
11d58fb7f6
Implement column background and light colours
2020-04-07 16:53:55 +09:00
smoogipoo
9fd73492ca
Implement judgement line colour
2020-04-07 16:53:55 +09:00
smoogipoo
9cfeb60afc
Fix missed speed removal in mania
2020-04-07 16:30:58 +09:00
smoogipoo
3ecb99462f
Make note height scale by minimum column width
2020-04-07 16:07:18 +09:00
smoogipoo
707a6269b3
Fix incorrect key texture lookup
2020-04-06 19:03:37 +09:00
Dean Herbert
cfa2404626
Remove explicit specification of new default
2020-04-06 12:39:49 +09:00
Dean Herbert
3289fa7c66
Merge branch 'master' into better-mania-scrollspeed
2020-04-03 23:25:14 +09:00
Dean Herbert
eacbb20d87
Merge branch 'master' into fix-convert-scroll-speed
2020-04-03 22:47:53 +09:00
Dean Herbert
53c99d137a
Merge branch 'master' into mania-config-lookup-refactor
2020-04-03 22:22:59 +09:00
smoogipoo
23b7cde941
Add milliseconds value alongside
2020-04-03 18:38:04 +09:00
smoogipoo
1ff2cc31d1
Implement more familiar scroll speed options in mania
2020-04-03 18:25:01 +09:00
Dean Herbert
51db361c32
Update usages of Animation and Video in line with framework changes
2020-04-03 16:00:06 +09:00
smoogipoo
b42d1104b7
Fix mania converts scrolling at incorrect speeds
2020-04-03 13:16:01 +09:00
smoogipoo
571748d105
Add some xmldocs + nullable parameter
2020-04-03 12:31:05 +09:00
smoogipoo
1f797207f7
Rework lookups to not require total playfield columns
2020-04-03 12:31:05 +09:00
Dean Herbert
f919a2f267
Merge branch 'master' into mania-hitexplosion-skinning
2020-04-02 23:57:03 +09:00
Dan Balasescu
0f5fd8051c
Merge branch 'master' into mania-hitexplosion-skinning
2020-04-02 23:08:31 +09:00
Dean Herbert
c35dd0153d
Merge branch 'master' into mania-column-line-colour
2020-04-02 23:03:22 +09:00
Dean Herbert
bff58f36e5
Merge pull request #8563 from smoogipoo/expand-mania-vertically
...
Expand mania to fit vertical screen bounds
2020-04-02 23:01:56 +09:00
smoogipoo
47e2ff5ce6
Fix incorrect frame length for hit explosions
2020-04-02 22:56:30 +09:00
Dean Herbert
e1a9a76e01
Merge pull request #8564 from smoogipoo/fix-holdnote-texturing
...
Fix hold note animation not being reset
2020-04-02 22:42:47 +09:00
Dean Herbert
8f2a3578bd
Merge branch 'master' into mania-hitexplosion-skinning
2020-04-02 21:59:01 +09:00
smoogipoo
62f1bc276d
Add skinning support for column line colour
2020-04-02 18:10:17 +09:00
smoogipoo
9552319732
Fix hold note animation not being reset
2020-04-02 17:09:08 +09:00
smoogipoo
5aa4c4f3cb
Remove corner radius
2020-04-02 16:10:09 +09:00
smoogipoo
7ba533b7a4
Expand mania to fit vertical screen bounds
2020-04-02 16:04:09 +09:00
mcendu
dae738d6a4
add todo entries
2020-04-02 14:58:31 +08:00
smoogipoo
62f6683a20
Remove unnecessary generic
2020-04-02 15:57:50 +09:00
smoogipoo
c8d161e03a
Fix explosion expiry
2020-04-02 15:57:02 +09:00
mcendu
f3b96f8f50
add fallback to normal note image
2020-04-02 14:29:30 +08:00
smoogipoo
de7ee57100
Fix adding null hit explosions
2020-04-02 15:27:31 +09:00
smoogipoo
fa3a449c3b
Implement legacy normal hit explosions
2020-04-02 14:37:29 +09:00
smoogipoo
b375a02cff
Cleanup positioning factor definition
2020-04-02 14:37:29 +09:00
smoogipoo
c8eee8d204
Add structure for legacy hit explosions
2020-04-02 14:37:29 +09:00
smoogipoo
94031b57ea
Split hit explosion positioning from column
2020-04-02 14:37:29 +09:00
Dean Herbert
1446b0782b
Merge branch 'master' into mania-existence-check
2020-04-01 23:11:09 +09:00
Dean Herbert
312f94d810
Merge pull request #8541 from smoogipoo/fix-default-explosion-position
...
Fix incorrect explosion position on default skin
2020-04-01 21:46:58 +09:00
Dan Balasescu
33119d38ad
Merge branch 'master' into fix-default-explosion-position
2020-04-01 20:03:23 +09:00
smoogipoo
f4d8defa48
Fix incorrect explosion position on default skin
2020-04-01 20:01:35 +09:00
Dean Herbert
aac7915eab
Merge branch 'master' into fix-column-light-position
2020-04-01 19:46:33 +09:00
smoogipoo
558feade87
Fix ci warnings
2020-04-01 18:19:11 +09:00
smoogipoo
59eac34d82
Fix barlines scrolling at different speeds in legacy skins
2020-04-01 18:00:17 +09:00
smoogipoo
ff2c5b446e
Fix column lights positioned incorrectly
2020-04-01 16:06:09 +09:00
Dean Herbert
9de348235e
Add comment about legacy fallback widths
2020-04-01 15:30:51 +09:00
mcendu
87e5e98cae
use GetAnimation for checking
2020-04-01 14:17:23 +08:00
smoogipoo
2d6d1a8cc6
Implement column width and column spacing
2020-04-01 13:38:03 +09:00
mcendu
716c7fa07a
Add check to detect whether mania is skinned
2020-04-01 11:04:29 +08:00
smoogipoo
bb5fa472dc
Remove null-stage fallback
2020-04-01 11:59:34 +09:00
mcendu
44fcd2613f
Add support for special column
2020-03-31 22:58:04 +08:00
mcendu
c9a81e7f71
Merge branch 'column-type3' into mania-skinning-refactor
2020-03-31 22:33:27 +08:00
mcendu
ff499b7d6b
fix indent
2020-03-31 19:12:02 +08:00
mcendu
df2379fb0e
remove unnecessary using
2020-03-31 18:10:43 +08:00
mcendu
3e0991d350
fix indent
2020-03-31 18:00:56 +08:00
mcendu
d41ff8c4b4
remove Column field from LegacyHitTarget
2020-03-31 17:58:29 +08:00
mcendu
ecc305bb63
extract superclass for all mania skinning elements
2020-03-31 17:54:51 +08:00
mcendu
977e1a3bfe
split shortcut into two methods
2020-03-31 17:48:37 +08:00
mcendu
71fc240aee
make mania skin elements use new method
2020-03-31 17:32:05 +08:00
mcendu
ec3d21e2b7
convert older elements to LegacyManiaColumnElement
...
Also added xmldoc for new shorthand method.
2020-03-31 17:18:53 +08:00
mcendu
5179635b2d
add shorthand method for config retrieval
2020-03-31 17:08:05 +08:00
smoogipoo
3cd353d387
Fix possible nullrefs
2020-03-31 16:57:58 +09:00
smoogipoo
1952fcc0ce
Implement mania hold note skinning
2020-03-31 16:42:35 +09:00
smoogipoo
11430d616e
Allow null hitobject
2020-03-31 16:00:08 +09:00
smoogipoo
b805ed6bf1
Flip anchors and origins
2020-03-31 15:59:52 +09:00
smoogipoo
9a37a328b6
Add component overrides for hold note head/tail
2020-03-31 15:39:00 +09:00
smoogipoo
c4f76ffdaf
Implement mania note skinning
2020-03-31 15:29:25 +09:00
smoogipoo
ae668e3e87
Fix post-merge errors
2020-03-31 15:24:13 +09:00
smoogipoo
211a8db4c5
Merge branch 'mania-key-area-skinning' into mania-note-skinning
2020-03-31 15:23:59 +09:00
smoogipoo
538dc0c558
Merge branch 'mania-hitobject-area-skinning' into mania-note-skinning
2020-03-31 15:20:56 +09:00
smoogipoo
1a858c602a
Merge branch 'mania-column-background-skinning' into mania-note-skinning
2020-03-31 15:20:14 +09:00
smoogipoo
16439f7d8e
Fix incorrect fallback index being used
2020-03-31 15:15:49 +09:00
smoogipoo
4b05f7ff27
Merge branch 'mania-skinning-testability' into mania-key-area-skinning
2020-03-31 15:11:32 +09:00
smoogipoo
75e43acb1a
Add a legacy element to help with texture fallbacks
2020-03-31 15:11:08 +09:00
mcendu
2008a7bbec
fix naming
2020-03-31 14:03:11 +08:00
mcendu
3fb044c3b6
rm unnecessary usings
2020-03-31 12:09:04 +08:00
mcendu
323146e4a6
simplify column type check logic
2020-03-31 11:53:17 +08:00
smoogipoo
71387016b2
Add missing judgement line
2020-03-31 12:26:31 +09:00
smoogipoo
02237133cb
Implement mania hit target skinning
2020-03-31 12:17:44 +09:00
smoogipoo
cb1513b374
Add mania key area skinning
2020-03-31 11:23:33 +09:00
smoogipoo
44727eb2b8
Implement column background skinning
2020-03-31 10:57:56 +09:00
smoogipoo
a8f7d7ea42
Add structure for mania configuration lookups
2020-03-30 23:21:40 +09:00
smoogipoo
c3cde7a163
Combine files
2020-03-30 23:21:40 +09:00
smoogipoo
c1789140d5
Prepare skin transformer for mania components
2020-03-30 23:21:40 +09:00
smoogipoo
6ff2273b64
Make column + stage cached
2020-03-30 23:21:40 +09:00
Dean Herbert
f75c082601
Fix osu!mania replays recording incorrectly when key mod applied
2020-03-27 15:50:11 +09:00
Dean Herbert
8a2aac5f83
Rename conversion methods for clarity
2020-03-25 20:21:34 +09:00
Dean Herbert
800e395bc8
Merge branch 'master' into replay-recording
2020-03-25 20:20:59 +09:00
Dean Herbert
388cf5c83a
Fix catch positional data being incorrectly recorded
2020-03-24 15:38:54 +09:00
Dean Herbert
96a849f897
Add remaining replay recorders
2020-03-24 14:55:49 +09:00
Dean Herbert
022465f546
Add encoding and import support
2020-03-24 14:51:52 +09:00
Dean Herbert
546772192c
Add helper method to convert to legacy mods enums
2020-03-24 13:07:51 +09:00
smoogipoo
e3a5be71cc
Implement random mod for taiko
2020-03-23 12:09:30 +09:00
smoogipoo
9f73b2960d
Prevent unnecessary auto-size computations in mania
2020-03-02 20:08:04 +09:00
smoogipoo
da89798765
Merge remote-tracking branch 'origin/master' into layout-rework
2020-02-26 15:06:40 +09:00
smoogipoo
6c28fd21c7
osu-side changes
2020-02-24 20:52:15 +09:00
Dean Herbert
0e29d3c4a2
Correctly expire bar lines in osu!taiko and osu!mania
2020-02-23 13:50:05 +09:00
Dean Herbert
ffc7eaa3f2
Fix hitobjects with unknown lifetimes by enforcing non-null judgement
...
We've seen multiple cases where DrawableHitObject are stuck in the lifetime management container
due to not implementing a judgement (meaning they are never "hit" or "missed"). To avoid this going forward
CreateJudgement() must be implemented and return a non-null judgement.
This fixes BananaShower and JuiceStreams in osu!catch.
This also makes HitObject abstract and cleans up convert HitObject implementations.
2020-02-23 13:49:06 +09:00
Dean Herbert
0fe41fd50a
Fix blueprint showing even when mouse outside of container
2020-02-13 09:03:48 +09:00
Dean Herbert
e31d69c749
Add commit status to EndPlacement; call BeginPlacement on initial movement
2020-02-07 18:02:48 +09:00
Dean Herbert
cd6902a312
Make EndTime and RepeatCount settable
2020-02-05 17:52:51 +09:00
Dean Herbert
bd7c137394
Remap osu!mania dual stage key bindings to be more ergonomic
2020-01-26 18:34:43 +09:00
Dean Herbert
289be7a17b
Merge branch 'i-beat-snapping' into timeline-maybe
2020-01-23 15:45:33 +09:00
Dean Herbert
7c62cc3ac3
Merge remote-tracking branch 'smoogipoo/void-mouse-up-returns' into update-framework
2020-01-22 22:57:52 +09:00
smoogipoo
7b2f58eb30
Apply OnRelease method signature refactorings
2020-01-22 13:22:34 +09:00
Dean Herbert
6dd50572d2
Break mania more
2020-01-21 17:37:43 +09:00
Dean Herbert
bd96cf94a6
Begin refactoring SelectionBlueprint to handle non-drawable HitObjects
2020-01-21 12:47:14 +09:00
smoogipoo
bfb056c612
Apply input method signature refactorings
2020-01-20 18:17:21 +09:00
Dean Herbert
25aff5d96e
Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container
2020-01-20 17:08:59 +09:00
Dean Herbert
d57f55f053
Apply remaining changes required to restore previous functionality
2020-01-15 19:09:49 +09:00
mcendu
5d160376c0
nullable-ize Mod.Icon
2020-01-14 21:22:00 +08:00
mcendu
76c70a7622
Move hit target bar height def to defaulthittarget
2020-01-11 21:19:46 +08:00
smoogipoo
91735ff367
Update MathUtils namespace usages
2020-01-09 13:43:44 +09:00
smoogipoo
dfa6575f75
Adjust mania HP increase values
2020-01-07 15:24:33 +09:00
mcendu
a897f497a2
remove LaneGlowPiece and GlowPiece
2020-01-04 18:35:37 +08:00
Albie Spriddell
3a903339d6
add playingverb and database migrations
2020-01-03 11:39:15 +00:00
Dean Herbert
ee332e0d42
Split out BlueprintContainer functionality further
2020-01-02 18:21:16 +09:00
mcendu
20c5748342
Use hitTarget in place of stageHint
2019-12-29 23:37:28 +08:00
mcendu
51000765dd
remove override
2019-12-29 23:29:00 +08:00
mcendu
61fb9f5613
Remove class StageHint and usage
2019-12-29 23:18:50 +08:00
mcendu
cdfbe96e9b
Make AccentColour of StageHint virtual
2019-12-29 14:52:51 +08:00
mcendu
5d2b5cc950
correct type of field stageHint
2019-12-28 14:05:46 +08:00
mcendu
bf162f148e
Move mania stage hint to its own class
2019-12-28 13:48:10 +08:00
Dean Herbert
3a5015d013
Merge branch 'master' into fix-hold-note-input
2019-12-27 21:48:38 +09:00
Dean Herbert
aa97487f8e
Merge branch 'master' into hp-drain
2019-12-27 14:58:22 +09:00
Dean Herbert
cfa1dfa1a4
Split out into own method
2019-12-27 11:37:05 +09:00
Dean Herbert
5260eb76d0
Merge remote-tracking branch 'upstream/master' into mania-judgement
2019-12-27 11:17:47 +09:00
Dean Herbert
cac011edc1
Merge branch 'master' into hp-drain
2019-12-26 23:51:12 +09:00
Dean Herbert
32843ffef5
Merge branch 'master' into fix-hold-note-input
2019-12-26 23:50:53 +09:00
mcendu
92dd1ade17
Attempt to implement mania-specific sprites
2019-12-26 21:03:21 +08:00
smoogipoo
d45556eb6a
Remove whitespace
2019-12-26 17:57:16 +09:00
smoogipoo
522847987b
Implement break/gameplay start times
2019-12-26 15:00:58 +09:00
smoogipoo
90cb9d9162
Simplify scoreprocesor/healthprocessor implementations
2019-12-26 14:59:49 +09:00
smoogipoo
7414a6aadd
Merge remote-tracking branch 'huoyaoyuan/master' into health-processor
...
# Conflicts:
# osu.Game.Rulesets.Catch/CatchRuleset.cs
# osu.Game.Rulesets.Mania/ManiaRuleset.cs
# osu.Game.Rulesets.Taiko/TaikoRuleset.cs
2019-12-26 14:56:54 +09:00
Dan Balasescu
9702cc9809
Merge branch 'master' into remove-legacy-id
2019-12-25 21:01:12 +09:00
Dean Herbert
504a55e803
Merge branch 'master' into better-beatmap-conversion
2019-12-25 19:52:06 +09:00
Dean Herbert
0677f746aa
Provide the ruleset to converter classes
2019-12-24 16:02:16 +09:00
Dean Herbert
a324bfbc2c
Remove LegacyID from Ruleset
2019-12-24 13:48:27 +09:00
smoogipoo
63c96d5a83
Fix tail note not properly capping result
2019-12-23 18:49:08 +09:00
smoogipoo
d6fd1007c4
internal -> public
2019-12-23 18:48:14 +09:00
smoogipoo
7ac6f68de8
Rewrite hold note input handling
2019-12-23 17:48:57 +09:00
smoogipoo
42853b5af6
Separate head/tail notes from hold note class
2019-12-23 17:48:57 +09:00
smoogipoo
6e7426a098
Simplify/improve beatmap conversion precheck
2019-12-23 17:44:18 +09:00
unknown
00ef2bd8d3
remove unused usings
2019-12-22 16:57:07 +08:00
unknown
fe73b9f8d3
make HP and OD generic and instantiate CS and AR to modes that need it
2019-12-22 16:45:32 +08:00
unknown
08b477ed52
make ModDifficultyAdjust abstract
2019-12-20 18:30:23 +08:00
smoogipoo
76f2fb378f
Separate score and health parts of ScoreProcessor
2019-12-19 20:03:14 +09:00
Dean Herbert
ea661fce21
Merge branch 'master' into adjustable-map-settings
2019-12-18 18:44:11 +09:00
Dean Herbert
51a01c7006
Merge pull request #7256 from peppy/remove-ruleset-ctor-param
...
Remove RulesetInfo parameter from Ruleset constructor
2019-12-18 18:42:42 +09:00
smoogipoo
2a128340d0
Merge remote-tracking branch 'refs/remotes/origin/master' into nightcore-beats
2019-12-18 17:58:37 +09:00
Dean Herbert
6e0802e50c
Remove RulesetInfo parameter from Ruleset constructor
2019-12-18 14:49:09 +09:00
Dean Herbert
e0ce87adca
Move CreateScoreProcessor() to Ruleset ( #7244 )
...
Move CreateScoreProcessor() to Ruleset
2019-12-17 22:15:42 +09:00
Dan Balasescu
fd2785bab3
Merge branch 'master' into fxcop
2019-12-17 20:14:45 +09:00
smoogipoo
49bf8d27d1
Move CreateScoreProcessor() to Ruleset
2019-12-17 20:08:13 +09:00
Huo Yaoyuan
ecfc6dfa3d
CA1825: use Array.Empty.
2019-12-17 12:59:48 +08:00
Dean Herbert
b5db927d93
Merge branch 'master' into cinema-mod
2019-12-17 12:56:06 +09:00
Huo Yaoyuan
c457571da6
Use index and range expressions
2019-12-15 20:17:35 +08:00
unknown
01c036b0b0
implement backing beats for nightcore mods
2019-12-15 16:56:02 +08:00
Huo Yaoyuan
ddb2cfc46d
Use GetEndTime in Taiko and Mania
2019-12-14 18:16:13 +08:00
unknown
002a125b4a
make ModDifficultyAdjust generic
2019-12-12 21:14:26 +08: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
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
48f1dad4aa
Remove abstract ScoreProcessor class
2019-12-11 17:25:06 +09:00
Albie
a61f8cc2c3
Merge branch 'master' into cinema-mod
2019-12-10 17:06:53 +00:00
Huo Yaoyuan
9ddfdab27a
Remove meaningless Convert calls.
2019-12-03 20:47:00 +08:00
Albie
7864899249
Merge branch 'master' into cinema-mod
2019-11-28 16:42:01 +00: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
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
Berkan Diler
fccdbffa93
Use MathF instead of Math- functions when possible
...
MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.
2019-11-25 00:45:42 +01:00
Albie Spriddell
3b9f59cb33
add cinema mod support
2019-11-23 17:34:53 +00:00
Albie Spriddell
20edaf4ba6
add cinema mod support
2019-11-23 17:32:16 +00:00
Huo Yaoyuan
8239c2da61
Refactor to avoid using try-finally as control flow.
2019-11-22 00:12:03 +08:00
Huo Yaoyuan
4cd7d67fe4
Use early return for if-pattern-matching.
2019-11-22 00:02:40 +08:00
Huo Yaoyuan
20f01ff3e9
Revert false positives of 'unused assignment'.
2019-11-21 23:54:38 +08:00
Huo Yaoyuan
818553027b
Merge branch 'master' into sharpen
2019-11-21 23:42:46 +08: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
b5c20fecee
Merge branch 'master' into netstandard2.1
2019-11-19 21:40:12 +08:00
Huo Yaoyuan
608785b99a
Update .Net Standard projects to 2.1
2019-11-18 18:35:58 +08:00
Huo Yaoyuan
53bc2dcab7
Use costum displaying text for inherited references.
2019-11-18 15:29:18 +08:00
Huo Yaoyuan
b04bca7db6
Reference elements in origin definition.
2019-11-17 20:55:40 +08: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
Huo Yaoyuan
7d7b9e36b2
Use compound assignment.
2019-11-12 19:53:50 +08:00
Huo Yaoyuan
4b75e0bf6a
Redundant assignment.
2019-11-12 19:53:47 +08:00
Dean Herbert
b37bf4ea01
Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition
2019-11-12 10:44:53 +09:00
Huo Yaoyuan
ccc8aa6fa4
Apply brace style.
2019-11-11 20:13:13 +08:00
Dean Herbert
fd7bdc03ab
Merge remote-tracking branch 'upstream/master' into infrastructure
2019-11-11 11:11:59 +09:00
Dan Balasescu
1c1a49011b
Merge branch 'master' into infrastructure
2019-11-08 19:10:49 +09:00
smoogipoo
6fc1be64c2
Make hitobject samples a bindable list
2019-11-08 14:04:57 +09:00
smoogipoo
1f9f03dc66
Add temporary fix for null references
2019-11-07 13:36:54 +09:00
smoogipoo
8d42e45fd3
Make holdnote notes update lazily
2019-11-07 13:23:00 +09:00
smoogipoo
8141509a71
Split hold note blueprints into separate file
2019-11-07 12:59:05 +09:00
smoogipoo
2c1bfd62ef
Disallow selections to be moved outside of the playfield
2019-11-06 17:28:04 +09:00
Huo Yaoyuan
bcf8e3a9d4
Remove redundant properties from desktop projects.
...
While OutputType=Library maybe doubtful, PlatformTarget=AnyCPU should be clearly the default.
2019-10-30 22:56:33 +08:00
Huo Yaoyuan
31595159be
Normalize .props
2019-10-30 21:54:14 +08:00
smoogipoo
38c2c328ff
Rename HitObject -> DrawableObject in selection blueprints
2019-10-21 17:04:56 +09:00
Dean Herbert
d0eaf629af
Merge branch 'master' into dho-apply
2019-10-18 19:45:10 +09:00
Dean Herbert
e3740fbc77
Merge pull request #6528 from smoogipoo/fix-mania-selection-movement
...
Fix mania hitobject selections not moving correctly
2019-10-18 16:28:04 +09:00
smoogipoo
c4cc960e15
Fix mania hitobject selections not moving correctly
2019-10-17 18:00:15 +09:00
smoogipoo
510ce9345f
Fix potential blueprint nullrefs with the new structure
2019-10-17 16:14:28 +09:00
smoogipoo
bc41eb176e
Clean up head/tail setting in various DHOs
2019-10-17 14:02:23 +09:00
smoogipoo
f429a8f7c2
Add back/obsolete old AddNested() method
2019-10-17 14:02:08 +09:00
smoogipoo
d8f3678c3c
Rename parameter
2019-10-17 12:53:54 +09:00
smoogipoo
8a284bacba
Make mania use the new nested hitobject structure
2019-10-17 12:37:20 +09:00
smoogipoo
79b2c7b480
Make BeginPlacement() set the hitobject start time
2019-10-16 20:04:15 +09:00
Dean Herbert
00d4d976b7
Move editor selections relative to hitobject start positions ( #6431 )
...
Move editor selections relative to hitobject start positions
2019-10-11 19:35:11 +09:00
Dean Herbert
51bf600ea7
Use empty hitwindows instead of null
2019-10-09 19:08:31 +09:00
smoogipoo
8b661e624d
Remove drag from class/method namings + refactor
2019-10-08 19:08:31 +09:00
smoogipoo
08d043f447
Move selection relative to the hitobject start positions
2019-10-08 18:57:03 +09:00
Dean Herbert
0fdb07346b
Merge branch 'master' into fix-mania-placement
2019-10-06 14:22:03 +08:00
smoogipoo
80585d446c
Split applyPositionOffset into two methods and add xmldocs
2019-10-03 18:40:48 +09:00
smoogipoo
f1ff22cf8b
Fix hold note blueprint placing in the wrong direction
2019-10-03 18:40:48 +09:00
smoogipoo
39369620fa
Remove position offset from ColumnAt
2019-10-03 18:40:48 +09:00
smoogipoo
0a409075be
Fix note placement offset not working for down-scroll
2019-10-03 18:40:48 +09:00
smoogipoo
754fbc59e1
Fix note placement being offset
2019-10-03 18:40:48 +09:00
smoogipoo
652acac87f
Move placement movement event to BlueprintContainer
2019-10-03 16:14:42 +09:00
Bartłomiej Dach
8efab559c8
Remove unused using directives
2019-09-25 01:13:42 +02:00
Bartłomiej Dach
9323df26a1
Decouple bar line hitobjects from generator
...
Introduce an IBarLine interface, which together with generic constraints
helps decouple BarLineGenerator from the actual hitobject types it
creates. Thanks to this, all rulesets that want bar lines can provide
an implementation of IBarLine that also derives from the base hitobject
class.
This allows DrawableBarLines in taiko and mania to be migrated back to
DrawableTaikoHitObject and DrawableManiaHitObject base classes
respectively. This in turn resolves #6215 without code duplication,
since the missing anchoring application is now done in mania's
DrawableBarLine through deriving from DrawableManiaHitObject.
2019-09-25 00:36:27 +02:00
Vperus
2d99d41a6d
Remove unused CORNER_RADIUS
2019-09-20 18:17:35 +03:00
Dean Herbert
61b396f235
Remove redundant length check
2019-09-18 17:09:43 +09:00
Dean Herbert
381daffe52
Generate better temporary frames to support framed handling flaws
2019-09-18 16:09:48 +09:00
Dean Herbert
77947e8309
Fix rewind tests failing
2019-09-17 22:33:27 +09:00
Bartłomiej Dach
a407e267a2
Fix PF/SD legacy mod conversion
...
Upon investigating an user report in #6091 that indicated that viewing
replays using the Perfect mod would also display the Sudden Death mod
icon despite Perfect being the more restrictive of the two, it turned
out that the logic of importing legacy scores was missing that corner
case. A similar case of Double Time/Nightcore mutual exclusion was
handled, but PF/SD was missed.
Add analogous handling of PF/SD legacy mods for all four rulesets,
and additionally cover a tiny fraction of all cases with unit tests.
The most problematic cases (NC+HD and PF+SD) are covered in all four
basic rulesets.
2019-09-15 22:55:25 +02:00
Dean Herbert
624e5644a4
Change osu!catch key trigger to occur on frame before positional change
2019-09-13 23:06:35 +09:00
Dan Balasescu
125b3fda6c
Merge branch 'master' into improve-catch-replay-frames
2019-09-13 19:23:15 +09:00
Dean Herbert
9fc60aeefc
Merge branch 'master' into reset-dho-lifetimes
2019-09-12 19:29:14 +09:00
Dean Herbert
f21e47d6d2
Move expire to DrawableHitObject
2019-09-12 19:29:08 +09:00
Dean Herbert
acdfeef1dc
Improve how osu!catch stores and replays key actions
2019-09-12 18:33:46 +09:00
Dan Balasescu
f9b64446e9
Merge branch 'master' into mania-note-sizing
2019-09-12 14:20:28 +09:00
smoogipoo
b941f12688
Cleanup
2019-09-12 14:09:21 +09:00
Dan Balasescu
141e83fada
Merge branch 'master' into mania-hit-explosion
2019-09-12 13:53:42 +09:00
smoogipoo
bbf80f63aa
Publicly expose column width constant
2019-09-12 13:53:05 +09:00
smoogipoo
b1c0b080ec
Fix bad hit explosion anchoring
2019-09-12 13:52:27 +09:00
Dean Herbert
06618b6d02
Fix osu!mania minor barline alpha not being respected
2019-09-11 18:45:47 +09:00
Dean Herbert
b9e71d26b2
Dim column backgrounds further
2019-09-11 18:21:39 +09:00
Dean Herbert
c7186efd53
Reduce opacity of judgement area
2019-09-11 18:21:29 +09:00
Dean Herbert
6bfdadb22f
Increase column width
2019-09-11 18:20:41 +09:00
Dean Herbert
8f6bc6fd5c
Make osu!mania hit explosions more explodey
2019-09-11 18:19:47 +09:00
Dean Herbert
44d90a4e86
Increase note height
2019-09-11 18:16:14 +09:00
Dean Herbert
da6ba20fc8
Reduce glow on notes
2019-09-11 18:15:03 +09:00
Dean Herbert
e682ca4fd9
Adjust osu!mania scroll speed defaults to be more sane
2019-09-11 12:51:54 +09:00
Dean Herbert
af3bb5a2cd
Centralise and share bar line generation code between rulesets
2019-09-10 13:30:54 +09:00
Dean Herbert
f925e781a9
Refactor HitWindows for legibility
2019-09-06 15:24:14 +09:00
Dean Herbert
05ed9d3802
Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements
2019-09-03 13:07:58 +09:00
smoogipoo
8302658186
Fix other potential nullref cases that rider missed
2019-09-02 18:31:33 +09:00
smoogipoo
4c150839c0
Fix potential diffcalc hitwindow nullref
2019-09-02 17:38:58 +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
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
Dan Balasescu
d8a48a37d1
Merge branch 'master' into editor-refactor
2019-08-29 18:22:42 +09:00
smoogipoo
87e28ab1f9
Remove non-generic DrawableEditRuleset
2019-08-29 18:12:29 +09:00
Dean Herbert
1597cf874e
Merge branch 'master' into relative-beat-lengths
2019-08-28 20:26:20 +09:00
Dean Herbert
ecfcbe3723
Merge remote-tracking branch 'upstream/master' into relative-beat-lengths
2019-08-28 20:21:56 +09:00
Dean Herbert
9a98f39f06
Share logic with other rulesets (and make default)
2019-08-28 18:12:47 +09:00
smoogipoo
fff2da7289
Fix hold notes disappearing instantaneously
2019-08-27 12:59:57 +09:00
smoogipoo
6014a66804
Add initial fade transform to fix rewind
2019-08-27 12:22:31 +09:00
iiSaLMaN
c11f508400
Use transform management for mania hit objects
2019-08-26 22:06:30 +03:00
Dean Herbert
dffb2d6474
Merge branch 'master' into relative-beat-lengths
2019-08-26 18:59:50 +09:00
smoogipoo
d4a296f911
Slight refactoring
2019-08-26 17:45:12 +09:00
smoogipoo
fd4c6e08ca
Merge remote-tracking branch 'origin/master'
2019-08-26 17:37:06 +09:00
smoogipoo
e30ae57ea6
Scale mania beat lengths relative to each other
2019-08-26 12:51:23 +09:00
Dean Herbert
48716f8f2b
Update framework
2019-08-21 13:29:50 +09:00
Desconocidosmh
77e9e89fec
Refactoring
2019-08-19 20:45:23 +02:00
Desconocidosmh
b3556403aa
Make GetNextObject() a virtual method
2019-08-19 16:18:25 +02:00
Desconocidosmh
0f9706e798
Fix using invalid constant
2019-08-17 00:18:25 +02:00
Desconocidosmh
7de1757aae
Small improvements
2019-08-16 12:50:48 +02:00
Desconocidosmh
24d2b504dd
Stop autoplay from missing on very dense notes when playing mania
2019-08-16 12:39:54 +02:00
Dean Herbert
90b1fe81f3
Update cached usage in line with framework changes
2019-08-09 19:12:29 +09:00
Dean Herbert
7e9c100c9b
Apply new resharper refactors
2019-08-09 12:29:33 +09:00
smoogipoo
8a64ab0384
Remove generics from IApplicableToBeatmap
2019-08-01 12:39:32 +09:00
Dean Herbert
c3b81bef4a
Flip default to the preferred method going forward
2019-07-22 15:55:38 +09:00
Dean Herbert
8327452fe1
Make AccentColour a bindable
2019-07-22 14:48:59 +09:00
Dean Herbert
9bed0094de
Merge remote-tracking branch 'upstream/master' into android
2019-07-02 19:40:50 +09:00
Dean Herbert
60ea3d4e1a
Fix skinning support for combobreak
2019-06-30 21:58:30 +09:00
Shane Woolcock
17d103181c
Merge branch 'master' into android
2019-06-18 20:05:14 +09:30
HoLLy
7e9f5a0939
Add Skills to DifficultyAttributes
2019-05-29 11:22:51 +02:00
tangalbert919
6fd1eb5e08
Merge remote-tracking branch 'upstream/master' into android
2019-05-08 08:15:03 -05:00
smoogipoo
13b9b04bb8
Apply more cases/fix some existing ones
2019-05-07 13:23:09 +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
Dean Herbert
d40177f97c
Merge branch 'master' into drawnode-composability
2019-04-27 18:41:19 +09:00
smoogipoo
aeae759fcd
Rename method + add xmldoc
2019-04-22 18:08:15 +09:00
smoogipoo
4edb17a88a
Make hp work + cleanup
2019-04-22 18:02:49 +09:00
smoogipoo
4c5f41e40f
Implement hp increase for mania
2019-04-22 17:04:18 +09:00
smoogipoo
0222424aef
Make mods IReadOnlyList<Mod> gamewide
...
Prevents potential multiple evaluations of enumerable.
2019-04-10 17:20:36 +09:00
smoogipoo
c584967eb1
Remove mods from workingbeatmap
2019-04-09 12:59:32 +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
42eaabe24c
Fix editor blueprints being misplaced
...
Regressed with PlayfieldAdjustmentContainer changes.
2019-03-31 01:29:37 +09:00
Dean Herbert
3e8952b087
Merge pull request #4521 from peppy/hitobject-drawable-representation
...
Fix DrawableRuleset drawable creation method's name
2019-03-29 14:08:23 +09:00
Dean Herbert
c72705217a
Merge branch 'master' into framed-replay-handler-fixes
2019-03-29 12:59:51 +09:00
Dean Herbert
14cef94a53
Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation
2019-03-29 12:59:26 +09:00
Dean Herbert
785433bb74
Merge branch 'master' into universal-playfield-adjust
2019-03-29 11:25:54 +09:00
Dean Herbert
7715606188
Merge branch 'master' into sprite-icon-compatibility
2019-03-29 11:15:34 +09:00
Dean Herbert
8642886ffa
Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust
2019-03-29 00:39:51 +09:00
Dean Herbert
09a7950a3b
Fix handlers for other rulesets
2019-03-28 15:09:06 +09:00
Dean Herbert
de80fc0eac
Update icon usage to match framework changes
2019-03-27 19:29:27 +09:00
Dean Herbert
ed3746e166
Make PlayfieldAdjustmentContainer universal
2019-03-26 13:32:44 +09:00
Dean Herbert
39df8cce19
Fix incorrect usage of InternalChildren
...
Could cause overwriting of components added by base DrawableHitObjcet class (such as samples)
2019-03-25 13:48:55 +09:00
Dean Herbert
9bf48863b0
Fix DrawableRuleset drawable creation method's name
2019-03-25 00:00:29 +09:00
tangalbert919
00c659a5ca
Merge all changes from 2019.321.0 to android
2019-03-20 11:00:27 -05:00
Dean Herbert
7b6d882ce6
Remove double-generic type
2019-03-20 11:29:16 +09:00
Dean Herbert
3b7a76aa4e
Fix typo
2019-03-20 11:22:34 +09:00
Dean Herbert
baea7230bc
Rename RulesetContainer to DrawableRuleset
2019-03-19 23:47:31 +09:00
Dean Herbert
68f28326a2
Refactor RulesetContainer for readability
2019-03-19 20:21:31 +09:00
tangalbert919
e865ac2086
Merge remote-tracking branch 'origin/master' into android
2019-03-17 09:39:34 -05:00
Dean Herbert
1617e2a729
Merge branch 'master' into mania-judgemetns
2019-03-13 18:17:42 +09:00
David Zhao
3b3b1e51ee
Move hit animation logic into virtual method
2019-03-12 19:41:33 +09:00
David Zhao
12f334035f
Create properties for use in DrawableManiaJudgement
2019-03-12 19:23:24 +09:00
Albert Tang
7f30fce3fe
Merge branch 'master' into android
2019-03-08 10:39:24 -06:00
Dean Herbert
48e54c84c1
Merge branch 'master' into mod-wind
2019-03-08 20:23:02 +09:00
Dean Herbert
1f44dde96b
Fix autoplay tests not working
2019-03-07 18:34:56 +09:00
Dean Herbert
d70b373af9
Merge branch 'master' into mod-wind
2019-03-06 14:04:04 +09:00
tangalbert919
1e6cb3e7d8
Merge remote-tracking branch 'upstream/master' into android
2019-03-05 17:56:13 -06: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
LeNitrous
c271a3a781
remove ruleset specific mods
2019-03-04 17:36:44 +08:00
LeNitrous
ecc2c28a62
mod rule changes
2019-03-03 16:22:00 +08:00
smoogipoo
c722ea0299
Add space
2019-03-01 14:30:58 +09:00
andy840119
e634475bf4
IsDuel -> Dual
2019-02-28 23:40:03 +09:00
andy840119
4b2be4612f
support duel mode in mania beatmap
2019-02-28 19:07:43 +09:00
Dean Herbert
2dbf7d122c
Merge branch 'master' into use-pattern-matching
2019-02-28 14:53:07 +09:00
Dean Herbert
e2c6a8bc07
Use pattern matching wherever possible
2019-02-28 14:35:00 +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
Dean Herbert
cd3f3be79d
Merge branch 'master' into master
2019-02-25 09:59:18 +09:00
Dean Herbert
367bc53a06
Revert some more instances of 'e' variable names
2019-02-22 20:15:25 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage
2019-02-22 18:09:23 +09:00
Dean Herbert
452caabd40
Apply suggestions from code review
...
Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>
2019-02-22 17:06:49 +09:00
Ignacio Conde
a62f150962
Fixed Issue #4159
2019-02-22 02:28:38 -03: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
7e41fbc29b
Remove LegacyDifficultyCalculator
2019-02-21 13:12:37 +09:00
smoogipoo
4db5531e4b
Replace copy-constructor/method with extension method
2019-02-20 19:32:30 +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
Dean Herbert
d6a2fe6891
Remove excess newline
2019-02-20 10:29:08 +09:00
smoogipoo
4efc03cdf0
Add beatmap argument + fix crashes
2019-02-19 17:56:38 +09:00
smoogipoo
5457097342
Update with PopulateAttributes() removal
2019-02-19 17:48:00 +09:00
smoogipoo
bf17826363
Fix post-merge errors
2019-02-19 16:30:29 +09:00
smoogipoo
9cce9ce97c
Consider aggregate peaks
2019-02-18 15:00:32 +09:00
smoogipoo
68725dc005
Implement new difficulty calculator for Rulesets.Mania
2019-02-18 15:00:20 +09:00
smoogipoo
a8faa942a6
Implement new difficulty calculator structure
2019-02-18 14:49:43 +09:00
smoogipoo
e319a760b8
Add mania difficulty calculator test
2019-02-15 16:25:44 +09:00
tangalbert919
7349a6c527
Merge remote-tracking branch 'upstream/master' into android
2019-02-12 20:41:54 -06:00
HoLLy
ae9d5f999c
Use correct DifficultyAttributes where possible
2019-02-06 21:28:42 +01:00
Dean Herbert
2d7c23dd9f
Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics
2019-02-04 12:15:53 +09:00
tangalbert919
80006109a2
Merge remote-tracking branch 'upstream/master' into android
2019-01-29 18:13:43 -06:00
LeNitrous
03e57d0423
fix codefactor warnings and derive ModWindUp and ModWindDown to ModTimeRamp
2019-01-26 20:15:19 +08:00
LeNitrous
73dbf5712d
add license headers
2019-01-26 13:43:27 +08:00
LeNitrous
1427c9f576
trim whitespaces
2019-01-26 13:11:08 +08:00
LeNitrous
c6e26a92ec
add wind up and wind down mods
2019-01-26 12:15:45 +08:00
Unknown
8ddff673b7
revert previous rename and rename ruleset specific classes instead
2019-01-25 11:14:37 +01:00
Dean Herbert
f4729d41f3
Merge branch 'master' into samah-ios
2019-01-25 18:49:08 +09:00
Dean Herbert
67331039ef
Don't use TransferValueOnCommit
2019-01-25 12:53:30 +09:00
Dean Herbert
014ea972d9
Merge remote-tracking branch 'origin/master' into samah-ios
2019-01-25 11:51:44 +09:00
Unknown
01ab371c87
add "Scroll speed" to ManiaSettingsSubsection
2019-01-24 17:39:23 +01:00
Dean Herbert
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09:00
tangalbert919
e3ce203c68
Merge remote-tracking branch 'upstream/master' into android
2019-01-23 17:45:46 -06:00
Dean Herbert
8160162cde
Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics
2019-01-21 20:58:17 +09:00
Shane Woolcock
10b91e18bd
Merge branch 'master' into samah-ios
...
# Conflicts:
# osu.Game/osu.Game.csproj
2019-01-19 18:03:58 +10:30
Kyle Chang
bd6c845fc8
Use IApplicableToBeatmap for mirror and random mania mods
2019-01-15 22:51:52 -05:00
Shane Woolcock
a6c54a9675
Merge branch 'master' into samah-ios
2019-01-12 00:16:09 +10:30
Unknown
6eff79913b
remove blank lines
2019-01-11 10:34:56 +01:00
tangalbert919
47268898be
Expose internals for Android test projects
2019-01-06 00:04:25 -06:00
Dean Herbert
aec3753863
Fix imported replays having excess statistics
2019-01-03 14:01:20 +09:00
Shane Woolcock
32ffcb9865
Merge branch 'master' into samah-ios
...
# Conflicts:
# osu.Game/osu.Game.csproj
2018-12-29 20:09:00 +10:30
Shane Woolcock
a83bee9461
Add ruleset visual tests
2018-12-29 20:05:37 +10:30
smoogipoo
b64932f6db
Implement hit windows
2018-12-27 22:39:15 +09:00
Ivan Pavluk
cb2444e01c
Remove Meh from TaikoHitWindows
2018-12-06 19:04:54 +07:00
smoogipoo
8eff49bccd
Remove User from Replay
2018-11-30 18:25:14 +09:00
Dean Herbert
d97a15a504
Add IMod and change ShortenedName to Acronym
2018-11-30 17:16:00 +09:00
Dean Herbert
831cd3ed59
ScoreInfo scoreInfo -> ScoreInfo score
2018-11-30 15:18:52 +09:00
Dean Herbert
271dcded3c
Merge branch 'master' into scoredatabase
2018-11-30 14:59:58 +09:00
Dean Herbert
a1666fb7fa
MouseDownPosition -> DragPosition
2018-11-30 14:21:20 +09:00
Dean Herbert
5254b07680
Merge remote-tracking branch 'upstream/master' into inter-column-movements
2018-11-30 11:57:53 +09:00
Dean Herbert
085acf29a0
Fix blueprints behaving incorrectly
2018-11-29 19:29:36 +09:00
Dean Herbert
ab0ce46362
Make hold note placement blueprints look a bit more blueprint-y
2018-11-29 18:13:15 +09:00
Dean Herbert
132d334e15
Merge branch 'master' into hold-note-placement
2018-11-29 17:02:55 +09:00
Dean Herbert
d1c976880c
Fix incorrect margin/spacing handling
2018-11-29 14:15:28 +09:00
Dean Herbert
8fd04cb47b
Fix mania placement blueprints appearing outside valid stage placement area
2018-11-29 13:20:37 +09:00
smoogipoo
b8e60afa69
Move replays to an wrapping Score class
2018-11-28 18:45:17 +09:00
smoogipoo
219929eb47
Score -> ScoreInfo
2018-11-28 18:33:01 +09:00
smoogipoo
2ee181daf7
Re-namespace replay-related classes
2018-11-28 17:20:37 +09:00
smoogipoo
09b79d736b
Remove unused usings
2018-11-28 16:33:42 +09:00
smoogipoo
5fd6e6ca77
Re-namespacing
2018-11-28 16:12:57 +09:00
smoogipoo
f9f300b215
Fix drag breaking if scrolling while dragging
2018-11-26 16:08:56 +09:00
Dean Herbert
4cfeb1b9a1
Merge branch 'master' into note-placement
2018-11-26 14:35:31 +09:00
Dean Herbert
c944e8bb29
Merge branch 'master' into fix-deletion-crash
2018-11-26 14:20:02 +09:00
Dean Herbert
bfebed053d
Merge branch 'master' into note-placement
2018-11-26 14:19:46 +09:00
smoogipoo
60ffad169f
Fix post-merge errors
2018-11-26 11:47:48 +09:00
smoogipoo
c0fcbc283e
Merge branch 'note-placement' into inter-column-movements
...
# Conflicts:
# osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
2018-11-26 11:47:22 +09:00
smoogipoo
56032a4522
Merge branch 'mania-selection-movement' into inter-column-movements
...
# Conflicts:
# osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
# osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
2018-11-26 11:45:48 +09:00
smoogipoo
5d6a438f98
Make selected mania hitobjects always alive
2018-11-26 11:34:25 +09:00
smoogipoo
91aa00b0e9
Add helper method to get column by position
2018-11-26 10:54:54 +09:00
smoogipoo
4ba3fa4ab6
osuTK
2018-11-26 10:44:48 +09:00
Dean Herbert
1da2006dea
Merge branch 'master' into note-placement
2018-11-22 19:44:39 +09:00
Dean Herbert
7de85659ba
Merge branch 'master' into mania-selection-movement
2018-11-21 20:00:46 +09:00
smoogipoo
dc8cd51e15
Implement mania note deletion
2018-11-20 17:26:00 +09:00
smoogipoo
f27bd3ef3e
OpenTK -> osuTK
2018-11-20 17:14:59 +09:00
Dan Balasescu
8cee4141e8
Merge branch 'master' into note-placement
2018-11-19 19:08:53 +09:00
smoogipoo
2ee56e4a78
Add a body piece
2018-11-19 18:59:05 +09:00
smoogipoo
ad950cfc90
Implement hold note placement
2018-11-19 18:40:43 +09:00
smoogipoo
8071244d97
Make sizing happen per-blueprint
2018-11-19 18:40:27 +09:00
Dan Balasescu
d9b8d2d15c
Trim whitespace
2018-11-19 18:05:21 +09:00
Dan Balasescu
079230d9ed
Merge branch 'master' into mania-selection-movement
2018-11-19 18:03:12 +09:00
smoogipoo
d1cbaa9612
Use the column width
2018-11-19 18:02:01 +09:00
smoogipoo
52309465eb
Apply some simple fixes
2018-11-19 17:59:52 +09:00
smoogipoo
55edeb095d
SelectionBox -> SelectionHandler
2018-11-19 16:58:11 +09:00
smoogipoo
595e2ffbff
Unbind event when column changes
2018-11-19 16:20:21 +09:00
smoogipoo
ce956d7fd4
Fix exception when order of objects changes
2018-11-19 16:19:56 +09:00
smoogipoo
4cbda97b1e
Move positional adjustment to SelectionBox
2018-11-16 17:12:24 +09:00
jorolf
80bd98bb9d
apply suggestions
2018-11-15 17:38:38 +01:00
smoogipoo
f7fc2ca569
Basic inter-column selection movement
2018-11-15 21:37:22 +09:00
smoogipoo
df7515b66f
Pass all selected hitobjects to the selection blueprints
2018-11-15 21:01:09 +09:00
smoogipoo
eddba44d0f
Merge branch 'note-placement' into inter-column-movements
2018-11-15 20:53:57 +09:00
smoogipoo
63642586c4
Merge remote-tracking branch 'origin/master' into mania-selection-movement
2018-11-15 20:47:53 +09:00
jorolf
41a0f9896e
Merge branch 'master' into flashlight-mod
2018-11-15 00:35:42 +01:00
jorolf
7d2958b7b0
split shader, remove unnecessary clutter and fix some bugs
2018-11-15 00:33:13 +01:00
Dean Herbert
3fbabdfed2
Merge branch 'master' into notepieces
2018-11-14 17:30:39 +09:00
Dean Herbert
a1dd1057ce
Merge branch 'master' into more-global-scrollalgo
2018-11-14 17:15:24 +09:00
Dean Herbert
8b190edde0
Merge branch 'master' into more-global-scrollalgo
2018-11-14 13:32:14 +09:00
smoogipoo
a9a33b1fcb
Implement mania selection movements
2018-11-13 16:42:40 +09:00
smoogipoo
fc0030a391
Use common positional adjustment for note blueprints
2018-11-13 15:45:06 +09:00
smoogipoo
25101ecd2c
Snap placement blueprint to columns
2018-11-13 14:13:29 +09:00
smoogipoo
3d8ef97e81
Add testcase
2018-11-12 19:41:06 +09:00
smoogipoo
1403fa26cf
Fix placement not working correctly for downwards scroll
2018-11-12 19:40:57 +09:00
smoogipoo
1d40a042f6
Extract common methods into ManiaPlacementBlueprint
2018-11-12 18:32:44 +09:00
smoogipoo
3a1fee59fb
Implement note placement
2018-11-12 18:24:18 +09:00
smoogipoo
a0c75a0597
Merge branch 'notepieces' into note-placement
2018-11-12 17:59:54 +09:00
smoogipoo
e302d5d005
Separate NoteSelectionBlueprint into a note piece
2018-11-12 17:59:39 +09:00
smoogipoo
8be6e351f5
Merge branch 'fix-mania-selections' into add-mania-selection-testcase
2018-11-12 17:39:58 +09:00
smoogipoo
10543cf1b6
Move rest of ScrollingPlayfield into ScrollingRulesetContainer
2018-11-12 17:34:35 +09:00
smoogipoo
e7969ecec7
Move ScrollAlgorithm inside IScrollingInfo
2018-11-12 17:34:35 +09:00
smoogipoo
54668a0dec
Simplify construction of ScrollingInfo
2018-11-12 17:34:35 +09:00
smoogipoo
ad45bc7666
Move scroll direction to scrollinginfo
2018-11-12 17:34:35 +09:00
smoogipoo
9fde7f7f44
Move scrolling info to osu.Game
2018-11-12 17:34:35 +09:00
smoogipoo
e3c60c2f96
Cleanups
2018-11-12 17:18:58 +09:00
jorolf
023924396d
Move flashlight code from OsuModFlashlight to ModFlashlight and implement other modes and break time
2018-11-11 18:38:12 +01:00
Dean Herbert
03af600273
Merge remote-tracking branch 'upstream/master' into fix-mania-selections
2018-11-09 11:35:46 +09:00
smoogipoo
d0b63e8f8d
Fix missing references
2018-11-08 14:13:57 +09:00
smoogipoo
21f8a0a56f
Fix selection box using an incorrect size
2018-11-08 14:02:07 +09:00
smoogipoo
4b1b494893
Fix selection masks not having the correct size
2018-11-08 14:02:07 +09:00
smoogipoo
5d51719572
Make selection blueprints handle position adjustments
2018-11-07 16:21:32 +09:00
smoogipoo
2612fd3099
Adjust ruleset-specific namespaces
2018-11-07 16:10:21 +09:00
smoogipoo
11be820efe
CreateMaskFor -> CreateBlueprintFor
2018-11-06 18:03:21 +09:00
smoogipoo
f2a5f28ea2
SelectionMask -> SelectionBlueprint
2018-11-06 17:56:04 +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
b28c0cd128
Merge branch 'master' into editor-mask-placement
2018-10-31 06:46:48 +09:00
smoogipoo
5712a52817
Merge remote-tracking branch 'origin/master' into mask-separation
...
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs
2018-10-30 16:46:13 +09:00
Kyle Chang
6d00aff9fd
Add type parameter to IApplicableToBeatmap
2018-10-30 00:13:33 -04:00
Kyle Chang
9b246f065c
Have dual stage mod apply changes to beatmap directly
2018-10-28 02:23:18 -04: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
677d0d4a19
Renamespace ruleset masks
2018-10-26 13:31:38 +09:00
smoogipoo
8703db5cc1
Rename HitObjectMask -> SelectionMask
2018-10-26 13:31:23 +09:00
smoogipoo
d36ac59ca2
Reduce complexity of creating edit ruleset containers
2018-10-17 18:06:00 +09:00
smoogipoo
f384c7228e
Fix post-merge issues
2018-10-16 17:28:23 +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
smoogipoo
47be95ce0b
Fix slider nodes using the wrong samples
2018-10-16 17:10:24 +09:00
smoogipoo
5095fbcdf7
Merge remote-tracking branch 'origin/master' into optimise-diffcalc
2018-10-16 10:27:18 +09:00
Dean Herbert
468f7fd1ea
Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework
2018-10-12 19:25:08 +09:00
Dean Herbert
e09e38148b
Merge branch 'master' into fix-scroll-speeds
2018-10-12 18:25:24 +09:00
smoogipoo
ec9f23ab73
Make IBeatmap.HitObjects an IReadOnlyList
2018-10-11 19:53:07 +09:00
smoogipoo
ff559a3a1b
Merge remote-tracking branch 'origin/master' into playfield-scaling-rework
...
# Conflicts:
# osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
# osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-10-05 10:40:16 +09:00
smoogipoo
3420e0c7eb
Re-implement composition tools + implement placement masks
2018-10-03 16:27:26 +09:00
smoogipoo
540a010fbb
Implement an intermediary EditRulesetContainer
2018-10-03 15:36:24 +09:00
smoogipoo
1164108a95
Renamespace ruleset masks
2018-10-03 13:45:41 +09:00
smoogipoo
4cdb6dcea5
Rename HitObjectMask -> SelectionMask
2018-10-03 13:28:00 +09:00
smoogipoo
4af885f6b1
Adjust default mania speed to match stable
2018-10-01 18:30:52 +09:00
Kyle Chang
88b0c234cc
Move judgement text to internal container
2018-09-30 04:01:33 -04:00
smoogipoo
a8f156584b
Update framework with positional/non-positional changes
2018-09-26 14:01:15 +09:00
smoogipoo
0bc2bcaf14
Remove GetAspectAdjustedSize() and PlayfieldArea
2018-09-21 15:14:49 +09:00
smoogipoo
368ceec47c
Simplify creation of a playfield
2018-09-21 14:35:50 +09:00
Dean Herbert
ced6e5efd0
Synchronise animation; reduce flashiness
2018-09-07 17:17:03 +09:00
Dean Herbert
1e39b84089
Increase visibility of osu!mania long notes
2018-09-06 23:49:54 +09:00
Dean Herbert
68a79f895a
Fix mania throwing an exception on start of map
2018-08-30 14:58:00 +09:00
smoogipoo
49913f00f0
Fix xmldoc
2018-08-25 00:07:48 +09:00
smoogipoo
26dfabc86c
Aggressively check for valid columns before iterating endlessly
2018-08-24 23:57:44 +09:00
smoogipoo
6475dfaeef
Allow 2B maps to be converted to mania
2018-08-23 09:19:33 +09:00
Dean Herbert
786ed8203f
Merge branch 'master' into fix-mirror-note-conversion
2018-08-17 14:47:16 +09:00
smoogipoo
3d6721111a
Increase the maximum allowable iterations during mania conversion
2018-08-17 13:26:53 +09:00
smoogipoo
99ace9805f
Fix mirror note generation never completing
2018-08-17 12:54:32 +09:00
Dean Herbert
dfecb3235b
Fix custom exception stack trace output
2018-08-16 20:41:53 +09:00
Dean Herbert
b26c8e3b9e
Fix notifiation stack trace output on mania conversion failure
2018-08-16 14:04:48 +09:00
Dean Herbert
6cc6d77815
Merge branch 'master' into mania-conversion-safety
2018-08-16 11:19:14 +09:00
smoogipoo
74a79bfcfa
Fix hold note head/tails not being nested hitobjects
2018-08-16 10:45:06 +09:00
Dean Herbert
d28acaada1
Merge branch 'master' into mania-conversion-safety
2018-08-16 10:37:07 +09:00
smoogipoo
26d4bb5451
xmldoc + reword
2018-08-15 09:51:02 +09:00
smoogipoo
2019a89a08
Softly-handle infinite loops in mania beatmap conversion
2018-08-14 16:45:35 +09:00
Dean Herbert
270dc2d1be
Merge branch 'master' into judgement-rework
2018-08-14 13:16:16 +09:00
smoogipoo
f719b9bef5
Fix mania scroll direction not being read from database
2018-08-07 12:20:24 +09:00
Dan Balasescu
c1517e1521
Merge branch 'master' into judgement-rework
2018-08-06 12:30:46 +09:00
smoogipoo
3a7488767c
Make HitObject not store the judgement
2018-08-06 11:50:18 +09:00
smoogipoo
741ec0021e
Rename more judgement-related methods to "result"
2018-08-06 11:31:46 +09:00
smoogipoo
5fd4ed2f4e
Rename judgement-related methods/events + commenting
2018-08-06 10:55:25 +09:00
Dean Herbert
0c920fe486
Merge branch 'master' into mania-mask-container
2018-08-06 04:22:21 +09:00
smoogipoo
2a4994e5ce
Make hitobjects only have one judgement + result
2018-08-03 15:38:48 +09:00
smoogipoo
807794d512
Make Rulesets.Mania use the new judgement result structure
2018-08-02 20:36:54 +09:00
smoogipoo
cd70e5e30b
Migrate Rulesets.Mania to the new judgement system
2018-08-02 16:44:01 +09:00
Dean Herbert
3c06655672
Split out Special mods into Automation and Conversion
2018-07-31 18:00:42 +09:00
Dean Herbert
aead4be134
Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container
2018-07-23 06:36:10 +02:00
Dean Herbert
d868d81b59
Merge branch 'master' into centralise-judgement-display
2018-07-23 02:58:49 +09:00
Dean Herbert
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
smoogipoo
1139f0dbf2
Centralise method of disabling playfield judgements
2018-07-20 17:04:33 +09:00
Dan Balasescu
824c217a0d
Adjust comment
2018-07-19 19:46:03 +09:00
Dan Balasescu
5dba048c46
Merge branch 'master' into mania-mask-container
2018-07-19 19:38:43 +09:00
smoogipoo
c3c270621b
Fix hold note note masks blocking mouse input
2018-07-19 19:32:47 +09:00
smoogipoo
be297ddf76
Fix direction reversal not quite working correctly
2018-07-19 19:30:20 +09:00
smoogipoo
b7721edc80
Remove more unnecessary changes
2018-07-19 18:25:28 +09:00
smoogipoo
54e288f09b
Correctly give note masks a scrolling info
2018-07-17 16:55:50 +09:00
smoogipoo
6437fdd9db
Merge remote-tracking branch 'origin/master' into mania-mask-container
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-07-17 16:46:48 +09:00
Dan Balasescu
64cde1ebad
Merge branch 'master' into use-switch-over-if
2018-07-17 16:44:57 +09:00
smoogipoo
c51fe6a119
Remove more unused stuff
2018-07-17 16:01:47 +09:00
smoogipoo
48c1561676
Remove now unnecessary mask layer
2018-07-17 16:01:14 +09:00
smoogipoo
9f730dd784
Merge branch 'editor-composer-cleanup' into mania-mask-container
...
# Conflicts:
# osu.Game/Rulesets/Edit/HitObjectComposer.cs
# osu.Game/Screens/Edit/Screens/Compose/Layers/HitObjectMaskLayer.cs
2018-07-17 16:00:46 +09:00
smoogipoo
827c5c4939
Remove scroll direction from ScrolingPlayfield constructor
2018-07-17 15:14:03 +09:00
Dean Herbert
825941aff1
Use switch with type matching in place of if-else where possible
2018-07-17 14:35:09 +09:00
smoogipoo
577ff4cc7f
Merge remote-tracking branch 'origin/master' into mania-mask-container
...
# Conflicts:
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
# osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
# osu.Game.Rulesets.Mania/UI/ManiaStage.cs
2018-07-17 13:13:57 +09:00
Dean Herbert
58fe434dd0
Don't use in invalidation logic to avoid incorrect execution
2018-07-16 16:39:52 +09:00
Dean Herbert
98cddc0c04
Fix some legacy cases
2018-07-16 16:26:37 +09:00
Dean Herbert
dbc538abbe
Use Enum.HasFlag
...
With .NET core 2.0+ this is as efficient as the ugly code we've been using.
2018-07-16 16:18:46 +09:00
Dean Herbert
24054246b8
Fix DI regression
2018-07-11 17:54:01 +09:00
Dean Herbert
fbc5250bf1
Update framework
2018-07-11 17:12:01 +09:00
Dan Balasescu
282a99fb88
Merge branch 'master' into fix-spelling
2018-07-10 16:32:14 +09:00
Dan Balasescu
a1d2092cc9
Fix incorrect default drain time
2018-07-06 13:29:40 +09:00
Dan Balasescu
290812cf65
Merge branch 'master' into more-mania-conversion-fixes
2018-07-06 13:29:16 +09: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
f007e71c87
Retrieve the mania key action through DI
2018-07-02 12:31:41 +09:00
Dean Herbert
c0b65a6a73
Change default IsBonus definition and remove unnecessary overrides
2018-06-29 17:07:08 +09:00
Dean Herbert
0940715631
Merge branch 'master' into catch-scoring
2018-06-29 14:59:15 +09:00
Dean Herbert
22138d39ca
Merge branch 'master' into more-diffcalc-attributes
2018-06-25 19:53:22 +09:00
Dean Herbert
a397827841
Reduce line length
2018-06-25 19:28:38 +09:00
Dean Herbert
594cc0d21d
Merge branch 'master' into mania-playfield-inversions
2018-06-25 18:36:23 +09:00
smoogipoo
97057ced85
Merge remote-tracking branch 'origin/master' into full-mania-fix
2018-06-25 12:43:49 +09:00
Jean-Denis Boivin
55364af56c
I guess you meant an "or" ?
2018-06-24 14:55:27 -04:00
ekrctb
d6084c0b30
Adapt to new input handling changes
2018-06-22 18:10:27 +09:00
smoogipoo
48989df6eb
Make sure that 0 SR is returned when there are no hitobjects
2018-06-21 12:04:14 +09:00
Dan Balasescu
bf11a61d52
Merge branch 'master' into more-diffcalc-attributes
2018-06-21 09:26:50 +09:00
smoogipoo
6cd9a22e26
Update testcase
2018-06-19 13:52:24 +09:00
smoogipoo
a623155b9f
Fix missing using
2018-06-19 13:51:53 +09:00
smoogipoo
f090e82b63
Fix inverted conditional
2018-06-18 21:06:09 +09:00
smoogipoo
0625bfda30
Don't split single hitobject into multiple patterns
2018-06-18 20:17:49 +09:00
smoogipoo
8529cece4a
Fix precision error
2018-06-18 20:17:19 +09:00
Dean Herbert
1d9d240454
Merge branch 'master' into mania-playfield-inversions
2018-06-18 04:41:17 +09:00
Dean Herbert
6fa72c510f
Avoid listing the base mods twice
2018-06-18 00:48:35 +09:00
smoogipoo
0a99d21938
Use the passed-in ruleset
2018-06-17 18:01:28 +09:00
smoogipoo
55f0b3c42c
Distance object generator should output a secondary pattern
...
In osu!stable, only the hitobjects which ended at the distance object's EndTime would be considered for further pattern generation.
Previously this generator was group _all_ objects including those that don't end at the object's EndTime, resulting in incorrect hitobject count for further pattern generation.
2018-06-15 22:10:57 +09:00
smoogipoo
2d59ae9354
Commit forgotten variable
2018-06-15 22:08:24 +09:00
smoogipoo
53a6d01304
Fix stair type not being flipped correctly
2018-06-15 21:06:54 +09:00
smoogipoo
5f5d797c1e
Remove unused field
2018-06-15 21:06:35 +09:00
smoogipoo
e51f96e181
Fix some notes not being recorded
2018-06-15 20:53:18 +09:00
smoogipoo
c1f7db80f1
Forgot to commit random change
2018-06-15 20:52:09 +09:00
smoogipoo
fe9aaf000c
Fix missing conditional
2018-06-15 20:50:36 +09:00
smoogipoo
481546ec7a
Fix drain time not being rounded to the second
2018-06-15 20:49:11 +09:00
smoogipoo
afbf35b814
Add rng components to mania conversion tests
2018-06-15 20:48:48 +09:00
Dean Herbert
57011ff13b
Merge branch 'master' into mania-playfield-inversions
2018-06-15 18:33:40 +09:00
Dean Herbert
719056ca4a
Merge branch 'master' into mania-keymod-optimisation
2018-06-15 18:29:27 +09:00
Dean Herbert
f9a7e761e4
Merge branch 'master' into more-diffcalc-attributes
2018-06-15 18:29:20 +09:00
Dean Herbert
a6437c005c
Merge branch 'master' into diffcalc-rework
2018-06-15 18:02:18 +09:00
Dean Herbert
30f7837b03
Merge branch 'master' into fix-taiko-hitexplosions
2018-06-15 17:52:53 +09:00
smoogipoo
fd84afb89b
Fix non-inverted calculation
2018-06-14 19:38:48 +09:00
smoogipoo
a3bf16e481
Fix missing convert type
2018-06-14 19:37:32 +09:00
smoogipoo
b25a6a33cc
Fix 1K breaking hitcircle / slider conversions
2018-06-14 19:37:21 +09:00
smoogipoo
08b9cf75e9
Don't compute keymod difficulties for mania-specific beatmaps
...
These don't affect the number of keys in the beatmap at all for mania-specific beatmaps.
2018-06-14 17:10:08 +09:00
smoogipoo
22add2abc5
Move mania difficulty attributes to ManiaDifficultyCalculator
2018-06-14 16:25:44 +09:00
smoogipoo
8f7334874c
Fix up performance calculators
2018-06-14 16:04:48 +09:00
smoogipoo
966099fabc
Adjust ManiaDifficultyCalculator in-line with changes
2018-06-14 15:54:05 +09:00
Dean Herbert
ae136e89a4
Merge branch 'master' into ruleset-configs
2018-06-12 13:13:18 +09:00
smoogipoo
7651819fb0
Add same change to mania's hit explosions
2018-06-12 12:53:53 +09:00
Dan Balasescu
9994c69d58
Merge branch 'master' into fix-object-ordering
2018-06-11 17:53:33 +09:00
smoogipoo
3bad319dd2
Fix filename
2018-06-11 16:19:57 +09:00
smoogipoo
10d1dfa7cd
A bit of cleanup
2018-06-11 16:10:27 +09:00
smoogipoo
b9bf3a1829
Make mania scroll downwards by default
2018-06-11 15:56:30 +09:00
smoogipoo
162237dc46
Fix bar lines being offset
2018-06-11 15:43:15 +09:00
smoogipoo
f49b7d6e16
Add mania direction to settings
2018-06-11 14:36:19 +09:00
smoogipoo
93696fb5e5
Merge branch 'ruleset-configs' into mania-playfield-inversions
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-06-11 13:46:39 +09:00
smoogipoo
4fb6a8627e
Merge remote-tracking branch 'origin/master' into mania-playfield-inversions
2018-06-11 13:45:47 +09:00
smoogipoo
baaf431b9e
Make IScrollingInfo and store direction as bindable
2018-06-11 13:42:13 +09:00
smoogipoo
ca5103615d
DI the scrolling info rather than pass by ctor
2018-06-11 13:42:13 +09:00
smoogipoo
eca016ec6c
Move ruleset config managers to Ruleset
2018-06-11 13:17:08 +09:00
smoogipoo
22e8a0bb6e
Make ruleset config manager variants nullable
2018-06-11 13:13:36 +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
0fb4e6b41b
Fix hold note body not following the scroll direction
2018-06-08 18:16:55 +09:00
Dan Balasescu
4dfc328117
Remove unused array
2018-06-08 17:46:38 +09:00
smoogipoo
5c8bea82f8
Fix scroll direction not applying to nested hitobjects
2018-06-08 15:29:08 +09:00
smoogipoo
7deaffdb62
Fix hit explosions not following the scroll direction
2018-06-08 15:24:19 +09:00
smoogipoo
d73c2a1654
Fix various note elements not following the scroll direction
2018-06-08 15:24:19 +09:00
smoogipoo
80a577f182
Fix notes not scrolling correctly
2018-06-08 15:16:45 +09:00
smoogipoo
ee64760406
Add mania stage test case
2018-06-08 14:28:27 +09:00
smoogipoo
32037701bf
Make the column hitobject area follow the scroll direction
2018-06-07 21:40:12 +09:00
smoogipoo
0c35908802
Reorder fields
2018-06-07 21:19:31 +09:00
smoogipoo
207cdbdefe
Make the column key area follow the scroll direction
2018-06-07 21:13:57 +09:00
smoogipoo
11f067d7d6
Fix background input
2018-06-07 21:13:29 +09:00
smoogipoo
d49758d149
Make background handle its own lit state
2018-06-07 20:59:04 +09:00
smoogipoo
4af8baefc1
Make the column background follow the scroll direction
2018-06-07 20:49:31 +09:00
smoogipoo
9b10cc4e0c
Remove invertability of ManiaStage
2018-06-07 19:53:47 +09:00
smoogipoo
ce7a5e8914
Update visual style to match new notes
2018-06-07 19:19:32 +09:00
smoogipoo
55475d129f
Merge remote-tracking branch 'origin/master' into mania-mask-container
...
# Conflicts:
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
2018-06-07 19:19:20 +09:00
smoogipoo
24b314b51f
Fix hold note masks not working
2018-06-07 19:00:02 +09:00
smoogipoo
f299ae0fbd
Fix positioning
2018-06-07 18:59:52 +09:00
smoogipoo
cd532cde2d
Fix note masks not working
2018-06-07 18:28:49 +09:00