Unknown
5446c99f22
Merge branch 'master' into move-osu-settings
2019-01-25 10:57:04 +01:00
Dean Herbert
014ea972d9
Merge remote-tracking branch 'origin/master' into samah-ios
2019-01-25 11:51:44 +09: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
Unknown
481f33d17b
add setting to toggle the gameplay cursor trail
2019-01-23 14:27:39 +01:00
Unknown
33b46dc4e8
adjust year in license header to match CFS's expectations
2019-01-23 13:17:29 +01:00
Unknown
cf147083cd
move osu! settings into its ruleset
2019-01-23 13:17:29 +01:00
Unknown
4a9bcf4937
rename OsuConfigManager to GameConfigManager
...
also OsuSetting to GameSetting
2019-01-23 13:17:29 +01:00
Shane Woolcock
728c744e4d
Merge branch 'master' into samah-ios
2019-01-23 22:19:49 +10:30
Dean Herbert
8160162cde
Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics
2019-01-21 20:58:17 +09:00
smoogipoo
baae53d784
Merge branch 'diffcalc-fixes' into xexxar-angles
2019-01-20 22:19:50 +09:00
smoogipoo
3db23898df
Merge remote-tracking branch 'origin/master' into diffcalc-fixes
2019-01-20 13:27:42 +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
smoogipoo
a8e9adafdb
Fix final section not being saved
2019-01-17 12:51:49 +09:00
smoogipoo
e44bc57a3d
Fix minDistanceFromEnd using seconds rather than milliseconds
...
Velocity in stable is defined as distance per SECOND, while lazer defines it as distance per MILLISECOND.
2019-01-15 19:18:56 +09:00
smoogipoo
117c514479
Fix lazy slider calculation inaccuracy
...
What were we doing... On /b/1221540 stable's repeat points happen 90% through the length of each span! We should use lazer's more accurate calculations.
2019-01-15 19:07:25 +09: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
Dean Herbert
17bc933db2
Revert unnecessary changes
2019-01-10 19:01:41 +09:00
Dean Herbert
8cd058ed9a
Merge branch 'master' into moreOptionsFromSkin.ini
2019-01-10 18:38:20 +09:00
VINXIS
a09615144e
Kill White Space
2019-01-09 01:47:39 -07:00
VINXIS
dfe35f850c
Add rebalances to lazer performance calc
2019-01-09 01:42:48 -07:00
tangalbert919
5835ccc04c
Merge changes up to 2019.108.0
2019-01-08 17:53:57 -06:00
Shane Woolcock
a267a1a085
Merge branch 'master' into samah-ios
2019-01-08 17:09:26 +10:30
Dean Herbert
8edec10e5f
Merge branch 'master' into fix-replay-import-statistics
2019-01-08 11:26:12 +09:00
Dean Herbert
881b10a18f
Merge remote-tracking branch 'Dragicafit/moreOptionsFromSkin.ini' into moreOptionsFromSkin.ini
2019-01-08 11:01:04 +09:00
Dean Herbert
7eed3ffe75
Merge branch 'master' into moreOptionsFromSkin.ini
2019-01-08 10:02:06 +09:00
Dean Herbert
4cee21f356
Make skinning better
2019-01-07 20:12:39 +09:00
Dean Herbert
ca98caf84b
Merge pull request #4001 from UselessToucan/linq_temp
...
Use Find instead of FirstOrDefault
2019-01-07 18:50:59 +09:00
Dean Herbert
8914585021
Fix implementation of conditional cursor expanding
2019-01-07 18:28:26 +09:00
smoogipoo
b57c1af084
Only update stacking if there are hitobjects
2019-01-07 18:15:44 +09:00
smoogipoo
c6c22b352f
More verbose exceptions
2019-01-07 18:13:40 +09:00
Dean Herbert
13b077c83b
Merge remote-tracking branch 'upstream/master' into moreOptionsFromSkin.ini
2019-01-07 18:11:17 +09:00
smoogipoo
351ab6e9bd
Shortcut O(n^2) calculation
2019-01-07 18:01:44 +09:00
smoogipoo
1c5ab6a906
Implement stacking by index
2019-01-07 18:00:59 +09:00
Dean Herbert
e73845172c
Merge branch 'master' into fix-replay-import-statistics
2019-01-07 13:44:01 +09:00
tangalbert919
4da5ca02eb
Merge branch 'master' into android
2019-01-06 00:06:56 -06:00
tangalbert919
47268898be
Expose internals for Android test projects
2019-01-06 00:04:25 -06:00
Roman Kapustin
4b5fc85875
Use Find instead of FirstOrDefault
2019-01-05 19:35:33 +03:00
smoogipoo
722210d8bb
Merge remote-tracking branch 'origin/master' into xexxar-angles
2019-01-04 23:52:23 +09:00
smoogipoo
3fa5a33fb1
Inline const
2019-01-03 18:58:07 +09:00
smoogipoo
273b14b19c
Add a maximum length for slider ticks to be generated
2019-01-03 18:51:47 +09:00
smoogipoo
c56d8b75c1
Cache slider's endposition
2019-01-03 17:43:10 +09:00
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
5c1280c092
Fix missing hitwindows
2018-12-28 00:14:00 +09:00
Dean Herbert
fb10d15870
Populate statistics for all rulesets' scores
2018-12-27 21:52:09 +09:00
smoogipoo
77e6f4ab92
Rebalance
2018-12-27 18:41:42 +09:00
VINXIS
227c63dd1c
numtotalhits -> totalHits
2018-12-23 22:23:43 -07:00
VINXIS
8020ac26fb
MBMasher's FL change
2018-12-23 22:14:28 -07:00
smoogipoo
5f0ab0ed7f
Update with vinxis' latest code
2018-12-24 12:41:04 +09:00
smoogipoo
c43c15a557
Multiply previous travel distance by 8
2018-12-23 16:28:19 +09:00
smoogipoo
9fcc727e0d
Fix TravelDistance not being calculated
2018-12-23 16:26:23 +09:00
smoogipoo
d9b8df1595
Merge remote-tracking branch 'origin/master' into user-registration
2018-12-22 17:19:28 +09:00
smoogipoo
c848c83d0d
Refactor for readability + performance
2018-12-22 09:56:33 +09:00
Dean Herbert
f0dfc75bb2
Change osu! default keys back to Z/X
...
A/S was no better as far as keyboard layout agnostic-ness. And people are confused if we change the defaults. Need to take a step back and reassess.
2018-12-22 09:49:09 +09:00
smoogipoo
8546fedd4f
Implement vinxis/xexxar's adjustments
2018-12-22 09:31:30 +09:00
Poyo
08d7c2df70
Fix extra hard-rock flipping for sliders
2018-12-21 16:08:08 -08:00
smoogipoo
be476c58d7
Adjust with latest rebalancings
2018-12-21 22:52:27 +09:00
smoogipoo
5bd16f9a7c
Add scaling factor
2018-12-21 15:16:00 +09:00
smoogipoo
38441759a7
Use angle projections
2018-12-21 14:52:43 +09:00
smoogipoo
3acbf75beb
Adjust threshold
2018-12-21 13:48:10 +09:00
Dean Herbert
ef9d93ff6b
Remove mod multipliers
...
We decided that mods shouldn't be interacting with other mods. This can be added once we have the ability to have per-mod settings, as a difficulty setting local to blinds.
2018-12-20 19:46:39 +09:00
Dean Herbert
d3368df94d
Simplify changes to RulesetContainer
2018-12-20 19:35:32 +09:00
Dean Herbert
bb850da200
Remove skinnability for now
...
Not sure if we want this going forward.
2018-12-20 15:48:45 +09:00
smoogipoo
1c44e19066
Adjust scaling factor
2018-12-19 13:53:47 +09:00
smoogipoo
0fee76c95c
Fix merge error
2018-12-19 13:45:33 +09:00
smoogipoo
1972f1f279
Fix incorrect angle being used (at object vs into object)
2018-12-19 13:45:33 +09:00
smoogipoo
162774ce27
Make angles unsigned
2018-12-19 13:45:33 +09:00
smoogipoo
434d7d1809
Replace piecewise linear function + rebalance
2018-12-19 13:45:33 +09:00
smoogipoo
9ad7970167
Adjust computations to return sane values
2018-12-19 13:45:33 +09:00
smoogipoo
f4eabacd15
Implement angle assessment
2018-12-19 13:45:33 +09:00
smoogipoo
e7da5b0400
Add the [200 .. 300] bpm speed bonus
2018-12-19 13:45:33 +09:00
smoogipoo
00a4d60e89
Make sure distance is clamped to sane values
2018-12-19 13:45:33 +09:00
smoogipoo
47721f7a07
Adjust base value
2018-12-19 13:45:33 +09:00
smoogipoo
d74652a4f7
Replace piecewise linear function
2018-12-19 13:45:33 +09:00
ekrctb
6f8a2e6ff2
Use LifetimeManagementContainer
...
This is a significant performance boost for gameplay,
especially for long or stroyboard-heavy maps.
2018-12-13 15:23:06 +09:00
Dragicafit
c6c4bcccc3
relocate SkinnableCursor
2018-12-12 11:17:09 +01:00
Dragicafit
4b073aed83
remove spaces
2018-12-11 21:02:12 +01:00
Dragicafit
bfe3b03945
using SkinReloadableDrawable
2018-12-11 18:06:41 +01:00
Dragicafit
fb7d767909
adjust if position
2018-12-11 00:38:03 +01:00
Dragicafit
506f27a92e
cursorExpand is now a bool
2018-12-07 23:52:57 +01:00
Dragicafit
ec3c87dbea
Make Slider's CustumColors skinnable
2018-12-07 22:24:24 +01:00
Dragicafit
0816eaacb8
Make CursorExpand skinnable
2018-12-07 22:22:40 +01:00
Dean Herbert
4f34d42b33
Major code refactors
2018-12-07 21:11:35 +09:00
Dean Herbert
d379d02761
Remove unnecessary base class
2018-12-07 20:12:56 +09:00
WebFreak001
6eff7d9acc
Style fixes
2018-12-06 14:34:10 +01:00
WebFreak001
a14de5bd1b
Remove blinds random NPC
2018-12-06 12:52:39 +01:00
WebFreak001
46b98702e1
make target animation call more obvious
2018-12-06 12:48:11 +01:00
WebFreak001
3cb91979bd
Merge branch 'master' of https://github.com/ppy/osu into mod-fl2
2018-12-06 12:14:48 +01:00
Dean Herbert
1a974f64de
Initial design for user registration dialog
2018-12-05 12:57:26 +09: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
5254b07680
Merge remote-tracking branch 'upstream/master' into inter-column-movements
2018-11-30 11:57:53 +09:00
smoogipoo
aea84f737b
Fix taiko hitobjects potentially disappearing before being judged
2018-11-29 12:12:29 +09:00
smoogipoo
52bc47499f
Fix spinners not having proper lifetimes
2018-11-29 12:11:45 +09:00
smoogipoo
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
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
MaxOhn
8a3425948d
Merge branch 'master' of https://github.com/ppy/osu into deflate-branch
2018-11-26 03:45:35 +01:00
smoogipoo
f27bd3ef3e
OpenTK -> osuTK
2018-11-20 17:14:59 +09:00
smoogipoo
55edeb095d
SelectionBox -> SelectionHandler
2018-11-19 16:58:11 +09:00
Dean Herbert
dd21daa635
Merge branch 'master' into fix-mask-disposal
2018-11-18 21:18:00 +09:00
smoogipoo
4cbda97b1e
Move positional adjustment to SelectionBox
2018-11-16 17:12:24 +09:00
smoogipoo
df7515b66f
Pass all selected hitobjects to the selection blueprints
2018-11-15 21:01:09 +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
1501e05c04
Merge branch 'master' into fix-mask-disposal
2018-11-14 21:27:37 +09:00
Dean Herbert
84d16ee71b
Merge branch 'master' into placement-hiding
2018-11-14 16:59:41 +09:00
smoogipoo
050af88be9
Fix post-merge issues
2018-11-14 14:29:22 +09:00
smoogipoo
29422345f7
Merge remote-tracking branch 'origin/master' into fix-mask-disposal
...
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
# osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
# osu.Game.Rulesets.Osu/Objects/Slider.cs
2018-11-14 14:03:25 +09:00
smoogipoo
819cba31ce
Fix spinners not starting placement with the first click
2018-11-13 12:52:44 +09:00
smoogipoo
fbc20d2d4d
Hide placement when cursor is not in the playfield
2018-11-13 12:52:04 +09:00
smoogipoo
f3ba429701
Make sure control points is internally initialised
2018-11-12 17:14:06 +09:00
smoogipoo
d594ce3530
Revert "Make SliderPath.ControlPoints read-only"
...
This reverts commit 3b88d94793
2018-11-12 16:20:38 +09:00
smoogipoo
3aba462e52
Make Path.Distance a property again
2018-11-12 14:07:48 +09:00
smoogipoo
3b88d94793
Make SliderPath.ControlPoints read-only
2018-11-12 14:03:54 +09:00
smoogipoo
51e4feeda7
Adjust to new path structure
2018-11-12 13:55:14 +09:00
smoogipoo
54ab256c8e
Instantiate a new path rather than setting properties on it
...
# Conflicts:
# osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
# osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
# osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
# osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/SliderPath.cs
2018-11-12 13:50:19 +09:00
jorolf
023924396d
Move flashlight code from OsuModFlashlight to ModFlashlight and implement other modes and break time
2018-11-11 18:38:12 +01:00
smoogipoo
13279f707b
Cleanups
2018-11-09 14:19:50 +09:00
smoogipoo
cc8531790a
Use bindables for hitobject events
2018-11-09 13:58:46 +09:00
smoogipoo
c6350c6efd
Remove IHasEditablePosition
2018-11-08 13:03:11 +09:00
jorolf
5c09662c14
Allow flashlight size to be variant
2018-11-07 23:40:33 +01: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
jorolf
2cffce805a
add flashlight mod
2018-11-07 00:48:54 +01:00
smoogipoo
85f96ad62f
Fix a few missed renames
2018-11-06 18:07:53 +09:00
smoogipoo
bd775af274
PlacementMask -> PlacementBlueprint
2018-11-06 18:04:03 +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
63cbc8e0e8
Merge branch 'master' into slider-placement
2018-11-02 19:45:34 +09:00
Dean Herbert
ad49dca86e
Merge branch 'master' into spinner-placement-2
2018-11-02 19:32:52 +09:00
Dean Herbert
e6ee3dc73e
Use framework helper functions for path approximation
2018-11-02 19:26:29 +09:00
Dean Herbert
7f1ee3bcb4
Disallow spinner movement for now
2018-11-02 12:06:53 +09:00
smoogipoo
2ac4f2b6af
Lock spinners to centre of screen
2018-11-01 19:24:58 +09:00
smoogipoo
d78348f178
Reduce duplicate code
2018-11-01 19:23:37 +09:00
smoogipoo
1aae123ff5
Make approximators share an interface
2018-11-01 19:16:44 +09:00
Dean Herbert
1265d5ac0b
Merge branch 'master' into spinner-placement-2
2018-11-01 18:05:44 +09:00
Dean Herbert
c1304eca1b
Merge remote-tracking branch 'upstream/master' into slider-placement
2018-11-01 17:59:37 +09:00
Dean Herbert
5fd21d35dc
Merge branch 'master' into spinner-selection
2018-11-01 17:47:59 +09:00
Dean Herbert
bb2f8deb18
ControlPoint -> PathControlPoint
...
Also Curve -> Path.
2018-11-01 03:56:51 +09:00
smoogipoo
ffec532079
Fix segment control points not changing in unison
2018-10-31 19:02:47 +09:00
smoogipoo
d2fbf05137
Reduce size of control point
2018-10-31 18:01:53 +09:00
WebFreak001
cbd14d5b0e
Merge branch 'master' of https://github.com/ppy/osu into mod-fl2
2018-10-29 19:28:21 +01:00
smoogipoo
aec1d95f04
Implement spinner placement
2018-10-29 18:37:28 +09:00
smoogipoo
e04ad8357d
Make spinner piece respond to scale changes
2018-10-29 18:37:12 +09:00
smoogipoo
af1de01ed6
Add a spinner selection mask
2018-10-29 18:23:23 +09:00
smoogipoo
2ae7b42244
Fix control points disappearing if moved offscreen
2018-10-29 16:15:15 +09:00
smoogipoo
5998d6454b
Use ControlPointVisualiser instead of custom implementation
2018-10-29 15:56:17 +09:00
smoogipoo
08b16be3b8
Merge branch 'slider-controlpoint-masks' into slider-placement
...
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/Components/SliderBodyPiece.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
2018-10-29 15:55:38 +09:00
smoogipoo
c1fffde10d
Fix broken conditional
2018-10-29 15:52:28 +09:00
smoogipoo
acd703c27b
Make sliders respond to control point changes
2018-10-29 15:36:43 +09:00
smoogipoo
b0f5ace0e8
Implement slider control point visualisation
2018-10-29 15:29:34 +09:00
smoogipoo
660cd24750
Make sliders respond to scale changes
2018-10-29 15:26:28 +09:00
smoogipoo
a9f1484e8b
Fix some post-rebase issues
2018-10-29 15:26:28 +09:00
smoogipoo
4fa511043e
Use common body piece
2018-10-29 15:26:28 +09:00
smoogipoo
b28f44087d
Bring up to date with further placement changes
2018-10-29 15:26:28 +09:00
smoogipoo
6310c183fa
Modify slider position directly
2018-10-29 15:26:07 +09:00
smoogipoo
8fa783b4c5
Use begin/end placement methods
2018-10-29 15:26:07 +09:00
smoogipoo
a491fb42df
Set slider start time when head is placed
2018-10-29 15:26:07 +09:00
smoogipoo
9540e53e32
Initial controlpoint implementation
2018-10-29 15:26:07 +09:00
smoogipoo
2c4616dbb1
Adjust visual display of the placement curve
2018-10-29 15:26:07 +09:00
smoogipoo
402950b132
Implement path drawing
2018-10-29 15:26:07 +09:00
smoogipoo
bd915e8dca
Implement initial slider placement (linear)
2018-10-29 15:26:06 +09:00
smoogipoo
38ce8f8af1
Refactor SliderSelectionMask
2018-10-29 15:26:06 +09:00
smoogipoo
9b19050faf
Update with slider body changes
2018-10-29 15:25:20 +09:00
smoogipoo
619a0dfd59
Merge branch 'separate-slider-body' into editor-mask-placement
...
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs
2018-10-29 15:24:15 +09:00
smoogipoo
dd5a3ad59c
Fix SliderMask not working
2018-10-29 15:17:45 +09:00
smoogipoo
86e09a68f7
Separate slider body to bypass snaking logic
...
The snaking logic contains a lot of caching/optimisations and offsetting of the path which is tedious to re-compute when the path changes.
2018-10-29 15:15:29 +09:00
Dean Herbert
4f65d67e2b
Merge branch 'master' into skinnable-spritetext
2018-10-28 08:35:25 -07:00
WebFreak001
72e82b660d
Adjust blinds animations based on player feedback
2018-10-28 01:14:16 +02:00
WebFreak001
3b08ad0742
Merge branch 'master' of https://github.com/ppy/osu into mod-fl2
...
Changes how OsuModBlinds passes the playfield and how DrawableOsuBlinds
handles the restrictTo parameter.
2018-10-27 16:34:48 +02:00
smoogipoo
22c545ea8c
Make circle piece respond to hitobject scale
2018-10-26 15:26:19 +09:00
smoogipoo
4a507c66ee
Cleanup
2018-10-26 15:26:08 +09:00
smoogipoo
f674fcf2c8
Merge branch 'mask-separation' into editor-mask-placement
...
# Conflicts:
# osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
# osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
# osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
2018-10-26 14:05:30 +09:00
smoogipoo
ea3c960b5b
Mask -> Piece for components
2018-10-26 13:51:03 +09:00
smoogipoo
9656186b64
Make the hitobject masks move within their placement/selection
...
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/Components/HitCircleMask.cs
# osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/HitCircleSelectionMask.cs
# osu.Game.Rulesets.Osu/Edit/Masks/HitCirclePlacementMask.cs
# osu.Game/Rulesets/Edit/PlacementMask.cs
2018-10-26 13:45:31 +09:00
smoogipoo
4051864bb4
Re-namespace
2018-10-26 13:39:19 +09:00
smoogipoo
e1db2bbc25
Split visuals of HitCircleSelectionMask into HitCircleMask
2018-10-26 13:31:44 +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
e14719e440
Mask -> Piece for non-mask components
2018-10-25 18:28:10 +09:00
smoogipoo
d19f80835b
Adjust namespaces
2018-10-25 18:26:28 +09:00
smoogipoo
ea6db8b793
Make the hitobject masks move within their placement/selection
2018-10-25 18:16:25 +09:00
Dean Herbert
a9e5a4351e
Merge branch 'master' into fix-diffcalc-slider-distance
2018-10-21 20:33:50 +09:00
Dean Herbert
f19cc98e6a
Add slightly more explanation
2018-10-20 23:10:33 +09:00
Dean Herbert
0952c20c84
Adjust comment slightly
2018-10-20 23:06:48 +09:00
Dan Balasescu
d284f29637
Add comment describing the speed multiplier
2018-10-18 14:16:46 +09:00
Dean Herbert
cd718812b2
Merge branch 'master' into tighten-diffcalc-tolerances
2018-10-18 14:01:47 +09:00
smoogipoo
1cf6cd10bb
Fix slider travel distances sometimes not being considered
2018-10-18 11:29:50 +09:00
smoogipoo
f42f9cffe3
Make HitCirclePlacementMask directly modify hitcircle position
2018-10-17 18:16:34 +09:00
smoogipoo
d36ac59ca2
Reduce complexity of creating edit ruleset containers
2018-10-17 18:06:00 +09:00
smoogipoo
08e3fe1def
Add PlacementStarted event, rename placement methods
2018-10-17 14:37:45 +09:00
smoogipoo
e8ce5a7e6c
Fix crashes when manually creating sliders
2018-10-16 18:27:09 +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
smoogipoo
657bd5e371
Add some xmldocs
2018-10-15 12:32:59 +09:00
smoogipoo
2f943e77aa
Make Velocity and TickDistance private set
2018-10-15 12:31:52 +09:00
smoogipoo
26b91c96fb
Fix wrong number of ticks on some legacy beatmaps
2018-10-15 12:27:58 +09:00
MaxOhn
69775f62db
Merge remote-tracking branch 'upstream/master' into deflate-branch
2018-10-12 21:34:44 +02:00
MaxOhn
a876beeada
Variable adjustments
2018-10-12 21:34:24 +02:00
MaxOhn
19efa1cafb
Added TestCase, first RepeatPoint now deflates aswell
2018-10-12 20:55:42 +02:00
Dean Herbert
468f7fd1ea
Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework
2018-10-12 19:25:08 +09:00
Jan Jurzitza
460c943958
Merge branch 'master' into mod-fl2
2018-10-12 11:44:55 +02:00
Dean Herbert
8e66f9a85d
Merge branch 'master' into tighten-diffcalc-tolerances
2018-10-12 17:35:33 +09:00
smoogipoo
f585684038
Merge branch 'tighten-diffcalc-tolerances' into optimise-diffcalc
2018-10-12 16:51:37 +09:00
smoogipoo
72c8ae8705
Port the old stacking algorithm
2018-10-12 16:47:27 +09:00
Dean Herbert
d6043a6cd3
Merge remote-tracking branch 'upstream/master' into smooth-path
2018-10-12 16:03:36 +09:00
smoogipoo
e130204a3b
Merge remote-tracking branch 'origin/master' into optimise-diffcalc
2018-10-12 12:26:15 +09:00
smoogipoo
ec9f23ab73
Make IBeatmap.HitObjects an IReadOnlyList
2018-10-11 19:53:07 +09:00
smoogipoo
83fd251c7b
Pass sub-controlpoints as span slices
2018-10-11 17:44:25 +09:00
smoogipoo
7d20efed2c
Fix missing stack position
2018-10-11 13:53:29 +09:00
smoogipoo
f675c93935
Stably-sort hitobjects
2018-10-10 23:11:28 +09:00
Dean Herbert
aac95523ec
Merge branch 'master' into skinnable-spritetext
2018-10-10 20:26:27 +09:00
Dean Herbert
e0a8157d92
Merge branch 'master' into mod-fl2
2018-10-10 19:48:46 +09:00
Dean Herbert
1b6f37f3eb
Merge branch 'master' into wiggle-repeat-points
2018-10-10 19:42:10 +09:00
Dean Herbert
841b2e8692
Merge branch 'master' into consistent-terminology-format
2018-10-10 19:19:36 +09:00
smoogipoo
4e37b5c4a7
50ms cap shouldn't be included in the strain decay
2018-10-10 18:53:54 +09:00
smoogipoo
d8f77feddd
Fix using the wrong slider's travel distance
2018-10-10 18:52:57 +09:00
smoogipoo
03a9511399
Apparently stable does use stacking
2018-10-10 18:08:46 +09:00
smoogipoo
b56d09c83b
Set hitobject placement time manually
2018-10-10 15:32:59 +09:00
smoogipoo
d6784c818e
Fix jump/travel distances in some scenarios
2018-10-10 11:49:54 +09:00
MaxOhn
85190079e3
Merge branch 'master' of https://github.com/ppy/osu into deflate-branch
2018-10-10 01:38:41 +02:00
MaxOhn
951ac30de8
ArmedState now considered, SliderBody now deflates (TODO: handle slider's nested objects)
2018-10-10 01:36:37 +02:00
Dan Balasescu
a2838d32bf
Merge branch 'master' into skinnable-spritetext
2018-10-09 16:23:43 +09:00
smoogipoo
0a3be0d253
Adjust comments slightly
2018-10-09 12:03:47 +09:00
smoogipoo
9facf707be
Add diffcalc beatmap decoder
2018-10-09 11:49:24 +09:00
Fayne Aldan
edf87bfdd8
Merge branch 'master' into wiggle-repeat-points
2018-10-08 15:23:45 -06:00
smoogipoo
f8eaccddda
Stable doesn't use stacked positions
2018-10-08 18:37:49 +09:00
smoogipoo
0116db95d0
Fix progress calculation
2018-10-08 18:37:30 +09:00
smoogipoo
35f45e74dc
Calculate scaled positions prior to square-rooting
2018-10-08 17:39:10 +09:00
smoogipoo
1ad5090ad6
Separate travel distance from jump distance
2018-10-08 17:38:12 +09:00
smoogipoo
61e7ada977
Use ints + fix position calculation
2018-10-08 17:36:06 +09:00
smoogipoo
da97600076
Fix inaccurate section lengths for first hitobject
2018-10-08 16:46:58 +09:00
smoogipoo
42664f1c19
Make SliderBody use the new SmoothPath
2018-10-05 15:45:45 +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
d0007c047a
PlayfieldLayer -> PlayfieldAdjustmentContainer
2018-10-05 10:39:18 +09:00
smoogipoo
e931aa3d9e
Move positional modifications to HitCirclePlacementMask
2018-10-04 13:43:50 +09:00
smoogipoo
6a65802528
Fix hitcircle selections not responding to stacking changes
2018-10-04 12:19:11 +09:00
smoogipoo
1cd11a6e5b
Fix StackHeight changes not causing position updates
2018-10-03 17:06:18 +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
28b0ab6123
Split visuals of HitCircleSelectionMask into HitCircleMask
2018-10-03 14:35:26 +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
ekrctb
68980fc477
Adjust usage of Handle(Non)PositionalInput to follow framework update
2018-10-02 14:45:33 +09:00
ekrctb
50091252e2
Adapt signature change of event handlers
2018-10-02 12:02:55 +09:00
ekrctb
99fc04c8af
Change signature to new event handler
2018-10-02 12:02:47 +09:00
MaxOhn
0ae9c78c38
set drawableOnApplyCustomUpdateState private to make AppVeyor happy :)
2018-10-01 12:29:21 +02:00
MaxOhn
01a4c8d92b
Add deflate mod to OsuRuleset.cs
2018-10-01 12:11:19 +02:00
MaxOhn
0f0ee48bfd
Merge with ppy/osu master
2018-10-01 12:10:42 +02:00
MaxOhn
8b09935c37
previous commit only added scaling-up (oops), this one includes fading
2018-09-30 14:49:52 +02:00
MaxOhn
98042eb7d4
add the default fadeout-while-scaling-up to clicked objects
2018-09-30 14:46:36 +02:00
MaxOhn
cf8e6cf0ec
Merge remote-tracking branch 'origin/deflate-branch' into deflate-branch
2018-09-30 14:30:57 +02:00
MaxOhn
9a5127d506
fixed object scale upon hit
2018-09-30 14:29:55 +02:00
smoogipoo
0d8276c5f8
Implement skinnable sprite text
2018-09-27 17:40:28 +09:00
Dean Herbert
2ed7785cfc
Merge remote-tracking branch 'upstream/master' into update-framework
2018-09-26 19:50:48 +09:00
smoogipoo
a8f156584b
Update framework with positional/non-positional changes
2018-09-26 14:01:15 +09:00
Kyle Chang
2069467434
Use HitObject scale to determine judgement size
2018-09-24 21:18:55 -04:00
Kyle Chang
7a43677849
Make judgements scale with cs
2018-09-22 22:54:38 -04:00
smoogipoo
0bc2bcaf14
Remove GetAspectAdjustedSize() and PlayfieldArea
2018-09-21 15:14:49 +09:00
smoogipoo
26094ea325
Simplify + rename playfield layers in Osu/Catch
2018-09-21 15:01:58 +09:00
smoogipoo
a166d03ede
Remove duplicate implementation of the Osu playfield layer
2018-09-21 14:43:38 +09:00
smoogipoo
368ceec47c
Simplify creation of a playfield
2018-09-21 14:35:50 +09:00
smoogipoo
826dc6ceb7
Make Playfield not a ScalableContainer
2018-09-21 14:02:32 +09:00
ekrctb
a3e6973b41
Replace usage of now removed TriggerKeyPress and similar methods.
2018-09-19 11:36:55 +09:00
WebFreak001
8a01fc1bff
Make random in blinds mod the same every replay
2018-09-17 20:31:50 +02:00
WebFreak001
2de3b33780
Readonly fixes
2018-09-16 16:57:43 +02:00
WebFreak001
c9ea5ce817
Made blinds open during breaks and start
2018-09-16 16:51:18 +02:00
WebFreak001
633e8fafee
Style & const fix
2018-09-16 12:57:54 +02:00
WebFreak001
91b25870ef
Make fruit catcher enter and leave what's behind the blinds
2018-09-16 12:48:36 +02:00
Fayne Aldan
d855e5957a
Don't wiggle repeat points independently
2018-09-15 16:16:37 -06:00
WebFreak001
5f3c0549c9
Sprites in blinds mod & gameplay improvements
...
There are now skinnable actual blinds (shoji screen panels)
The black overlay is still behind them to avoid cheating with skins
The blinds don't open linearly anymore, they are health squared now
When easy mod is on, there is always a little gap open
2018-09-15 23:44:22 +02:00
WebFreak001
040a44d42c
Merge branch 'master' of github.com:WebFreak001/osu into mod-fl2
2018-09-15 20:12:06 +02:00
Joehu
f99eff1192
Use consistent terminology format
2018-09-15 07:30:11 -07:00
Paul Teng
1a8665864c
Remove redundant explicit array type info
2018-09-15 08:55:29 -04:00
Paul Teng
3e02a36938
Make Wiggle incompatible with Transform
2018-09-15 08:43:22 -04:00
Paul Teng
92c6b570ea
Make Transform incompatible with Wiggle
2018-09-15 08:42:04 -04:00
Dean Herbert
14c2aec53e
Merge remote-tracking branch 'upstream/master' into ArrangeMod
2018-09-14 18:48:32 +09:00
Dean Herbert
ec6185cd31
Reduce random allocations
2018-09-14 18:21:12 +09:00
Dean Herbert
ef31698f56
Further code tidying
2018-09-14 18:21:12 +09:00
Dean Herbert
00daaef27a
Use a slightly more suiting icon
2018-09-14 18:21:12 +09:00
Dean Herbert
9d94aa4e62
Fix formatting and constants
2018-09-14 18:21:12 +09:00
MaxOhn
b1f6828a1a
Added OsuModWiggle class and adjusted OsuRuleset.cs
2018-09-14 18:21:11 +09:00
Dean Herbert
da8b838438
Merge branch 'master' into ArrangeMod
2018-09-14 17:20:04 +09:00
Dean Herbert
02ef8ef418
Merge branch 'master' into deflate-branch
2018-09-14 17:19:32 +09:00
Dean Herbert
7cca990be4
Merge remote-tracking branch 'upstream/master' into framework-image-changes
2018-09-07 18:56:00 +09:00
Dean Herbert
a1780fddc9
DrawInfo -> DrawColourInfo
2018-09-06 18:02:04 +09:00
Dean Herbert
9f67119ba9
Fix potential nullref in IsPresent override
2018-09-06 18:01:32 +09:00
