1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-19 00:32:58 +08:00
Commit Graph

417 Commits

Author SHA1 Message Date
Dean Herbert
f06b203067
Merge branch 'master' into edit-nodesample 2023-07-31 14:06:38 +09:00
Dean Herbert
cdcb10e0e7 Fix timeline centre point being ever-so-slight off 2023-07-21 15:26:41 +09:00
Dean Herbert
f489dbd7a9 Reduce width of right toolbar ever so slightly (and use more shared constants) 2023-07-21 14:39:15 +09:00
Dean Herbert
57abb15724 Update design of timeline centre marker and adjust surrounding paddings 2023-07-14 16:37:57 +09:00
Dean Herbert
00e9746174 Implement longer design for timing point piece 2023-07-14 16:37:56 +09:00
Dean Herbert
01750dd091 Update metrics of checkboxes and backgrounds to match design better 2023-07-14 14:29:02 +09:00
Dean Herbert
5b2e704264 Move beat divisor control inside of TimelineArea and adjust metrics to match design 2023-07-14 14:19:04 +09:00
Dean Herbert
ebaf63b764 Apply NRT to timeline related classes 2023-07-14 14:04:12 +09:00
Dean Herbert
0ab0c52ad5 Automated pass 2023-06-24 01:00:03 +09:00
OliBomby
3f96795bbf fix merge conflict 2023-06-02 01:02:35 +02:00
Olivier Schipper
3f7bebfda4
Merge branch 'master' into edit-nodesample 2023-06-02 00:57:15 +02:00
OliBomby
848f0e305e Change position of sliderbody hitsound piece for less overlap 2023-06-02 00:55:37 +02:00
OliBomby
da516b9039 Change purple to darker pink 2023-06-02 00:50:21 +02:00
Bartłomiej Dach
c2d89a32a9
Adjust inline comment 2023-06-01 21:18:00 +02:00
Andrei Zavatski
03eb7c7830 Fix nullability 2023-06-01 21:21:01 +03:00
Andrei Zavatski
949fe32740 Use combined area of children as a mask instead 2023-06-01 15:32:17 +03:00
OliBomby
eb8ac89513 rename sample update logic and add xmldoc for clarity 2023-06-01 09:50:14 +02:00
OliBomby
1eb9b8e135 added xmldoc and renamed GetSamples 2023-06-01 09:34:21 +02:00
OliBomby
63d9be9523 merge updateAdditionBankPlaceholderText and updateAdditionBankActivated 2023-06-01 09:27:04 +02:00
OliBomby
9e78a6b34e hide addition bank field when no additions active 2023-05-31 20:00:45 +02:00
OliBomby
fede432969 Make relevantObject and relevantSamples instance variables 2023-05-31 20:00:19 +02:00
OliBomby
b7bc49b1f4 Fix regressed bank inheriting behaviour on node samples 2023-05-31 16:28:43 +02:00
OliBomby
7a46b7b961 Invert colors 2023-05-31 14:33:06 +02:00
Andrei Zavatski
d119447a10 Fix editor timeline hitobjects popping in 2023-05-30 16:41:42 +03:00
Dean Herbert
114f12a790 Adjust CreateHitSampleInfo to handle additions correctly, rather than implementing locally 2023-05-30 14:04:02 +09:00
Dean Herbert
4a81d068af Merge branch 'master' into edit-nodesample 2023-05-30 14:03:43 +09:00
Dean Herbert
214d7e07fa Add TODO regarding failing stack display code 2023-05-17 17:52:17 +09:00
Dean Herbert
9563d4f730 Fix weird purple tint on placement object in timeline 2023-05-17 17:26:19 +09:00
Dean Herbert
2085833a84 Fix missing delegate unsubscribe 2023-05-09 17:08:03 +09:00
Dean Herbert
944da06c10 Rename slider multiplier variable back for now 2023-05-09 16:58:19 +09:00
OliBomby
dd0fceaec6 add addition bank 2023-05-08 16:12:03 +02:00
OliBomby
7260dcac60 fix crash on multiselect and node sample piece popup 2023-05-08 15:57:30 +02:00
OliBomby
bb8285e2ef cleanup code duplication 2023-05-08 15:14:25 +02:00
OliBomby
4c36530435 allow editing additions in sample point piece 2023-05-08 15:08:40 +02:00
OliBomby
3b5bae7742 Abbreviate common bank names on timeline 2023-05-08 13:16:30 +02:00
OliBomby
e945846759 Add node sample pieces to timeline blueprint 2023-05-08 13:10:24 +02:00
OliBomby
32f945d304 fix updating wrong samples 2023-05-08 13:08:28 +02:00
OliBomby
cb7b747d52 create NodeSamplePointPiece 2023-05-08 12:38:53 +02:00
OliBomby
b447018e5b remove editor beatmap 2023-05-08 11:55:58 +02:00
OliBomby
244ca4e8c7 Remove dependency on SamplesBindable 2023-05-08 11:55:17 +02:00
Dean Herbert
a6cb1f90e4 Change difficulty popover inspector display (yet again)
I think this makes the most sense of the iterations I've tested so far, albeit maybe being a touch too verbose.
2023-05-08 13:43:23 +09:00
Dean Herbert
d9dd35c020 Show base velocity in slider adjustment popover 2023-05-08 13:13:09 +09:00
Dean Herbert
31de4de720 Remove median/mode slider velocity display
The intention was to give an idea of what the most common velocity of
the beatmap is, but in hindsight, because the "base" velocity is being
set elsewhere this doesn't make sense. It will/should be 1.0x.

Showing this range is still valuable, though.
2023-05-08 13:13:09 +09:00
Bartłomiej Dach
e808a47811
Fix delegate leak 2023-05-05 20:33:27 +02:00
Bartłomiej Dach
f536238554
Use shorter copy 2023-05-05 20:30:50 +02:00
Dean Herbert
b7a287869a Add display of beatmap slider velocity when adjusting 2023-05-05 15:57:38 +09:00
Dean Herbert
6b017ac05f
Merge pull request from OliBomby/sample-control-points
Remove SampleControlPoint and DifficultyControlPoint from HitObject
2023-05-03 14:21:51 +09:00
Dean Herbert
8a536c1cdb Fix non-block namespace usage 2023-05-02 15:09:24 +09:00
OliBomby
1dc34ee25d fix infinite repeat count when adjusting length of 0 length slider 2023-05-01 15:48:54 +02:00
OliBomby
c44f71a737 remove all regular usage of DifficultyControlPoint 2023-04-26 17:55:38 +02:00