Dean Herbert
662318a635
Merge remote-tracking branch 'upstream/master' into edit-fadeout-time
2019-11-12 09:53:16 +09:00
Huo Yaoyuan
ccc8aa6fa4
Apply brace style.
2019-11-11 20:13:13 +08:00
smoogipoo
3b13ad480a
Increase fade-out time of hitobjects in the editor
2019-11-11 13:06:41 +09:00
Dan Balasescu
1c1a49011b
Merge branch 'master' into infrastructure
2019-11-08 19:10:49 +09:00
smoogipoo
df31acb294
Fix slider nested hitobject samples not getting updated
2019-11-08 15:43:34 +09:00
smoogipoo
6fc1be64c2
Make hitobject samples a bindable list
2019-11-08 14:04:57 +09:00
smoogipoo
b1da81571f
Implement slider head control point snapping
2019-11-07 14:00:12 +09:00
Dean Herbert
0df0260dd9
Disallow selections to be moved outside of the playfield ( #6742 )
...
Disallow selections to be moved outside of the playfield
2019-11-06 18:29:06 +09:00
Dean Herbert
41a8954b81
Refactor follow points to support dynamic updates ( #6721 )
...
Refactor follow points to support dynamic updates
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-06 17:43:58 +09:00
smoogipoo
2c1bfd62ef
Disallow selections to be moved outside of the playfield
2019-11-06 17:28:04 +09:00
Dean Herbert
7b5b3ff15c
Remove unused returns
2019-11-06 16:36:12 +09:00
Dean Herbert
7ebd5daf7d
Merge remote-tracking branch 'upstream/master' into dynamic-followpoints
2019-11-06 16:33:47 +09:00
Dean Herbert
ee544e174a
Group -> Connection
2019-11-06 16:33:42 +09:00
smoogipoo
2588534eda
Skin entire selection, add xmldocs
2019-11-06 16:04:20 +09:00
smoogipoo
020b08b450
Initial implementation of limited distance snap
2019-11-06 15:27:48 +09:00
smoogipoo
68ca5cb26a
Adjust comments
2019-11-05 23:20:46 +09:00
smoogipoo
aff275ea21
Revert "Fix follow point lifetime not being updated correctly"
...
This reverts commit 1ef2b81041
2019-11-05 23:03:05 +09:00
smoogipoo
0a2af2b0fe
Apply transform override at a higher level
2019-11-05 23:02:39 +09:00
smoogipoo
d762ec959c
Schedule group refresh when loaded
2019-11-05 22:50:38 +09:00
smoogipoo
68a81e0eb0
Fix follow point transforms not working after rewind
2019-11-05 22:50:21 +09:00
smoogipoo
f2118b0eba
Add automated test cases
2019-11-05 19:31:58 +09:00
smoogipoo
6c58faf30c
Fix group ends potentially not being updated correctly
2019-11-05 19:31:48 +09:00
Dean Herbert
52dba69a64
Implement slider control point deletion ( #6679 )
...
Implement slider control point deletion
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-05 19:15:15 +09:00
smoogipoo
1ef2b81041
Fix follow point lifetime not being updated correctly
2019-11-05 17:33:02 +09:00
smoogipoo
3b6064336b
Implement group re-ordering based on start time
2019-11-05 17:33:02 +09:00
smoogipoo
a19e26f8aa
Improve performance of refreshes
2019-11-05 17:33:02 +09:00
smoogipoo
712253ff50
Replace follow point renderer with new implementation
2019-11-05 17:33:02 +09:00
smoogipoo
ddfcda9e02
Remove abstract ConnectionRenderer class
2019-11-05 17:33:02 +09:00
smoogipoo
d77882c21b
Fix slider selection input handled outside path
2019-11-05 17:31:52 +09:00
smoogipoo
7c20a589f2
Remove unused usings
2019-11-05 13:56:21 +09:00
smoogipoo
c8beb5296f
Use PlatformAction.Delete instead of Delete key
2019-11-05 13:26:44 +09:00
smoogipoo
08bd811326
Merge remote-tracking branch 'origin/master' into slider-controlpoint-deletion
...
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
2019-11-05 13:07:06 +09:00
Dean Herbert
66253a0bd4
Handle selection on mouse down instead of click
...
This is how other elements work, and feels better with drag preselection
2019-11-05 02:21:50 +09:00
Dean Herbert
bcf8a6d514
Fix slider creation regressing with path selection changes
2019-11-03 19:59:37 +09:00
Dean Herbert
f69a641d35
Merge branch 'master' into slider-controlpoint-deletion
2019-11-03 19:32:10 +09:00
Dean Herbert
1155aacd90
Update sliders when control points change ( #6680 )
...
Update sliders when control points change
2019-11-03 19:05:48 +09:00
Dean Herbert
f849926049
Merge branch 'master' into slider-controlpoint-deletion
2019-11-03 19:05:17 +09:00
Dean Herbert
4dbdfcdd3c
Change control to toggle rather than always select
2019-11-03 18:41:29 +09:00
Dean Herbert
6bc62385b6
Merge branch 'master' into slider-controlpoint-selection
2019-11-03 15:28:50 +09:00
Dean Herbert
e23ea94383
Add one more level of null check
2019-11-01 15:33:38 +09:00
Dean Herbert
05002ea3e8
Move Show/Hide code to PopIn/PopOut
2019-11-01 14:50:38 +09:00
smoogipoo
41ae66d517
Update slider when control points change
2019-10-31 18:24:38 +09:00
smoogipoo
18f374eec6
Deselect deleted control points
2019-10-31 17:58:33 +09:00
smoogipoo
78194cfa6e
Implement slider control point deletions
2019-10-31 17:54:09 +09:00
smoogipoo
43b2cbb865
Implement slider control point deletion
2019-10-31 17:39:57 +09:00
smoogipoo
20aeb7aaff
Implement multiple selection
2019-10-31 17:25:30 +09:00
smoogipoo
8d50b155e8
Make selection happen on click only
2019-10-31 17:13:10 +09:00
smoogipoo
cfdf710676
Add test
2019-10-31 16:51:58 +09:00
smoogipoo
e23a75c64a
Implement control point selection
2019-10-31 16:23:54 +09:00
smoogipoo
7a3ebcd0b1
Fix path changes not updating tail circle
2019-10-31 15:52:38 +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
Dean Herbert
e9cb3337b3
Fix 1x1 white pixel appearing in the centre of hitcircles on default skin
2019-10-29 22:31:27 +09:00
Dean Herbert
194e501f86
Merge branch 'master' into snapping-refactor
2019-10-26 14:20:08 +09:00
smoogipoo
da6ee05dd6
Fix not being able to drag non-snaked sliders
2019-10-25 18:37:44 +09:00
smoogipoo
607b4d874a
Refactor flow of snapping through HitObjectComposer
2019-10-25 16:40:30 +09:00
smoogipoo
a6458fdeab
Re-use slider type
2019-10-24 19:04:24 +09:00
smoogipoo
b7af4acdbf
Allow not having a composer
2019-10-24 19:04:00 +09:00
smoogipoo
0af5706db6
Snap path during control point movement
2019-10-24 19:02:59 +09:00
smoogipoo
f45f17339c
Implement slider path distance snapping
2019-10-24 18:17:30 +09:00
Dean Herbert
ef4dd3e028
Merge pull request #6580 from smoogipoo/remove-controlpoint-snap
...
Don't snap slider control point placement
2019-10-24 10:27:16 +09:00
smoogipoo
436941cda3
Add comment
2019-10-23 17:58:44 +09:00
Dean Herbert
02efd0e943
Merge pull request #6556 from smoogipoo/fix-slider-stack-change
...
Fix sliders not moving with stacking changes
2019-10-23 17:48:06 +09:00
smoogipoo
b903edca45
Don't snap slider control point placement
2019-10-23 16:03:16 +09:00
smoogipoo
54f23cbd0d
Update stacking test case values
2019-10-23 15:49:36 +09:00
Dean Herbert
e3fa5f1da3
Merge branch 'master' into beatsnap-grid-integration
2019-10-21 18:44:34 +09:00
smoogipoo
c34d3362df
Fix hit circles selection area being too large
2019-10-21 17:14:08 +09:00
Dean Herbert
b157aaead1
Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration
2019-10-21 17:09:43 +09:00
smoogipoo
38c2c328ff
Rename HitObject -> DrawableObject in selection blueprints
2019-10-21 17:04:56 +09:00
smoogipoo
5f8d46f666
Fix sliders not moving with stacking change
2019-10-21 16:24:06 +09:00
Dean Herbert
11e5e0decc
Merge branch 'master' into dho-apply
2019-10-21 16:05:11 +09:00
smoogipoo
96649e0a6a
Fix selection blueprints not respecting stacking
2019-10-21 15:03:49 +09:00
smoogipoo
6afc27b1bd
Merge remote-tracking branch 'origin/master' into dho-apply
2019-10-21 13:47:44 +09:00
Dan Balasescu
c1c803caf4
Merge branch 'master' into cursor-size-trail
2019-10-21 13:26:13 +09:00
HoLLy
68837d47df
Use local bindable instead of using BindValueChanged of external one
2019-10-19 12:15:31 +02:00
HoLLy
ca957f0994
Hide gameplay cursor when resume overlay is shown
2019-10-19 11:52:07 +02:00
Dean Herbert
d0eaf629af
Merge branch 'master' into dho-apply
2019-10-18 19:45:10 +09:00
smoogipoo
5dd5a070e0
Show placement grid from hitobjects at the current time
2019-10-18 19:03:19 +09:00
Dean Herbert
99ea45da41
Merge pull request #6474 from smoogipoo/osu-beatsnapping-grid
...
Implement osu!'s beat snapping grid
2019-10-18 16:27:03 +09:00
smoogipoo
f1d7e7e7f6
Merge branch 'placement-blueprint-starttime' into beatsnap-grid-integration
2019-10-18 13:49:09 +09:00
smoogipoo
c4704f6a29
Add beat snap grid to the composer
2019-10-18 12:47:52 +09:00
smoogipoo
5ccdd2b203
Mask the osu! beatsnap grid
2019-10-18 12:38:43 +09:00
smoogipoo
c5ee533524
Merge branch 'dho-apply' into beatsnap-grid-integration
2019-10-18 12:38:29 +09:00
Dean Herbert
f3ed71d336
Move scoring distance constant to a central/shared location
2019-10-17 16:36:47 +09:00
Dean Herbert
f92331531c
Rename grid to DistanceSnap to be more in line with its purpose
2019-10-17 15:32:02 +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
3a1acf7b0a
Fix slider approach circle proxies
2019-10-17 12:50:26 +09:00
smoogipoo
8d7453c251
Rework construction of nested hitobjects
2019-10-16 22:10:50 +09:00
smoogipoo
4ac2e1c58e
Move load() to below ctor()
2019-10-16 21:41:18 +09:00
smoogipoo
79b2c7b480
Make BeginPlacement() set the hitobject start time
2019-10-16 20:04:15 +09:00
HoLLy
13e1199229
Move click to resume cursor scaling responsibility to container
2019-10-15 22:44:04 +02:00
HoLLy
8c671d7fde
Rename cursorScale and calculatedCursorScale
2019-10-15 20:12:08 +02:00
Dean Herbert
ae2fe62fd9
Use BindValueChanged
2019-10-14 17:13:36 +09:00
Dean Herbert
64a6ca28e6
Merge branch 'master' into cursor-size-trail
2019-10-14 16:35:37 +09:00
iiSaLMaN
a75ae14cb2
Use foreach loop to avoid too long lines
2019-10-14 00:40:36 +03:00
iiSaLMaN
68e370ce7c
Set spinner tick start time to allow result reverting
2019-10-14 00:39:20 +03:00
iiSaLMaN
5d2fe87339
Use empty hit windows for spinner ticks
2019-10-14 00:38:45 +03:00
iiSaLMaN
c8593f1215
Merge remote-tracking branch 'upstream/master' into add-spinner-bonus-score
2019-10-13 23:04:05 +03:00
Dean Herbert
f3c38ae089
Merge branch 'master' into osu-beatsnapping-grid
2019-10-13 18:38:57 +09:00
HoLLy-HaCKeR
7931510d7b
Ensure OsuResumeCursor can change scale when it is being shown
2019-10-12 11:59:22 +02:00
HoLLy-HaCKeR
fdc17d2adb
Scale OsuResumeCursor with gameplay cursor
2019-10-12 11:51:14 +02:00
HoLLy-HaCKeR
13924174c4
Fix PopIn and PopOut resetting cursor scale
2019-10-12 10:04:14 +02: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
smoogipoo
45835f97a1
Split out grids into separate files
2019-10-11 18:41:17 +09:00
smoogipoo
2e2768870f
Merge remote-tracking branch 'origin/master' into editor-selection-movement-params
2019-10-10 16:38:41 +09:00
Dean Herbert
51bf600ea7
Use empty hitwindows instead of null
2019-10-09 19:08:31 +09:00
HoLLy-HaCKeR
1c22fb485f
Scale cursortrail along with cursor
2019-10-08 19:40:46 +02:00
HoLLy-HaCKeR
b6047e4613
Move OsuCursor resize logic to OsuCursorContainer
2019-10-08 19:39:54 +02: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
b09d9b7e1f
Add todo in slider tail to avoid confusion
2019-10-08 17:56:56 +09:00
smoogipoo
a59e07948c
Merge remote-tracking branch 'GSculerlor/master' into rework-selection-updates
2019-10-07 18:50:07 +09:00
smoogipoo
e265beb289
Fix merge error
2019-10-07 18:49:59 +09:00
Dean Herbert
0ebc5d0ffb
Fix cursor trail appearing regardless of the setting in replays ( #6288 )
...
Fix cursor trail appearing regardless of the setting in replays
2019-10-07 12:32:22 +08:00
Dean Herbert
179cde917b
Merge branch 'master' into rework-selection-updates
2019-10-06 15:00:56 +08:00
smoogipoo
652acac87f
Move placement movement event to BlueprintContainer
2019-10-03 16:14:42 +09:00
smoogipoo
c5540048ab
Fix tail circle not moving with slider position changes
2019-10-01 19:39:06 +09:00
smoogipoo
90ad1c5166
Add more tests for slider selection blueprint
2019-10-01 19:33:27 +09:00
smoogipoo
ba5c9547e1
Add more tests for hitcircle selection blueprint
2019-10-01 19:33:15 +09:00
smoogipoo
bddaead72e
Make hitobject pieces able to update dynamically
2019-09-27 18:45:22 +09:00
smoogipoo
4fc37d1137
Remove SliderPiece + HitObjectPiece
2019-09-27 18:01:55 +09:00
smoogipoo
f64fe22f36
Remove bindables from osu! selection blueprints
2019-09-27 18:00:24 +09:00
iiSaLMaN
67bed57cbd
Bind value changed event of cursor trail appearence outside BDL
...
https://github.com/ppy/osu/pull/6270#discussion_r328899728
2019-09-27 08:46:49 +03:00
smoogipoo
45f2bcc440
Fix combo bindings not being bound to nested hitobjects
2019-09-26 17:39:19 +09:00
smoogipoo
3155a90501
Use bindables for displayed circle piece numbers
2019-09-26 16:58:20 +09:00
smoogipoo
bbf0544a8d
Add bindables for IHasComboInformation properties
2019-09-26 16:55:08 +09:00
Salman Ahmed
0b2a025cb9
Merge branch 'master' into decrease-disc-rotation-on-rewind
2019-09-26 04:52:11 +03:00
smoogipoo
74b2e99247
Fix invalid cursor trail parts being drawn
2019-09-25 16:25:15 +09:00
Dan Balasescu
13f922211f
Merge branch 'master' into decrease-disc-rotation-on-rewind
2019-09-24 12:58:27 +09:00
iiSaLMaN
57310c86c7
Remove unnecessary fields
2019-09-20 15:09:51 +03:00
iiSaLMaN
093ed8421e
Remove "allow slider ball tinting" ruleset setting
2019-09-20 15:08:00 +03:00
iiSaLMaN
1b45014ff6
Use logical-OR
2019-09-20 00:25:16 +03:00
iiSaLMaN
f6291170b1
Implement tinting slider ball with combo colour
2019-09-20 00:11:37 +03:00
iiSaLMaN
8fcfd82316
Add AllowSliderBallTint to skin configuration
2019-09-20 00:10:55 +03:00
iiSaLMaN
033ed2e1f5
Add setting to always tint slider ball
2019-09-20 00:10:28 +03:00
Dean Herbert
0640b2eb35
Fix judgement sizes not matching legacy skins ( #6145 )
...
Fix judgement sizes not matching legacy skins
2019-09-19 18:49:35 +09:00
Dean Herbert
3abcd898a6
Add hit lighting ( #6144 )
...
Add hit lighting
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-19 18:49:22 +09:00
Dan Balasescu
027d6194f2
Merge branch 'master' into add-hit-lighting
2019-09-19 18:07:29 +09:00
smoogipoo
db24cfbead
Merge remote-tracking branch 'origin/master' into auto-restart-mod-perfect
...
# Conflicts:
# osu.Game/Screens/Play/Player.cs
2019-09-19 17:57:04 +09:00
Dean Herbert
2cd7c769e1
Merge remote-tracking branch 'upstream/master' into fix-judgement-size
2019-09-19 16:32:37 +09:00
Dean Herbert
1150e9fdfb
Bring other mods up-to-date
2019-09-19 01:45:42 +09:00
Dean Herbert
5901a915e7
Always update drawable hitobject state on skin change
2019-09-18 20:19:57 +09:00
Dean Herbert
aa1a625643
Add back incompatibility marker
2019-09-18 20:07:44 +09:00
Dean Herbert
cfdac956c2
Fix issues with colour and skin application
2019-09-18 20:04:49 +09:00
Dean Herbert
9c9cb8e217
Merge remote-tracking branch 'upstream/master' into traceable-mod
2019-09-18 19:36:07 +09:00
Dean Herbert
26eca5b1f4
Fix judgement sizes not matching skins stable
2019-09-18 02:56:03 +09:00
Dean Herbert
ba76f09c99
Add initial implementation of hit lighting
...
Requires a supporting skin, like osu!classic for now.
2019-09-18 02:49:54 +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
smoogipoo
5c2c055614
Set lifetime on initial state update
2019-09-13 18:49:21 +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
Dean Herbert
96efc91b51
Fix follow points not displaying on some skins
2019-09-11 14:57:42 +09:00
Dean Herbert
aea1ab7fee
Merge branch 'master' into skinned-cursortrail-2
2019-09-11 14:11:52 +09:00
Dean Herbert
6760e239a1
Fix osu! hitcircle font textures being incorrectly sized
2019-09-11 13:39:21 +09:00
smoogipoo
6c00d3936a
Reduce interval between cursor trail parts
2019-09-11 13:28:46 +09:00
smoogipoo
70d39e9be4
Always apply stable's magic ratio
2019-09-11 13:28:36 +09:00
Dean Herbert
36d3736e1d
Fix hitcircle font prefix not being read for legacy skins
2019-09-10 18:06:24 +09:00
iiSaLMaN
aec04dcf90
Use Clock.ElapsedFrameTime instead
2019-09-09 15:36:20 +03:00
iiSaLMaN
c4aee11fe0
Revert renaming changes
2019-09-09 15:35:18 +03:00
smoogipoo
e3b972187e
Fix incorrect cursor trail size + scale
2019-09-09 19:30:36 +09:00
smoogipoo
a200485fbd
Implement disjoint (old style) cursor trails
2019-09-09 19:23:02 +09:00
smoogipoo
292d50aacf
Don't confine the cursor trail
2019-09-09 19:22:49 +09:00
smoogipoo
3b1b7910bb
Add toggle for cursor trail interpolation
2019-09-09 19:22:27 +09:00
smoogipoo
1d225ba81e
Add FadeDuration to control cursor trail fade
2019-09-09 19:02:10 +09:00
smoogipoo
195f101799
Move complex property below ctor
2019-09-09 19:00:42 +09:00
smoogipoo
55afcc1e04
Add skin component for the legacy cursor trail
2019-09-09 17:53:51 +09:00
smoogipoo
7adfae3784
Reorder CursorTrail members
2019-09-09 12:35:15 +09:00
iiSaLMaN
9defcb0e99
Remove redundant using directive
2019-09-08 21:37:50 +03:00
iiSaLMaN
f5f2713a17
Account angle change negatively on rewind
2019-09-08 16:14:14 +03:00
iiSaLMaN
3d8b27abfa
RotationAbsolute -> BidirectionalRotation
2019-09-08 16:13:36 +03:00
iiSaLMaN
33f4a6897c
Assign to the text property directly
2019-09-07 18:01:15 +03:00
iiSaLMaN
6b7cb46dda
Add null hit windows
2019-09-07 17:27:02 +03:00
iiSaLMaN
87d10c6a32
Merge remote-tracking branch 'upstream/master' into add-spinner-bonus-score
2019-09-07 14:50:23 +03:00
Dean Herbert
6ce36bd39e
Merge branch 'master' into stop-counting-to-score-after-fail
2019-09-06 16:12:53 +09:00
Dean Herbert
a50284a5eb
Merge pull request #6019 from peppy/hit-window-refactor
...
Refactor HitWindows for legibility
2019-09-06 16:10:04 +09:00
Dean Herbert
b3f61abd49
Use float types for cursor sizes ( #5958 )
...
Use float types for cursor sizes
2019-09-06 15:45:44 +09:00
Dean Herbert
6cdc87bd29
Fix allowed results omissions
2019-09-06 15:37:20 +09:00
Dean Herbert
f925e781a9
Refactor HitWindows for legibility
2019-09-06 15:24:14 +09:00
smoogipoo
bda21998c4
Add helper method to make direct casts be used
2019-09-05 16:48:56 +09:00
Dean Herbert
2983918f71
Merge remote-tracking branch 'upstream/master' into skin-configuration-refactor
2019-09-04 13:40:41 +09:00
Dean Herbert
f8c1afa539
Fix two more cases of judgements appearing on hit error display when they shouldn't
2019-09-03 20:17:39 +09:00
Dean Herbert
858828d4ef
Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Game.Resources-2019.903.1' into fix-catch-catcher
2019-09-03 18:31:19 +09:00
Dean Herbert
bebc3309ce
Refactor skin configuration to be infinitely extensible
2019-09-03 17:57:34 +09:00
Dan Balasescu
3854bc68e0
Merge branch 'master' into fix-ring-glow-lookup
2019-09-03 16:14:07 +09:00
Dean Herbert
d1cdf49dd5
Revert SkinnableSprite lookups to old behaviour
2019-09-03 14:21:54 +09:00
Dean Herbert
05ed9d3802
Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements
2019-09-03 13:07:58 +09:00
Dean Herbert
4f3511e8e9
Fix ring glow lookup being incorrect
2019-09-03 12:32:10 +09:00
Dean Herbert
0261456d5a
Merge branch 'master' into play-to-gameplay
2019-09-03 11:42:15 +09:00
iiSaLMaN
cb55159b28
Use float types for cursor sizes
2019-09-03 01:28:51 +03:00
Dean Herbert
09097f7680
Merge branch 'master' into iskincomponent
2019-09-02 22:38:57 +09:00
Dean Herbert
0ee0184e01
Remove unnecessary usings
2019-09-02 19:13:06 +09:00
Dean Herbert
1e7528c2b3
Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements
2019-09-02 19:13:00 +09:00
smoogipoo
90671e0617
Attempt to not break per-hitobject hitwindows
2019-09-02 18:58:13 +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
0c73c5acf3
Expose full hitobject rather than hit windows
2019-09-02 17:14:40 +09:00
smoogipoo
f2bdf94a1d
Add HitWindows to JudgementResult to indicate timing errors
2019-09-02 16:28:14 +09:00
smoogipoo
f3656475de
Return null hitwindows for non-time-based objects
2019-09-02 16:10:30 +09:00
Dean Herbert
f9fcf1562f
Merge remote-tracking branch 'upstream/master' into iskincomponent
2019-09-02 14:21:02 +09:00
Dean Herbert
2bd074883a
Fix OsuLegacySkin fallback logic being incorrect
...
Fixes skin fonts not being applied. This is a temporary fix as configuration retrieval from skins will see a complete rewrite over the coming days.
2019-09-02 12:36:08 +09:00
Dean Herbert
ee4869647f
Merge pull request #5910 from peppy/fix-legacy-skin-text
...
Fix legacy skin text reading from the wrong source
2019-08-31 21:51:26 +09:00
Dean Herbert
3da5eb6c8b
Add source lookups for safety
2019-08-31 16:56:32 +09:00
Dean Herbert
2988624f1f
Add fallback for safety
2019-08-31 16:52:41 +09:00
Dean Herbert
f89981e1a3
Fix legacy skin text reading from the wrong source
...
Regressed with ruleset legacy skin implementation.
2019-08-31 12:23:15 +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
Dean Herbert
8f9fe99237
Move SliderFollowCircle implementation
2019-08-30 14:40:36 +09:00
Dean Herbert
22e3ad8b9c
Add skinning support to cursor test
2019-08-30 14:09:17 +09:00
Dean Herbert
c389a5c798
Move remaining osu-specific implementations to OsuLegacySkin
2019-08-30 13:42:29 +09:00
Dean Herbert
84e4748268
Remove duplicate getAnimation function and improve namespacing
2019-08-30 12:59:58 +09:00
Dean Herbert
dc1046bf0c
Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin
2019-08-30 12:53:05 +09:00
smoogipoo
6641811125
Add EditorWorkingBeatmap for reuse of the playable beatmap
2019-08-29 19:41:12 +09:00
smoogipoo
6ab2b20c70
Add an interface for working beatmaps
2019-08-29 19:38:44 +09:00
Dean Herbert
9a98f39f06
Share logic with other rulesets (and make default)
2019-08-28 18:12:47 +09:00
Dean Herbert
9752dbf950
Fix osu! approach circles fading in too late
2019-08-28 18:10:58 +09:00
Dean Herbert
7ea55a5cdd
Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin
2019-08-28 16:36:20 +09:00
Dean Herbert
7aeeb65ae7
Tidy up Player's container loading logic
...
Fixes drawable ruleset being loaded before skin sources are finished, by loading them as a separate operation (to avoid children being loaded first).
2019-08-27 18:27:21 +09:00
Dean Herbert
db987c6077
Move SliderBall colour logic to OsuLegacySkinProvider
2019-08-26 14:45:29 +09:00
Dean Herbert
7b82121b85
Add comment about lazy usage
2019-08-26 13:03:00 +09:00
Dean Herbert
5e362d10b1
Add ruleset-specific legacy skin providers
...
This moves implementation of osu! skinnables to OsuLegacySkin.
2019-08-26 12:21:49 +09:00
Salman Ahmed
f4f15cc803
Merge branch 'master' into add-spinner-bonus-score
2019-08-22 09:48:09 +03:00
Dean Herbert
745bd58f37
Merge remote-tracking branch 'upstream/master' into update-framework-blending
2019-08-21 15:10:08 +09:00
Dean Herbert
48716f8f2b
Update framework
2019-08-21 13:29:50 +09:00
iiSaLMaN
e4179fe440
Show bonus text if contains bonus points (1,000)
2019-08-20 21:51:32 +03:00
iiSaLMaN
07795c9922
Add logic to gain bonus score from spinner ticks
2019-08-20 21:50:49 +03:00
iiSaLMaN
bb4178fa03
Add drawable spinner ticks implementation
2019-08-20 21:17:27 +03:00
iiSaLMaN
ee1c3d42d8
Add spinner tick judgement
2019-08-20 21:11:26 +03:00
Dean Herbert
62a24bf16d
Fix a couple of rotation-related issues
2019-08-20 13:18:34 +09:00
Dean Herbert
d0766fa1cd
Add slider ball animation support
2019-08-19 19:55:47 +09:00
Dean Herbert
707911acac
Tidy up code formatting / variable naming
2019-08-12 15:05:27 +09:00
Dean Herbert
45b4fc9201
Add xmldoc
2019-08-12 15:00:32 +09:00
Dean Herbert
31fe121fe9
Merge remote-tracking branch 'RedMindZ/master' into autopilot
2019-08-12 14:40:52 +09:00
Dean Herbert
f7f3f4fb4a
Merge branch 'master' into master
2019-08-12 13:37:09 +09:00
Dean Herbert
59a5df8bca
Update framework (with cached changes) ( #5666 )
...
Update framework (with cached changes)
2019-08-09 23:47:40 +09:00
Dean Herbert
6264a6a1c9
Adjust slider snaking and hitcircle fading to match stable
2019-08-09 20:18:02 +09:00
Dean Herbert
90b1fe81f3
Update cached usage in line with framework changes
2019-08-09 19:12:29 +09:00
smoogipoo
d47a8c0826
Remove unused combo result count statistic
2019-08-09 14:04:51 +09:00
Dean Herbert
73cd7b0cc2
Fix incorrect implementation of old stacking algorithm ( #5632 )
...
Fix incorrect implementation of old stacking algorithm
2019-08-07 21:53:33 +09:00
smoogipoo
bc3a340286
Fix incorrect path position being used for old stacking algorithm
2019-08-07 19:35:39 +09:00
smoogipoo
42de5934f6
Fix incorrect hitobject indices
2019-08-07 19:33:35 +09:00
Dean Herbert
38df49995c
Fix cursor scale not matching osu-stable
2019-08-07 18:35:07 +09:00
smoogipoo
f2b940f930
Add tests
2019-08-01 17:31:37 +09:00
smoogipoo
8a64ab0384
Remove generics from IApplicableToBeatmap
2019-08-01 12:39:32 +09:00
Dean Herbert
f9c95e21be
Merge remote-tracking branch 'upstream/master' into legacy-cursor-middle
2019-07-30 23:44:13 +09:00
Dean Herbert
8e9f8bb565
Merge branch 'master' into slider-ball-scaling
2019-07-30 23:19:28 +09:00
Dean Herbert
fb1f77bd04
Move implementation and colour logic to legacy implementation
2019-07-30 23:06:18 +09:00
Dean Herbert
e6bd02d276
Simplify namespace definition
2019-07-30 22:41:20 +09:00
Dean Herbert
307a6c1095
Remove DefaultCirclePiece
2019-07-30 22:38:29 +09:00
Dean Herbert
1fbaa97218
Merge branch 'master' into add-legacy-hit-animations
2019-07-30 22:20:29 +09:00
smoogipoo
1222536f7a
Rename resource string
2019-07-30 19:10:21 +09:00
Dan Balasescu
114c2006c1
Merge branch 'master' into legacy-cursor-middle
2019-07-30 19:06:28 +09:00
Dean Herbert
4ee20bae30
Merge branch 'master' into slider-ball-scaling
2019-07-30 07:54:40 +09:00
smoogipoo
c01461b951
Recalculate path size when path radius changes
2019-07-29 19:12:41 +09:00
Dean Herbert
766cf9295d
Merge remote-tracking branch 'upstream/master' into add-legacy-hit-animations
2019-07-29 19:03:36 +09:00
Dan Balasescu
ef229c0f80
Merge branch 'master' into legacy-cursor-middle
2019-07-29 18:52:11 +09:00
Dean Herbert
a4f30daf13
Merge pull request #5462 from peppy/skin-metric-parity
...
Bring playfield ratio in line with stable
2019-07-29 18:49:21 +09:00
Dean Herbert
8487ecf98a
Fix slider ticks being scaled incorrectly ( #5460 )
...
Fix slider ticks being scaled incorrectly
2019-07-29 18:48:27 +09:00
Dean Herbert
afd6024ba2
Fix repeat points being scaled incorrectly ( #5459 )
...
Fix repeat points being scaled incorrectly
2019-07-29 18:48:04 +09:00
Dean Herbert
f2e90fdb26
Scale follow points by circle size ( #5458 )
...
Scale follow points by circle size
2019-07-29 18:47:48 +09:00
Dean Herbert
53a91b46e0
Fix approach circles not scaling to circle correctly when a ski… ( #5455 )
...
Fix approach circles not scaling to circle correctly when a skin is applied
2019-07-29 18:47:36 +09:00
Dan Balasescu
396892da1a
Describe how the ratio came to be
2019-07-29 18:43:05 +09:00
Dan Balasescu
b74c11ad22
Merge branch 'master' into explode-circle-earlier
2019-07-29 18:05:47 +09:00
Dan Balasescu
7779302e82
Merge branch 'master' into skin-scaling-modes
2019-07-29 17:47:07 +09:00
Dean Herbert
3e74079d02
Add incompatibility with scale tween mods
2019-07-29 01:15:57 +09:00
Dean Herbert
07f905d21c
Tidy up code and fix explode animations not playing correctly
2019-07-29 01:00:41 +09:00
Dean Herbert
4204ba6014
Merge branch 'master' into spin-in
2019-07-28 22:51:09 +09:00
smoogipoo
d4f85af19c
Force snaking slider paths to retain a fixed size
2019-07-25 18:22:56 +09:00
Dean Herbert
6cc6aff66e
Fix slider ball sizing when legacy skin falls back to default
2019-07-25 16:30:50 +09:00
Dean Herbert
c1b0130857
Add legacy cursormiddle support
2019-07-25 16:23:04 +09:00
Dean Herbert
859233526d
Move circle visual implementation to new class
...
Allows for more precise skin control over state animations.
2019-07-25 16:09:20 +09:00
Dean Herbert
3ca41b9c0a
Merge branch 'skin-metric-parity' into add-legacy-hit-animations
2019-07-25 16:07:23 +09:00
Dean Herbert
73b5a39c6e
Merge branch 'explode-circle-earlier' into add-legacy-hit-animations
2019-07-25 16:06:04 +09:00
Dean Herbert
5e8867066c
Correctly handling bindable scale changes
2019-07-25 14:43:44 +09:00
Dean Herbert
46e17646ac
Align slider path size with legacy skins
2019-07-25 14:22:26 +09:00
Dean Herbert
9473f6d3e3
Fix incorrect ratios being applied to playfield / skin elements
...
This now matches osu-stable 1:1.
2019-07-25 14:22:22 +09:00
Dean Herbert
5e153a3dd3
Use scale correctly in DrawableSliderTick
2019-07-25 13:50:20 +09:00
Dean Herbert
2cb3619b54
Allow scaling outside of defined area
...
Caters to skins which show borders outside of the circle for repeats.
2019-07-25 13:27:41 +09:00
Dean Herbert
5a9d18380c
Use scale correctly in DrawableRepeatPoint
2019-07-25 13:25:31 +09:00
Dean Herbert
28653e871c
Give repeat points a size specification
2019-07-25 13:24:35 +09:00
Dean Herbert
2b184658d1
Adjust follow points by circle size
2019-07-25 13:06:25 +09:00
Dean Herbert
c989185774
Fix incorrect approach circle scaling
2019-07-25 11:27:24 +09:00
Dean Herbert
c16af88299
Start exploding animation earlier (don't wait for flash)
2019-07-25 11:11:26 +09:00
Dean Herbert
efad9b3150
Merge branch 'master' into skin-scaling-modes
2019-07-24 18:37:31 +09:00
Dan Balasescu
9b526ef61e
Merge branch 'master' into move-state-logic
2019-07-23 20:37:57 +09:00
Dean Herbert
91e21688d8
Make AccentColour a bindable ( #5420 )
...
Make AccentColour a bindable
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-07-23 20:37:47 +09:00
smoogipoo
b1a9ce85e7
Fix ticks being given an extra colour
2019-07-23 20:30:47 +09:00
Dean Herbert
f8feac792c
Return TouchDevice in GetAllMods response
2019-07-23 13:14:28 +09:00
Dean Herbert
d5ee4cbc9c
Move TouchDevice mod to new "system" category
2019-07-23 13:14:28 +09:00
Dean Herbert
c3b81bef4a
Flip default to the preferred method going forward
2019-07-22 15:55:38 +09:00
Dean Herbert
be170b4124
Naming and documentation improvements
2019-07-22 15:50:02 +09:00
Dean Herbert
6d889c8a37
Revert unintended change
2019-07-22 15:43:27 +09:00
Dean Herbert
91f86adb66
Move DrawableHitObject state management to base class
2019-07-22 15:07:12 +09:00
Dean Herbert
8327452fe1
Make AccentColour a bindable
2019-07-22 14:48:59 +09:00
Dean Herbert
74c961bcff
Add more flexible skin element confine modes
2019-07-22 14:42:56 +09:00
Dean Herbert
e50b70d615
Centralise osu! circle radius specification
2019-07-22 14:40:02 +09:00
Dean Herbert
3e57fcf5c5
Merge remote-tracking branch 'upstream/master' into cleanup-slider-bodies
2019-07-17 22:11:01 +09:00
smoogipoo
9f6ff63634
Fix judgement disposals causing huge LOH pressure
2019-07-17 19:25:41 +09:00
Dean Herbert
1a19cf0739
Fix 0-length sliders not getting correct lengths ( #5033 )
...
Fix 0-length sliders not getting correct lengths
2019-07-17 18:01:57 +09:00
smoogipoo
a9286fee07
Recycle slider paths when the parenting slider dies
2019-07-17 16:20:27 +09:00
smoogipoo
62b867018d
Refactor a bit
2019-07-16 17:51:17 +09:00
smoogipoo
b0415dc30a
Remove cursortrail drawnode allocs
2019-07-16 17:33:14 +09:00
smoogipoo
ed203cb0ff
Delay intial hitobject updates
2019-07-16 13:45:59 +09:00
MaxOhn
581ffb7fb0
Adjusted slider border colour
2019-07-08 13:52:15 +02:00
MaxOhn
130c50eee4
Merge branch 'master' of https://www.github.com/ppy/osu into traceable-mod
2019-07-08 13:43:16 +02:00
Salman Ahmed
dfabed3d85
Merge branch 'master' into applicable-to-hud
2019-07-06 16:30:02 +03:00
smoogipoo
5862eb172a
Merge remote-tracking branch 'origin/master' into fix-zero-length-sliders
...
# Conflicts:
# osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
2019-07-05 15:48:04 +09:30
smoogipoo
3d12c709a5
Add test case
2019-07-05 15:40:47 +09:30
MaxOhn
5b4640d3ea
Traceable no longer inherits from OsuModHidden and is no longer multi mod
2019-07-03 21:40:14 +02:00
MaxOhn
b63a7593eb
Merged with upstream master
2019-07-03 18:56:11 +02:00
MaxOhn
664257fbbe
Sliders no longer modified by HD but have transparent body now
2019-07-03 18:42:02 +02:00
Dean Herbert
cc9a28afa8
Add shared base class for both mod imlpementations
2019-07-03 19:42:16 +09:00
Dean Herbert
e95586857e
Merge remote-tracking branch 'upstream/master' into deflate-branch
2019-07-03 19:26:21 +09:00
Dean Herbert
9bed0094de
Merge remote-tracking branch 'upstream/master' into android
2019-07-02 19:40:50 +09:00
Salman Ahmed
744e651a37
Merge branch 'master' into applicable-to-hud
2019-07-02 05:24:56 +03:00
MaxOhn
4145173ac9
Combined hidden with traceable as multi mod
2019-07-02 04:04:07 +02:00
Salman Ahmed
a8e8650ddd
Move blocking fail logic into a base class
2019-07-02 01:47:39 +03:00
MaxOhn
d753f446e4
Updated license header
2019-07-01 20:20:25 +02:00
MaxOhn
5496b8bc58
Rewrote traceable mod to inherit from hidden
2019-07-01 20:11:50 +02:00
MaxOhn
845bf21f7f
Resolved merge with upstream master
2019-07-01 20:00:52 +02:00
MaxOhn
48a828b746
Removed redundant imports and fixed indentation
2019-07-01 17:49:37 +02:00
MaxOhnh
02b9e89f43
Removed old unnecessary change, updated license header and apply deflating onto first object regardless
2019-07-01 14:46:17 +02:00
MaxOhnh
cd5e1bc4b1
Replace deflate progress with modified copy-paste of grow mod
2019-07-01 13:55:09 +02:00
MaxOhnh
93b780c9a8
Resolved merge
2019-07-01 13:53:40 +02:00
Salman Ahmed
d11b799571
Add explaining comment
2019-06-30 18:28:20 +03:00
Salman Ahmed
f42ded3437
Move to DrawableOsuHitObject
2019-06-30 18:27:47 +03:00
Dean Herbert
60ea3d4e1a
Fix skinning support for combobreak
2019-06-30 21:58:30 +09:00
iiSaLMaN
9c9334a8ba
Hide health bar in relax mod
2019-06-29 04:26:24 +03:00
Albert Tang
3cf2ffc1a7
Merge branch 'master' into android
2019-06-25 17:54:23 -05:00
smoogipoo
0d98d637b6
Fix cursor expansion state potentially being incorrect
2019-06-25 15:47:54 +09:00
Dean Herbert
aca9289d89
Use SkinnableSprite for approach circle
2019-06-24 15:17:56 +09:00
Shane Woolcock
17d103181c
Merge branch 'master' into android
2019-06-18 20:05:14 +09:30
Dean Herbert
b29b1bf254
Merge branch 'master' into mod-grow-improvement
2019-06-12 13:18:02 +09:00
Dean Herbert
00ee45fe46
Merge remote-tracking branch 'origin/update-visibility-container' into update-framework
2019-06-11 19:36:13 +09:00
Dean Herbert
d2e42b38fc
Merge remote-tracking branch 'smoogipoo/cursortrail-vertexbatch' into update-framework
2019-06-11 19:25:25 +09:00
Dean Herbert
5c2c4f0ada
Merge pull request #4878 from HoLLy-HaCKeR/expose-skills
...
Expose skills in DifficultyAttributes
2019-06-11 18:47:56 +09:00
Arphox
07e17518e9
Fix all "Maintainability" CodeFactor issues
2019-06-11 10:28:16 +02:00
Dean Herbert
609a82bc94
Update VisibilityContainer usage in line with framework
2019-06-11 15:13:58 +09:00
smoogipoo
2b768bef96
Make CursorTrail use VertexBatch
2019-06-10 20:29:01 +09:00
Albert Tang
62639d347f
Merge branch 'master' into android
2019-06-09 21:03:48 -05:00
Dean Herbert
8cdcf251b5
Make local bindable private
2019-06-09 16:30:04 +09:00
Ganendra Afrasya
afc3a08953
Use existing setting instead
...
Now it read IncreaseFirstObjectVisibility bindable instead
2019-06-09 13:11:40 +07:00
Ganendra Afrasya
8ac64b5c16
Make first object not applying custom state
2019-06-08 01:46:05 +07:00
Dean Herbert
ff6943e170
Merge branch 'master' into fix-cursor
2019-06-07 10:43:21 +09:00
David Zhao
e2118299e9
update comment
2019-06-07 10:36:36 +09:00
David Zhao
ac9a3e54a6
Fix cursor issue with stopped gameplay clock
2019-06-06 18:12:59 +09:00
smoogipoo
c7d0fcd42a
Update drawnodes
2019-06-06 16:49:35 +09:00
smoogipoo
ae438213a5
Remove secondary buffered container from slider body
2019-06-06 16:32:43 +09:00
HoLLy
7e9f5a0939
Add Skills to DifficultyAttributes
2019-05-29 11:22:51 +02:00
tangalbert919
07e550a950
Merge branch 'master' into android
2019-05-28 09:08:44 -05:00
Tav TaOr
7575af6f42
Merged master into autopilot
2019-05-17 14:15:30 +03:00
Tav TaOr
7c50bdd173
Removed redundant parentheses.
2019-05-15 23:48:37 +03:00
smoogipoo
cbf662eb56
Remove redundant else statement
2019-05-15 10:55:02 +09:00
Alten
37ec722a1d
Shorten code
2019-05-14 16:18:46 -04:00
Alten
ad5ad8ccb5
Fix hard crash
2019-05-13 23:29:24 -04:00
Dean Herbert
be6da833f8
Move constant local (and break line)
2019-05-14 11:11:57 +09:00
HoLLy
1809c996bb
Use Interpolation.ValueAt instead of manually interpolating FL position.
2019-05-13 12:09:19 +02:00
HoLLy
f7806bc205
Add smoothing to flashlight movement
2019-05-13 01:33:41 +02:00
Dean Herbert
daa2786dbd
Use a constant for the default value
2019-05-12 23:08:42 +09:00
Dean Herbert
487a56549e
Fix CI issues
2019-05-12 22:53:12 +09:00
Dean Herbert
ce0e4c506e
Merge branch 'master' into dev
2019-05-12 21:45:52 +09:00
Tav TaOr
2051be7453
Minor changes to pass the AppVeyor test
2019-05-12 15:00:59 +03:00
Tav TaOr
d229fed128
Implemented Autopilot
2019-05-12 14:00:43 +03:00
Tav TaOr
9170da46ff
Merge remote-tracking branch 'upstream/master'
2019-05-12 13:08:07 +03:00
Dean Herbert
b8446fb67f
Fix fallbacks for SliderTrackOverride and SliderBall too
2019-05-12 18:51:31 +09:00
Dean Herbert
cbf126db25
Merge branch 'master' into fix-slider-border-color
2019-05-12 17:25:49 +09:00
Tav TaOr
bda0b35d84
Slight formating change.
2019-05-10 19:46:13 +03:00
Tav TaOr
023a5c6e4f
Add the ability to ignore the user's mouse movement.
2019-05-10 19:12:32 +03:00
tangalbert919
6fd1eb5e08
Merge remote-tracking branch 'upstream/master' into android
2019-05-08 08:15:03 -05:00
smoogipoo
117f8bdd01
Merge remote-tracking branch 'Joehuu/master' into flashlight-dim
2019-05-08 13:25:01 +09: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
David Zhao
732b0b22a3
Merge remote-tracking branch 'upstream/master' into flashlight-dim
2019-05-07 12:04:58 +09:00
Joehu
8ef6a745f7
Fix slider border not reverting to default color
2019-05-05 22:43:03 -07:00
iiSaLMaN
3b03ca802a
Merge branch 'master' into sh-xh-grading-2
2019-04-30 18:55:35 +03:00
Dean Herbert
db75516e79
Merge branch 'master' into fix-lead-in-issues
2019-04-27 21:01:21 +09:00
Dean Herbert
27c1c368ac
Remove unused using
2019-04-27 20:42:07 +09:00
Dean Herbert
d40177f97c
Merge branch 'master' into drawnode-composability
2019-04-27 18:41:19 +09:00
KingLuigi4932
4e0f21102b
Merge branch 'sh-xh-grading-2' of https://github.com/iiSaLMaN/osu into sh-xh-grading-2
2019-04-25 14:04:12 +03:00
KingLuigi4932
c6b3197dd0
Add AdjustRank and use it in Hidden Mod
2019-04-25 13:56:57 +03:00
David Zhao
90d5c64cf3
Remove unused usings
2019-04-24 18:47:00 +09:00
David Zhao
8f101e4f60
Remove unnecessary multi-slider tracking logic
2019-04-24 18:25:38 +09:00
Dean Herbert
4f31eee5ad
Merge branch 'master' into flashlight-dim
2019-04-24 17:01:11 +09:00
Dean Herbert
67382724f6
Reword and reoganise logic
2019-04-24 16:58:13 +09:00
Dean Herbert
e69963e60e
Ensure there is enough time before the first object in osu! (roughly following osu-stable specs)
2019-04-24 15:28:14 +09:00
David Zhao
9890884726
Remove fade in, update comment
2019-04-23 14:23:09 +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
144e6012dc
Implement hp increase for osu!
2019-04-22 17:24:42 +09:00
David Zhao
3c252d79ea
Use var, rework dim application logic
2019-04-22 15:59:47 +09:00
iiSaLMaN
59da78b0d4
nothing.
2019-04-20 06:44:59 +03:00
iiSaLMaN
8e485f3283
Fix issue
2019-04-20 06:41:09 +03:00
Dean Herbert
879f6152b0
Merge remote-tracking branch 'upstream/master' into flashlight-dim
2019-04-17 22:17:10 +08:00
David Zhao
d9ed68b189
Add short fade to flashlight dimming
2019-04-12 15:33:31 +09:00
David Zhao
846a4835ca
Invert flashlight dim
2019-04-12 11:23:40 +09:00
David Zhao
664a4ba540
Implement flashlight dimming on slider slide
2019-04-12 10:47:22 +09:00
smoogipoo
0222424aef
Make mods IReadOnlyList<Mod> gamewide
...
Prevents potential multiple evaluations of enumerable.
2019-04-10 17:20:36 +09:00
smoogipoo
0603ed9ab7
Fix post-merge errors
2019-04-09 16:27:10 +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
9802d8ab11
Rename setting
2019-04-04 17:18:53 +09:00
Dean Herbert
d54750aa37
Remove incorrect class
2019-04-04 17:10:29 +09:00
Dean Herbert
109f577b59
Merge remote-tracking branch 'upstream/master' into toggle-cursor-trail
2019-04-04 17:09:38 +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
smoogipoo
d8af5e1c5a
Update in-line with drawnode changes
2019-04-02 11:56:22 +09:00
Dean Herbert
184403c7e1
Merge branch 'master' into resume-cursor-2
2019-04-01 14:24:00 +09:00
Dean Herbert
2060bad3bc
Try applying minimal inspection fixes for latest Rider EAP
2019-04-01 13:28:14 +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
7d6a08d6da
Fix a few new inspections in latest Rider EAP
2019-04-01 11:39:02 +09:00
Dean Herbert
79b5c2482b
Merge pull request #4562 from peppy/fix-editor-blueprints
...
Fix editor blueprints being misplaced
2019-04-01 11:17:17 +09:00
Dean Herbert
d53e6f7e0e
Remove unused references
2019-03-31 01:34:50 +09:00
Dean Herbert
5d91c3bcfc
Fix replay handler nullref crashes
2019-03-31 01:33:56 +09:00
Dean Herbert
42eaabe24c
Fix editor blueprints being misplaced
...
Regressed with PlayfieldAdjustmentContainer changes.
2019-03-31 01:29:37 +09:00
Dean Herbert
6949c233bf
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
2019-03-29 15:02:12 +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
fed58fba3a
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
2019-03-29 12:14:28 +09:00
Dean Herbert
1e369628a5
Fix incorrect type specification
2019-03-29 11:38:45 +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
Dan Balasescu
772f0cac8a
Merge branch 'master' into gameplay-cursor-last-state
2019-03-29 11:01:13 +09:00
Dean Herbert
8642886ffa
Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust
2019-03-29 00:39:51 +09:00
Dean Herbert
d770dac3bc
Fix interpolation nullrefs
2019-03-29 00:35:26 +09:00
Dean Herbert
6e41506766
Merge remote-tracking branch 'upstream/master' into framed-replay-handler-fixes
2019-03-29 00:32:03 +09:00
Dean Herbert
176b4ecc38
Merge branch 'master' into sprite-icon-compatibility
2019-03-28 23:47:44 +09:00
Dean Herbert
70f99400ad
Fix many behavioural issues and add tests
2019-03-28 19:28:13 +09:00
Dean Herbert
148e26a6d4
Fix FramedReplayInputHandler starting at frame 0 when it shouldn't
2019-03-28 12:42:57 +09:00
Dean Herbert
8f5e769425
Fix slider ball not always receiving position in time
2019-03-28 12:42:28 +09:00
Dean Herbert
de80fc0eac
Update icon usage to match framework changes
2019-03-27 19:29:27 +09:00
Dean Herbert
7cfc2f7dcb
Add back adjustment container
2019-03-26 17:11:14 +09:00
Dean Herbert
dde7788c44
Merge branch 'universal-playfield-adjust' into resume-cursor-2
2019-03-26 13:58:48 +09:00
Dean Herbert
2951d3e0e4
Apply CI fixes
2019-03-26 13:50:30 +09:00
Dean Herbert
fbc97edc55
Add base cursor class to retrieve true visibility state
2019-03-26 13:41:30 +09:00
Dean Herbert
ed3746e166
Make PlayfieldAdjustmentContainer universal
2019-03-26 13:32:44 +09:00
Dean Herbert
82140c38fc
Apply CI fixes
2019-03-25 22:00:33 +09:00
Dean Herbert
a23dfb58ad
Add base cursor class to retrieve true visibility state
2019-03-25 20:31:55 +09:00
Dean Herbert
9588944048
Fix multiple cursors appearing
2019-03-25 20:31:55 +09:00
Dean Herbert
c79d187a89
Add final osu! resume screen implementation
2019-03-25 20:31:55 +09:00
Dean Herbert
38e481686f
Make PlayfieldAdjustmentContainer universal
2019-03-25 20:31:55 +09:00
Dean Herbert
650a5c993a
Add test
2019-03-25 20:31:55 +09:00
Dean Herbert
8ad4009c33
osu! resume overlay
2019-03-25 20:31:55 +09:00
Dean Herbert
bc16a82494
Move osu! cursor to its own class
2019-03-25 14:19:38 +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
7254b765b0
Fix gameplay cursor showing in editor
2019-03-20 19:26:24 +09: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
Santeri Nogelainen
b624ecabde
Max = 8
2019-03-16 12:47:37 +02:00
Santeri Nogelainen
cbb7498a42
Border size to float, add min and max size, other small changes
2019-03-16 12:41:03 +02:00
Santeri Nogelainen
92595e43f6
slider border thickness
2019-03-14 21:57:39 +02:00
Jamie Taylor
5cc670cd19
Prevent ApplyTransformsAt from propogating to SliderBall children
2019-03-14 19:17:28 +09:00
Dean Herbert
1617e2a729
Merge branch 'master' into mania-judgemetns
2019-03-13 18:17:42 +09:00
David Zhao
527b77b07d
Make all inheritors of drawablejudgement use new method
2019-03-12 19:52:44 +09:00
Dean Herbert
63fea65c0c
Clarify repeat index
2019-03-11 14:53:21 +09:00
Dean Herbert
489153579a
Add xmldoc and clarify struct variables
2019-03-11 14:36:29 +09:00
Albert Tang
7f30fce3fe
Merge branch 'master' into android
2019-03-08 10:39:24 -06:00
Dean Herbert
c6194d5487
Merge branch 'master' into extract-slider-tick-creation
2019-03-08 20:40:03 +09:00
Dean Herbert
48e54c84c1
Merge branch 'master' into mod-wind
2019-03-08 20:23:02 +09:00
Dean Herbert
28a1baa07e
Merge branch 'extract-slider-tick-creation' of https://github.com/peppy/osu into extract-slider-tick-creation
2019-03-08 20:13:58 +09:00
Dean Herbert
93a999396e
LegacyFinalTick -> LegacyLastTick to match existing variable
2019-03-08 20:13:11 +09:00
Dean Herbert
165a353a83
Add extensive commenting about LegacyLastTick usage
2019-03-08 20:12:48 +09:00
Dean Herbert
f59b9e933e
Merge branch 'master' into extract-slider-tick-creation
2019-03-08 20:00:12 +09:00
Dean Herbert
355705f0a5
Fix legacy tick handling
2019-03-08 19:57:30 +09:00
Dean Herbert
973f29b765
Apply review
2019-03-08 15:14:57 +09:00
Dean Herbert
2c98ba1c0c
Split out consumption and creation into two separate code paths
2019-03-08 14:59:45 +09:00
Dean Herbert
3ccc76e18f
Merge remote-tracking branch 'upstream/master' into cursor-in-playfield
2019-03-08 14:50:46 +09:00
Dean Herbert
551380dd42
Extract slider tick creation so it can be shared with osu!catch
2019-03-08 14:46:26 +09:00
Dan Balasescu
d1c18c52ab
Merge branch 'master' into fix-cursor-in-scale-container
2019-03-08 12:43:57 +09:00
Dan Balasescu
101009c92e
Merge branch 'master' into fix-autoplay-tests
2019-03-08 12:14:40 +09:00
Dean Herbert
340997f505
Rename remaining usage of PathWidth naming convention
2019-03-07 20:21:59 +09:00
Dean Herbert
5ab9f45a8f
Merge branch 'drawnode-changes'
2019-03-07 20:10:42 +09:00
Dean Herbert
1f44dde96b
Fix autoplay tests not working
2019-03-07 18:34:56 +09:00
smoogipoo
04d756524d
Adjust with shader changes
2019-03-07 18:30:18 +09:00
smoogipoo
e430b8a640
Merge remote-tracking branch 'nekodex/master' into drawnode-changes
2019-03-07 18:15:12 +09:00
David Zhao
b3e046c4d1
Rename PathWidth to PathRadius
2019-03-07 17:39:19 +09:00
Dean Herbert
62716851a1
Revert some unnecessary changes
2019-03-06 17:41:54 +09:00
Dean Herbert
7aa30ca3f6
Change method of cursor creation
2019-03-06 17:41:54 +09:00
Dean Herbert
18826b3a59
Adjust cursor scale for its new surroundings
2019-03-06 17:41:54 +09:00
Dean Herbert
acf518c208
Move cursor inside playfield
2019-03-06 17:41:54 +09:00
Dean Herbert
5411c63093
Fix menu cursor not displaying outside of gameplay scaling area
2019-03-06 17:14:08 +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
Dean Herbert
fc0b297232
Fix menu cursor not displaying outside of gameplay scaling area
2019-03-05 18:06:24 +09:00
smoogipoo
0322bd8812
Make config nullable, removing testcase code
2019-03-05 14:40:27 +09:00
smoogipoo
78596dfe80
Merge remote-tracking branch 'origin/master' into move-osu-settings
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
# osu.Game.Rulesets.Osu.Tests/TestCaseSlider.cs
2019-03-05 13:25:03 +09:00
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
bf8360636a
Adjust drawnodes to use the new shared data structure
2019-03-01 17:25:15 +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
smoogipoo
c13a5184f3
Add more explanation
2019-02-27 16:35:11 +09:00
smoogipoo
32bf940aa5
Adjust comment for readability
2019-02-27 15:43:20 +09:00
smoogipoo
a07d797d75
Merge remote-tracking branch 'Joehuu/master' into use-lifetime-optimization
2019-02-27 12:08:43 +09:00
smoogipoo
d06f38b3f3
Cleanup
2019-02-25 15:57:07 +09:00
Dean Herbert
7f5780c615
Simplify SliderBall and fix incorrect key up handling
...
Was not processing timeToAcceptAnyKeyAfter when cursor was outside valid tracking area, but should have been.
2019-02-23 14:38:53 +09:00
Dan Balasescu
5fdd7f9bff
Fix typo in comment
...
Co-Authored-By: peppy <pe@ppy.sh>
2019-02-23 14:14:34 +09:00
Dean Herbert
3a57ff40cd
Add comment about other cases, rewind handling
2019-02-23 14:14:34 +09:00
Dean Herbert
8e52e2330e
Add extensive commenting
2019-02-23 14:14:34 +09:00
Dean Herbert
1c75ee4e82
Add fixes
2019-02-23 14:14:34 +09:00
Dean Herbert
7566fcf536
Slider press fix
2019-02-23 14:14:34 +09:00
Dean Herbert
367bc53a06
Revert some more instances of 'e' variable names
2019-02-22 20:15:25 +09:00
smoogipoo
d61dfe888e
Fix venera fonts not being correctly specified
2019-02-22 19:42:09 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage
2019-02-22 18:09:23 +09:00
Dean Herbert
3fe4b8fd1c
Update variable names
...
Also cleans up some weird code
2019-02-22 17:51:39 +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
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
Dean Herbert
c96a2ac853
Fix non-conforming filename
2019-02-20 21:08:52 +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
smoogipoo
0380293098
Add beatmap argument
2019-02-19 17:58:02 +09:00
smoogipoo
21f9c813b2
Fix mods not being populated
2019-02-19 17:46:18 +09:00
smoogipoo
8459cf6ed0
Missed argument
2019-02-19 17:43:12 +09:00
smoogipoo
f19a52b960
Rename argument
2019-02-19 17:40:35 +09:00
smoogipoo
37f9ac6eca
Populate mods too
2019-02-19 17:39:30 +09:00
smoogipoo
847f7d8658
Adjust with PopulateAttributes() removal
2019-02-19 17:38:33 +09:00
Dean Herbert
9a60f3b0de
Merge branch 'master' into new-diffcalc-osu
2019-02-19 15:56:12 +09:00
Dean Herbert
151388dfad
Merge branch 'master' into diffcalc-merging-2
2019-02-19 15:42:15 +09:00
smoogipoo
ade5763160
Fix post-merge errors
2019-02-19 14:34:02 +09:00
smoogipoo
93b7b51d0a
timeRate -> clockRate
2019-02-19 14:29:23 +09:00
Dan Balasescu
b1bdab8c36
Merge branch 'master' into mod-grow
2019-02-18 16:47:16 +09:00
Dan Balasescu
c9c8cccd68
Merge branch 'master' into use-lifetime-optimization
2019-02-18 15:22:34 +09:00
smoogipoo
659ec267b6
Fix spinners increasing strain
2019-02-18 14:58:33 +09:00
smoogipoo
c930cc5fb5
Fix incorrect OsuDifficultyHitObject instantiation
2019-02-18 14:58:13 +09:00
smoogipoo
fd70269021
Implement new difficulty calculator for Rulesets.Osu
2019-02-18 14:58:03 +09:00
smoogipoo
a8faa942a6
Implement new difficulty calculator structure
2019-02-18 14:49:43 +09:00
Dean Herbert
42dc7644f2
Merge branch 'master' into diffcalc-testcases
2019-02-17 21:06:42 +09:00
smoogipoo
8becd7ff92
Add a slider-spinner test case
2019-02-15 12:49:48 +09:00
Dean Herbert
810175235d
Fix incorrect application of scaling in some cases
...
Isolates different usages of hitcircle scale so they can't ever cause regressions.
2019-02-14 18:47:05 +09:00
Dean Herbert
1b61ec4ef4
First pass clean-up
2019-02-14 18:05:23 +09:00
Dean Herbert
d366370113
Merge branch 'master' into mod-grow
2019-02-14 17:44:45 +09:00
smoogipoo
f50a0be29d
Add osu! difficulty calculator test
2019-02-14 16:22:14 +09:00
tangalbert919
7349a6c527
Merge remote-tracking branch 'upstream/master' into android
2019-02-12 20:41:54 -06:00
Dean Herbert
e2e615cc5c
Merge branch 'master' into leased-bindables-dont-work
2019-02-11 16:30:12 +09:00
Dean Herbert
5b1f111922
Rollback other fallthrough regressions
2019-02-05 18:14:43 +09:00
Dean Herbert
2f8f4fac64
Fix combo colour fallbacks when skin is not providing any
2019-02-05 17:54:14 +09:00
Dan Balasescu
40e4a3f725
Merge branch 'master' into fix-replay-import-statistics
2019-02-04 15:32:29 +09:00
Kyle Chang
cf91b882c8
Fix slider tail evaluation in osu difficulty calculator
...
The slider tail circle was already included as a nested hit object and is judged before the end of the slider's actual duration, so using the slider end time leads to an inaccurate travel distance and end position.
2019-02-03 23:49:05 -05:00
Dean Herbert
2d7c23dd9f
Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics
2019-02-04 12:15:53 +09:00
Dean Herbert
ca5c8d37d1
Use leased bindables
2019-02-01 16:44:06 +09:00
tangalbert919
52110e5dc0
Merge remote-tracking branch 'upstream/master' into android
2019-01-31 11:19:03 -06:00
Dean Herbert
cea82708ee
Merge branch 'master' into use-lifetime-optimization
2019-01-31 20:20:40 +09:00
LeNitrous
7e2f4af00d
remove whitespaces
2019-01-31 17:58:09 +08:00
LeNitrous
a8d30f6aee
remove unused using
2019-01-31 17:05:50 +08:00
LeNitrous
902be0d059
add grow mod
2019-01-31 17:03:43 +08:00
smoogipoo
581544e1d6
Fix TD mod not being ranked
2019-01-31 11:59:36 +09:00
smoogipoo
e9ddf232f0
Add touchdevice mod to performance calculation
2019-01-31 11:51:40 +09:00
tangalbert919
80006109a2
Merge remote-tracking branch 'upstream/master' into android
2019-01-29 18:13:43 -06:00
Dean Herbert
8d4232af45
Formatting and minor optimisations
2019-01-29 16:35:20 +09:00
Dean Herbert
18512458e8
Merge branch 'master' into xexxar-angles
2019-01-29 15:59:04 +09:00
ekrctb
504e79b968
Merge branch 'master' into use-lifetime-optimization
2019-01-29 12:15:02 +09:00
Nitrous
ea4e79751e
Merge branch 'master' into mod-wind
2019-01-28 17:48:57 +08:00
Dean Herbert
354a99f5e1
Merge branch 'master' into samah-ios
2019-01-28 15:34:46 +09:00
ProgrammaticNajel
2058604ef3
Typo fix
2019-01-26 23:10:13 +08:00
ProgrammaticNajel
0797f5d644
Update SliderPlacementBlueprint.cs
2019-01-26 22:56:31 +08:00
ProgrammaticNajel
e71b13683a
Add null check
2019-01-26 22:55:33 +08:00
LeNitrous
03e57d0423
fix codefactor warnings and derive ModWindUp and ModWindDown to ModTimeRamp
2019-01-26 20:15:19 +08:00
ProgrammaticNajel
e939f75f4b
Transform screen mouse coordinates to local space coordinates.
2019-01-26 18:19:01 +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
77763fde8b
revert accidentally renamed variables
2019-01-25 11:22:05 +01:00
Unknown
4a916b2dee
replace license headers with new ones
2019-01-25 11:17:48 +01:00
Unknown
8ddff673b7
revert previous rename and rename ruleset specific classes instead
2019-01-25 11:14:37 +01:00
Unknown
5446c99f22
Merge branch 'master' into move-osu-settings
2019-01-25 10:57:04 +01:00
Dean Herbert
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
