Joseph Madamba
|
1eeacb7bf7
|
Change descriptions and special section
|
2018-03-14 01:05:19 -07:00 |
|
Dean Herbert
|
a0691168cb
|
Merge remote-tracking branch 'upstream/master' into editor-hitobject-movement
|
2018-03-14 15:35:24 +09:00 |
|
Dean Herbert
|
81f82d98a1
|
Rework a lot of naming and structure
|
2018-03-14 15:18:21 +09:00 |
|
Joseph Madamba
|
d122aa80e4
|
Edit mods description, multiplier, and code
|
2018-03-13 20:07:03 -07:00 |
|
smoogipoo
|
e2dc9a975a
|
Merge branch 'master' into editor-wheel-movement
|
2018-03-14 11:39:02 +09:00 |
|
smoogipoo
|
299de4b866
|
Rewrite seeking to better handle timing point boundaries
|
2018-03-13 16:54:34 +09:00 |
|
smoogipoo
|
df352c98d6
|
Change wheel direction to match stable
|
2018-03-13 14:30:50 +09:00 |
|
smoogipoo
|
e580819621
|
Rename to seekAmount
|
2018-03-13 14:08:43 +09:00 |
|
smoogipoo
|
6c148930b5
|
Don't skip beats when scrolling in the direction of the closest beat
|
2018-03-13 14:02:37 +09:00 |
|
smoogipoo
|
8acba47a2b
|
Implement mouse wheel movement in the editor
|
2018-03-13 11:23:44 +09:00 |
|
Dean Herbert
|
107ad8cfff
|
Merge remote-tracking branch 'FreezyLemon/master' into more-skinning
|
2018-03-12 22:01:59 +09:00 |
|
smoogipoo
|
8c4bcb4a04
|
Only accept drag movement on the overlays
|
2018-03-12 17:33:10 +09:00 |
|
smoogipoo
|
212142429f
|
Derive from IHasPosition
|
2018-03-12 17:25:34 +09:00 |
|
Dean Herbert
|
8cbcdeb665
|
Merge branch 'master' into mania-difficulty
|
2018-03-12 14:07:14 +09:00 |
|
Dean Herbert
|
ab4c527ebc
|
Merge branch 'master' into decoders
|
2018-03-12 13:38:22 +09:00 |
|
Dean Herbert
|
9f644571ea
|
Merge branch 'master' into mania-difficulty
|
2018-03-12 13:31:48 +09:00 |
|
smoogipoo
|
3cd203699b
|
Apply beatmap converter mods in PerformanceCalculator
|
2018-03-12 13:09:19 +09:00 |
|
Dean Herbert
|
eb643b690a
|
Merge branch 'master' into more-skinning
|
2018-03-12 11:55:50 +09:00 |
|
Dean Herbert
|
c70be29eda
|
Move legacy conversion to LegacySkin
|
2018-03-12 11:30:13 +09:00 |
|
Dean Herbert
|
d27cf16bf9
|
Merge remote-tracking branch 'ppy/master' into more-skinning
|
2018-03-12 10:46:37 +09:00 |
|
Dan Balasescu
|
8ba87dfdbd
|
Merge branch 'master' into fix-duplicate-judgements
|
2018-03-12 10:29:50 +09:00 |
|
HoLLy
|
9c75c392f2
|
Only check by null instead of sign
|
2018-03-11 21:27:49 +01:00 |
|
HoLLy
|
a321bcf3af
|
Fix check against LegacyID for non-default rulesets
|
2018-03-11 20:19:03 +01:00 |
|
smoogipoo
|
4103c66cff
|
Move selection overlay to HitObjectOverlayLayer for extensibility
|
2018-03-10 00:48:57 +09:00 |
|
smoogipoo
|
0e8fbc47b7
|
Give HitObjectOverlayLayer full input state information
|
2018-03-10 00:03:02 +09:00 |
|
smoogipoo
|
376f6eec58
|
SetPosition -> OffsetPosition
|
2018-03-10 00:02:13 +09:00 |
|
smoogipoo
|
ad72d3816b
|
Allow dragging anywhere in a capture box to move objects
|
2018-03-09 23:43:50 +09:00 |
|
smoogipoo
|
4a48136e4f
|
Make hitobject positions adjustable
|
2018-03-09 23:12:34 +09:00 |
|
smoogipoo
|
3b766b8ec8
|
Make CaptureBox account for changes in hitobject states
|
2018-03-09 23:11:48 +09:00 |
|
Dean Herbert
|
217dd2ecdc
|
Initial push for better decoders
|
2018-03-09 21:24:15 +09:00 |
|
Dean Herbert
|
b62ed004f2
|
Remove judgements when deciding a new judgement for a HitObject
Generally happens when rewinding.
|
2018-03-07 19:14:42 +09:00 |
|
Dean Herbert
|
05eb678654
|
Add skin support for judgements
|
2018-03-07 18:21:05 +09:00 |
|
Dean Herbert
|
e82cadc811
|
Make LegacyID nullable
The -1 default was getting stored to the database.
|
2018-03-06 17:40:14 +09:00 |
|
smoogipoo
|
2a9fb2c2c6
|
Make NestedHitObjects lazily-constructed
|
2018-03-05 21:40:26 +09:00 |
|
Dean Herbert
|
2003887cc8
|
Merge branch 'master' into clock-fixes
|
2018-03-05 17:45:08 +09:00 |
|
Dean Herbert
|
8273288048
|
Add xmldoc
|
2018-03-04 02:12:45 +09:00 |
|
Dean Herbert
|
0e928429d4
|
Merge branch 'master' into ruleset-replayframes
|
2018-03-04 01:57:43 +09:00 |
|
Dean Herbert
|
0b2cbf88bb
|
Merge branch 'master' into clock-fixes
|
2018-03-02 22:18:32 +09:00 |
|
Dean Herbert
|
bd510e5356
|
Merge remote-tracking branch 'upstream/master' into clock-fixes
|
2018-03-02 21:01:53 +09:00 |
|
smoogipoo
|
8a15d4e677
|
Fix linear perfect-curves not being cased to CurveType.Linear
Fixes #2151.
|
2018-03-02 18:21:40 +09:00 |
|
Dean Herbert
|
c54c1699bf
|
Merge branch 'master' into ruleset-replayframes
|
2018-03-01 22:26:16 +09:00 |
|
smoogipoo
|
d5d4bcb558
|
Merge branch 'master' into editor-hitobject-overlays
|
2018-03-01 14:04:38 +09:00 |
|
smoogipoo
|
e869f7d05b
|
Fix converted frames not getting time values
|
2018-03-01 02:28:15 +09:00 |
|
smoogipoo
|
fb16c3db87
|
Privatise CurrentTime's setter
|
2018-03-01 02:28:14 +09:00 |
|
smoogipoo
|
19911193cf
|
Minify LegacyReplayFrame
|
2018-03-01 02:28:14 +09:00 |
|
smoogipoo
|
cf42d5bbd5
|
Remove mostly-unused Score parameter
|
2018-03-01 02:28:14 +09:00 |
|
smoogipoo
|
c9c65cab53
|
CreateReplayFrame -> CreateConvertibleReplayFrame
|
2018-03-01 02:28:14 +09:00 |
|
smoogipoo
|
ab4d7fa46e
|
Remove IScoreParser interface
It's too early for this.
|
2018-03-01 02:28:14 +09:00 |
|
smoogipoo
|
a3c7755ade
|
Implement a conversion process for ReplayFrames
|
2018-03-01 02:28:14 +09:00 |
|
Dean Herbert
|
01fcf9c813
|
Update in line with framework changes
|
2018-02-28 22:01:48 +09:00 |
|
Dean Herbert
|
5b4fef0180
|
Add bare minimum sanity checking of beatmap input values to make broken maps load
Resolves ppy/osu#1988.
|
2018-02-28 18:12:24 +09:00 |
|
Dean Herbert
|
cff17f1864
|
Update in line with inverse ShoudProcessClock default
|
2018-02-27 17:23:38 +09:00 |
|
Dean Herbert
|
73fb185132
|
Change the way ShouldProcessClock is specified in line with framework changes
|
2018-02-27 17:23:38 +09:00 |
|
Dean Herbert
|
bdd88303b3
|
Merge branch 'master' into editor-hitobject-overlays
|
2018-02-26 17:53:50 +09:00 |
|
Dean Herbert
|
9cbed461c4
|
Merge branch 'master' into sliderbody-rework
|
2018-02-26 15:00:18 +09:00 |
|
Dean Herbert
|
4a52df2dd4
|
Apply review
|
2018-02-24 23:07:02 +09:00 |
|
Dean Herbert
|
768e0a4e2a
|
Add SkinnableSound class
Tidy things up, move logic out of SampleInfo.
|
2018-02-24 22:47:14 +09:00 |
|
smoogipoo
|
066abfbdbc
|
Rename PositionAt -> CurvePositionAt to represent its new meaning
|
2018-02-24 02:43:36 +09:00 |
|
smoogipoo
|
8c90abe0dc
|
Make slider control points relative to start position
|
2018-02-23 20:59:27 +09:00 |
|
smoogipoo
|
278b25bcbd
|
Fix border being the wrong size
|
2018-02-23 15:29:56 +09:00 |
|
smoogipoo
|
d72290ee24
|
Make ScaledContainer private
|
2018-02-23 15:06:08 +09:00 |
|
Dean Herbert
|
6ceabfe19e
|
Add basic hitsound skinning
|
2018-02-23 13:38:12 +09:00 |
|
smoogipoo
|
0cdf6fa7e2
|
Make HitObjectOverlay into an OverlayContainer
|
2018-02-22 14:36:58 +09:00 |
|
smoogipoo
|
45c579630d
|
Make selectionLayer handle input below object overlays
|
2018-02-22 14:34:37 +09:00 |
|
Dan Balasescu
|
6cc54a464c
|
Merge branch 'master' into editor-hitobject-overlays
|
2018-02-22 14:25:27 +09:00 |
|
smoogipoo
|
07252254eb
|
Fix post-merge issues
|
2018-02-22 14:22:04 +09:00 |
|
smoogipoo
|
99e9eb81f2
|
Merge remote-tracking branch 'origin/master' into editor-hitobject-overlays
|
2018-02-22 14:16:01 +09:00 |
|
Dean Herbert
|
a3336f2577
|
Merge branch 'master' into fix-editor-osu-scale
|
2018-02-22 14:14:41 +09:00 |
|
smoogipoo
|
ded2644df8
|
Merge branch 'master' into editor-hitobject-overlays
|
2018-02-22 14:08:36 +09:00 |
|
Dean Herbert
|
7c942eb592
|
Tidy up layer container logic
|
2018-02-22 13:42:36 +09:00 |
|
Dean Herbert
|
b74cfffc6f
|
Merge branch 'master' into editor-hitobject-movement
|
2018-02-22 13:19:39 +09:00 |
|
smoogipoo
|
5faec5c2f1
|
Add a separate property to control playfield area
|
2018-02-21 20:54:33 +09:00 |
|
smoogipoo
|
6757be2007
|
Fix incorrect RelativeChildSize in Catch
|
2018-02-21 20:15:51 +09:00 |
|
smoogipoo
|
f012cce668
|
Rewrite some xmldocs to make methods easier to understand
|
2018-02-21 17:33:22 +09:00 |
|
smoogipoo
|
4934ef7429
|
Add playfield aspect ratio + scaling modifications to composer layers
|
2018-02-21 11:07:42 +09:00 |
|
smoogipoo
|
7fd7dc1538
|
Extract playfield scaling into a separate class
And make it more general.
|
2018-02-21 11:07:42 +09:00 |
|
Dean Herbert
|
ba10eb5e50
|
Merge branch 'master' into osu-rulesetcontainer-aspect
|
2018-02-21 10:13:44 +09:00 |
|
smoogipoo
|
7fe0989427
|
Merge branch 'general-slider-improvements' into editor-hitobject-overlays
|
2018-02-20 23:51:47 +09:00 |
|
smoogipoo
|
ad2f556133
|
Add hitobject overlays to selected hitobjects
|
2018-02-20 18:01:45 +09:00 |
|
smoogipoo
|
2a5bfdb4b8
|
Deselect hitobjects that are now not in the selection quad
|
2018-02-20 15:06:51 +09:00 |
|
smoogipoo
|
2f4925d031
|
Add some xmldocs
|
2018-02-20 15:06:14 +09:00 |
|
smoogipoo
|
285df52f43
|
Encapsulate logic for selecting/deselecting further
|
2018-02-20 14:54:45 +09:00 |
|
smoogipoo
|
995ecb7d94
|
Make selectedHitObjects into a HashSet for quick Contains checks
|
2018-02-20 14:48:35 +09:00 |
|
smoogipoo
|
87065a0b13
|
Rename + publicise DeselectAll
|
2018-02-20 14:38:57 +09:00 |
|
smoogipoo
|
423fe4eba8
|
Combine border radiuses of selection and capture boxes
|
2018-02-20 14:25:42 +09:00 |
|
Dan Balasescu
|
3d7f998c9b
|
Merge branch 'master' into osu-rulesetcontainer-aspect
|
2018-02-20 14:07:04 +09:00 |
|
smoogipoo
|
8f25a5da66
|
Add playfield aspect ratio + scaling modifications to composer layers
|
2018-02-20 14:01:33 +09:00 |
|
smoogipoo
|
4a5cd6520c
|
Extract playfield scaling into a separate class
And make it more general.
|
2018-02-20 13:50:31 +09:00 |
|
Dean Herbert
|
f41a40be15
|
Merge branch 'master' into editor-hitobject-movement
|
2018-02-19 17:59:50 +09:00 |
|
smoogipoo
|
4898c321f8
|
Merge branch 'osu-rulesetcontainer-aspect' into editor-hitobject-movement
|
2018-02-19 17:07:03 +09:00 |
|
smoogipoo
|
b7be162f28
|
Remove AspectAdjust property (override GetAspectAdjustedSize instead)
|
2018-02-19 17:05:10 +09:00 |
|
smoogipoo
|
cd2c9a9de6
|
Adjust xmldoc and rename to GetAspectAdjustedSize
|
2018-02-19 17:04:18 +09:00 |
|
smoogipoo
|
cbac4de9c2
|
Expire + dispose CaptureBoxes
|
2018-02-15 19:11:29 +09:00 |
|
smoogipoo
|
ebcdb62570
|
Remove now unneeded hide
|
2018-02-15 19:10:55 +09:00 |
|
smoogipoo
|
9583191556
|
Dispose SelectionBoxes when they die
|
2018-02-15 19:08:03 +09:00 |
|
smoogipoo
|
4ac0c48ba6
|
Add fadein to SelectionBox
|
2018-02-15 19:07:53 +09:00 |
|
smoogipoo
|
dcbc8c3dcd
|
Remove animated capture boxes for now
|
2018-02-15 18:06:33 +09:00 |
|
Dean Herbert
|
a0a65abcac
|
Crentalise all import logic
|
2018-02-15 14:22:39 +09:00 |
|
smoogipoo
|
115484741d
|
Capture -> Select
|
2018-02-14 17:54:43 +09:00 |
|
smoogipoo
|
a9d14eadac
|
Add clearSelection method
|
2018-02-14 17:53:04 +09:00 |
|
smoogipoo
|
344da5965c
|
Add a CaptureBox that encloses hitobjects from the drag selection
|
2018-02-14 14:38:37 +09:00 |
|
Dean Herbert
|
58f20c3723
|
Merge branch 'master' into editor-hitobject-movement
|
2018-02-13 18:56:16 +09:00 |
|
Dean Herbert
|
a738664167
|
Add interface for database context factory
|
2018-02-12 23:10:05 +09:00 |
|
smoogipoo
|
87baa6febd
|
Merge remote-tracking branch 'origin/master' into editor-pattern-adjustments
|
2018-02-12 19:08:13 +09:00 |
|
smoogipoo
|
bfedd1cee0
|
Remove nested container
|
2018-02-12 19:01:50 +09:00 |
|
smoogipoo
|
c3212d36ef
|
Remove handles for now (will be re-implemented)
|
2018-02-12 18:36:16 +09:00 |
|
smoogipoo
|
e10bb2db05
|
Unify SelectionLayer and HitObjectCapturer, rename SelectionBox
|
2018-02-12 18:35:01 +09:00 |
|
smoogipoo
|
20c0dee17d
|
Remove SelectionInfo
|
2018-02-12 18:22:52 +09:00 |
|
smoogipoo
|
ee168f9a77
|
Split out drag selection box from post-capture box
Cleans up a lot of code, removes handles for now.
|
2018-02-12 18:20:05 +09:00 |
|
Dean Herbert
|
edc3638175
|
DatabaseWriteUsage
|
2018-02-12 17:55:11 +09:00 |
|
smoogipoo
|
1adbe3585c
|
HitObjectSelectionBox -> SelectionDragger
|
2018-02-12 16:03:59 +09:00 |
|
smoogipoo
|
cfb2b3f1e8
|
Rework SelctionLayer to support click-selections
|
2018-02-12 16:02:42 +09:00 |
|
smoogipoo
|
77149b00ce
|
Merge branch 'codestyle-fixes' into update-branch
|
2018-02-08 23:47:31 +09:00 |
|
smoogipoo
|
4699b5ad7c
|
Fix a few code styling issues
These are present in the netstandard branch (the rules aren't working there - probably using the wrong configuration).
|
2018-02-08 23:47:03 +09:00 |
|
smoogipoo
|
b500b76407
|
Merge branch 'master' into update-branch
|
2018-02-08 23:35:48 +09:00 |
|
smoogipoo
|
0511728fbe
|
Remove "keypress" from comment
|
2018-02-08 17:38:46 +09:00 |
|
smoogipoo
|
46284c61ae
|
Return HitResult.None instead of null
|
2018-02-08 14:25:59 +09:00 |
|
smoogipoo
|
c537af0289
|
Fix/improve commends
|
2018-02-08 14:25:44 +09:00 |
|
smoogipoo
|
a6f1a4689e
|
Fix incorrect value copy-pasta
|
2018-02-08 14:16:37 +09:00 |
|
smoogipoo
|
802aaefe35
|
Give rulesets a way to disable/enable perfect/ok hit results
|
2018-02-08 13:54:08 +09:00 |
|
smoogipoo
|
cfdeac6428
|
Make hit windows settable by derived classes
|
2018-02-08 13:38:31 +09:00 |
|
smoogipoo
|
beaecbafbd
|
Merge branch 'master' into unified-hitwindows
|
2018-02-08 13:22:44 +09:00 |
|
smoogipoo
|
9225e883c1
|
Add + use HalfHitWindow
|
2018-02-02 20:29:50 +09:00 |
|
smoogipoo
|
6976347d64
|
Protect hit window values
|
2018-02-02 20:28:59 +09:00 |
|
smoogipoo
|
e45b26c742
|
Cleanup/minify HitWindows
|
2018-02-02 19:35:44 +09:00 |
|
smoogipoo
|
d371425c87
|
BAD -> MEH
|
2018-02-02 18:56:44 +09:00 |
|
smoogipoo
|
70462ebee3
|
Make HitWindows settable by derived HitObjects
|
2018-02-02 18:53:05 +09:00 |
|
smoogipoo
|
acf20c079c
|
General improvements around usage of HitWindows for mania
|
2018-02-02 18:47:54 +09:00 |
|
smoogipoo
|
558c53a6ba
|
Give HitObject some HitWindows
|
2018-02-02 18:47:10 +09:00 |
|
smoogipoo
|
a0c1662fb7
|
Move mania's HitWindows to osu.Game
|
2018-02-02 17:52:55 +09:00 |
|
smoogipoo
|
75858bd3de
|
Update in-line with framework changes
|
2018-02-02 15:41:54 +09:00 |
|
Dean Herbert
|
5ba84a67f1
|
Merge branch 'master' into catmull-sliders
|
2018-02-01 20:58:33 +09:00 |
|
Dan Balasescu
|
c486609174
|
Merge branch 'master' into fix-replay-time-stop
|
2018-02-01 20:08:58 +09:00 |
|
smoogipoo
|
13f16077d4
|
Implement Catmull-Rom curve approximator
|
2018-02-01 20:04:41 +09:00 |
|
Dean Herbert
|
9d4ec6f8b5
|
Merge branch 'master' into ismaskedaway-input-fix
|
2018-02-01 19:29:10 +09:00 |
|
Dean Herbert
|
1d687c470c
|
Fix clock not incrementing beyond last frame of replay
|
2018-02-01 18:49:14 +09:00 |
|
Dean Herbert
|
1cc7c23982
|
Hits -> JudgedHits
|
2018-02-01 18:08:15 +09:00 |
|
Dan Balasescu
|
c1d5a68e4d
|
Merge branch 'master' into VisualSettingsOverlay
|
2018-02-01 16:37:04 +09:00 |
|
smoogipoo
|
1b99e54005
|
Fix IsMaskedAway not being up-to-date when fastfowarding replays
|
2018-02-01 15:21:23 +09:00 |
|
Dean Herbert
|
cd37be9440
|
Merge branch 'master' into better-slider-objects
|
2018-02-01 08:39:39 +09:00 |
|
Dean Herbert
|
888d2362fd
|
Merge branch 'master' into fix-taiko-fastforwarding
|
2018-01-31 18:30:15 +09:00 |
|
smoogipoo
|
c97ea3ed60
|
Post-process beatmap before applying defaults
|
2018-01-30 15:49:55 +09:00 |
|
smoogipoo
|
ef3fb8c05a
|
InputManager -> Container where KeyBindings are involved
|
2018-01-30 14:49:12 +09:00 |
|
TocoToucan
|
615c831069
|
Merge from ppy/master
|
2018-01-26 21:56:17 +03:00 |
|
smoogipoo
|
5742e61e68
|
Merge remote-tracking branch 'origin/master' into ruleset-configs
|
2018-01-26 15:39:09 +09:00 |
|
smoogipoo
|
0a505dde2e
|
Remove MaskingAffectsInput override
|
2018-01-26 14:47:16 +09:00 |
|
Dean Herbert
|
03154dbc63
|
Fix incorrect initial migration
Also adds variant to settings
|
2018-01-25 23:41:03 +09:00 |
|
smoogipoo
|
57cd50c45e
|
Reorder the way input is handled for replays
Fixes https://github.com/ppy/osu/issues/1625 .
|
2018-01-25 17:39:50 +09:00 |
|
smoogipoo
|
b77f08941c
|
Make mania play the next note's sounds if no note is hit
Fixes #1911.
This follows what osu!stable does, which is rather unfortunate, since it just plays _every_ sound for the note :|.
|
2018-01-24 20:05:37 +09:00 |
|
Dean Herbert
|
5a00ae36d1
|
Add database-based configuration for rulesets
|
2018-01-24 17:45:28 +09:00 |
|