smoogipoo
|
050d86a741
|
Always use the local coordinate space
|
2019-10-11 18:24:33 +09:00 |
|
smoogipoo
|
9ecec806c2
|
Rename grid creation method + parameter
|
2019-10-11 18:24:33 +09:00 |
|
smoogipoo
|
5f0cd356d7
|
Rename startPosition to centrePosition
|
2019-10-11 18:24:33 +09:00 |
|
smoogipoo
|
8fb2628f9e
|
Improve xmldocs
|
2019-10-11 18:24:33 +09:00 |
|
smoogipoo
|
66e0fef85b
|
Expose StartPosition for derived grids to use
|
2019-10-11 18:24:33 +09:00 |
|
smoogipoo
|
97d4a8e59e
|
Remove unnecessary dependency
|
2019-10-11 18:24:33 +09:00 |
|
smoogipoo
|
2df519ddfa
|
Simplify colour retrieval function
|
2019-10-11 18:24:33 +09:00 |
|
smoogipoo
|
2aa3d0bb39
|
Implement base class for beat snapping grids
|
2019-10-11 18:24:33 +09:00 |
|
Dean Herbert
|
937dbb7bf6
|
Initial layout for timing screen
|
2019-10-11 16:22:24 +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
|
0681bb9a2b
|
Fix potential nullref
|
2019-10-09 16:49:10 +09:00 |
|
Dean Herbert
|
2d8e5615e4
|
Extract timeline and layout logic from ComposeScreen
|
2019-10-09 16:05:55 +09:00 |
|
Dean Herbert
|
3dd2b18ff0
|
Make EditorScreen abstract
|
2019-10-09 16:04:58 +09:00 |
|
smoogipoo
|
179656788d
|
Remove unnecessary method
|
2019-10-08 19:27:59 +09:00 |
|
smoogipoo
|
c1db11fa06
|
More removal of "drag"
|
2019-10-08 19:24:58 +09:00 |
|
smoogipoo
|
8b661e624d
|
Remove drag from class/method namings + refactor
|
2019-10-08 19:08:31 +09:00 |
|
smoogipoo
|
08d043f447
|
Move selection relative to the hitobject start positions
|
2019-10-08 18:57:03 +09:00 |
|
Dean Herbert
|
3e904b4838
|
Fix naming of file
|
2019-10-08 14:37:56 +09:00 |
|
Dean Herbert
|
63bf8ff832
|
Better signify under construction screens in editor
|
2019-10-08 14:32:48 +09:00 |
|
Dan Balasescu
|
73e3dac64b
|
Merge branch 'master' into fix-editor-skinning
|
2019-10-08 13:28:10 +09:00 |
|
Dean Herbert
|
24269c0384
|
Fix skins not being displayed correctly in the editor
|
2019-10-08 12:52:34 +09:00 |
|
Dean Herbert
|
5472029ffe
|
Fix editor defaulting to 0.5x playback speed
|
2019-10-08 12:27:51 +09:00 |
|
Dean Herbert
|
6fce646369
|
Merge branch 'master' into placement-blueprint-movement
|
2019-10-04 19:05:56 +08:00 |
|
smoogipoo
|
652acac87f
|
Move placement movement event to BlueprintContainer
|
2019-10-03 16:14:42 +09:00 |
|
smoogipoo
|
3fb0b0b668
|
Rename to StartTimeChanged and add xmldocs
|
2019-10-03 14:37:16 +09:00 |
|
smoogipoo
|
897b3233af
|
Add start time tracking to EditorBeatmap
|
2019-10-03 14:23:48 +09:00 |
|
Dean Herbert
|
f493f1c71d
|
Move new components to v2 namespace
|
2019-09-24 19:00:26 +09:00 |
|
smoogipoo
|
6b702eb6de
|
Update with generic labelledcomponent
|
2019-09-24 18:25:17 +09:00 |
|
smoogipoo
|
5212c50654
|
Merge branch 'generic-labelledcomponent' into labelled-textbox-improvements
|
2019-09-24 18:23:01 +09:00 |
|
smoogipoo
|
df692b091c
|
Make LabelledComponent generic
|
2019-09-24 18:22:02 +09:00 |
|
smoogipoo
|
2bbf4ca4b5
|
Update LabelledTextBox to use LabelledComponent
|
2019-09-20 18:50:50 +09:00 |
|
smoogipoo
|
523272edab
|
Add xmldocs
|
2019-09-20 18:39:04 +09:00 |
|
smoogipoo
|
e0a97cfac5
|
Add a LabelledComponent base class
|
2019-09-20 18:35:15 +09:00 |
|
Andrei Zavatski
|
437e121056
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video
|
2019-09-13 13:39:58 +03:00 |
|
Dean Herbert
|
e479be3fba
|
Merge pull request #5894 from smoogipoo/accessible-beatdivisor-colours
Move beat divisor colour retrieval to BindableBeatDivisor
|
2019-09-02 12:41:19 +09:00 |
|
smoogipoo
|
cbbc6aad6e
|
Make method static
|
2019-08-31 21:32:02 +09:00 |
|
Andrei Zavatski
|
6e5cb8a318
|
implement video parsing
|
2019-08-30 23:19:34 +03:00 |
|
smoogipoo
|
40729356fa
|
Move beat divisor colour retrieval to BindableBeatDivisor
|
2019-08-30 17:34:58 +09:00 |
|
Dean Herbert
|
84e4748268
|
Remove duplicate getAnimation function and improve namespacing
|
2019-08-30 12:59:58 +09:00 |
|
Dean Herbert
|
3f500131d4
|
Add basic xmldoc
|
2019-08-30 11:33:50 +09:00 |
|
smoogipoo
|
6641811125
|
Add EditorWorkingBeatmap for reuse of the playable beatmap
|
2019-08-29 19:41:12 +09:00 |
|
smoogipoo
|
b04a8ae856
|
Add xmldocs
|
2019-08-29 16:31:43 +09:00 |
|
smoogipoo
|
5db813b7a4
|
Add secondary interface for further abstraction
|
2019-08-29 16:26:39 +09:00 |
|
smoogipoo
|
7927b684d3
|
Hook up + use editor beatmap
|
2019-08-29 16:06:40 +09:00 |
|
smoogipoo
|
840f224619
|
Remove typed events to reduce complexity
|
2019-08-29 16:05:44 +09:00 |
|
smoogipoo
|
6949c96aaa
|
Add initial EditorBeatmap structure
|
2019-08-29 15:17:27 +09:00 |
|
Dean Herbert
|
48716f8f2b
|
Update framework
|
2019-08-21 13:29:50 +09:00 |
|
Dean Herbert
|
ad873b542a
|
Simplify editor logic
|
2019-07-11 00:22:40 +09:00 |
|
Desconocidosmh
|
100d15e651
|
Move reseting tempo to Editor
|
2019-07-10 10:43:02 +02:00 |
|
Oskar Solecki
|
3472979d0b
|
Make sure exiting editor doesn't unpause the music
|
2019-07-09 12:53:40 +02:00 |
|
Oskar Solecki
|
8f7476e9cc
|
Remove unused stuff
|
2019-07-09 00:26:57 +02:00 |
|
Oskar Solecki
|
a4957909b4
|
Merge branch 'master' into Fix-music-playing-while-exiting-from-editor
|
2019-07-09 00:11:29 +02:00 |
|
Desconocidosmh
|
338371c3fc
|
Fix music playing while exiting from editor
|
2019-07-09 00:08:18 +02:00 |
|
Desconocidosmh
|
84cadc688a
|
Change method name
|
2019-07-07 17:11:54 +02:00 |
|
Desconocidosmh
|
1a117d1511
|
Closes #5277
|
2019-07-07 17:05:53 +02:00 |
|
Dean Herbert
|
fa879b4b60
|
Add a note explaining why manual handling is required
|
2019-06-30 20:47:09 +09:00 |
|
Unknown
|
5b26ef75b1
|
allow exiting editor again
|
2019-06-30 12:31:31 +02:00 |
|
smoogipoo
|
8c96e4c1fa
|
Move back button to OsuGame
|
2019-06-25 18:33:08 +09:00 |
|
Joehu
|
1a9efb3d7a
|
Fix editor play button
|
2019-06-15 11:05:58 -07:00 |
|
Dean Herbert
|
1b75fbed9a
|
Merge remote-tracking branch 'upstream/master' into update-scrollcontainer
|
2019-06-14 23:25:17 +09:00 |
|
Dean Herbert
|
bc574520bf
|
Update ScrollContainer usages in line with framework changes
|
2019-06-14 15:55:32 +09:00 |
|
Dean Herbert
|
15b9b53d35
|
Fix IconButtons not being scaled correctly
|
2019-06-14 13:40:32 +09:00 |
|
Dean Herbert
|
20b43c20c8
|
Rename variables to remove redundant "screen" terminology
|
2019-06-12 16:33:15 +09:00 |
|
Lucas A
|
15893bbb75
|
Drop UserActivity prefix for subclasses nested in UserActivity + Change status messages.
|
2019-06-11 19:41:48 +02:00 |
|
Lucas A
|
55663b3576
|
Nest all UserActivities into UserActivity
|
2019-05-12 17:38:02 +02:00 |
|
Lucas A
|
5ac6bd8204
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-05-12 11:53:30 +02:00 |
|
Dan Balasescu
|
22940373a0
|
Merge branch 'master' into zoomablescrollcontainer-fix
|
2019-05-09 13:54:21 +09:00 |
|
smoogipoo
|
5c6b4d923f
|
Reorder methods
|
2019-05-09 13:53:53 +09:00 |
|
David Zhao
|
d625f3c104
|
Private method
|
2019-05-09 13:21:01 +09:00 |
|
David Zhao
|
ff3c226596
|
Give ZoomableScrollContainer an initial width
|
2019-05-08 13:37:03 +09:00 |
|
Lucas A
|
a5f758b977
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-05-07 18:27:14 +02: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 |
|
Lucas A
|
d5d31282e5
|
Rename InitialScreenStatus to InitialScreenActivity in Editor / Player classes
|
2019-05-05 20:55:42 +02:00 |
|
Lucas A
|
5d4aa5a12e
|
Add ScreenStatus property to change the OsuScreen's status + Renamed old ScreenStatus property to InitialScreenStatus
|
2019-05-02 20:51:19 +02:00 |
|
Lucas A
|
7e42068a14
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-04-28 19:48:35 +02:00 |
|
Dean Herbert
|
d40177f97c
|
Merge branch 'master' into drawnode-composability
|
2019-04-27 18:41:19 +09:00 |
|
smoogipoo
|
0bd35ab7bb
|
Turn on warnings, resolve issues
|
2019-04-25 17:36:17 +09:00 |
|
David Zhao
|
6502e26d09
|
Add draw size invalidation to ZoomableScrollContainer
|
2019-04-19 16:21:15 +09:00 |
|
Lucas A
|
da5d6cb1d4
|
Add Beatmap fields to UserStatusSoloGame & UserStatusEditing so they can carry metadata about the played / edited beatmap
|
2019-04-12 22:54:35 +02:00 |
|
smoogipoo
|
772bef91fa
|
Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
# osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
|
2019-04-08 23:01:12 +09:00 |
|
Dean Herbert
|
f1952c0816
|
Update font awesome usage
|
2019-04-02 19:55:24 +09:00 |
|
smoogipoo
|
a56e29347f
|
Adjust namespaces
|
2019-04-02 14:51:28 +09:00 |
|
Dean Herbert
|
c39c37a18d
|
Apply more missed cases
|
2019-04-01 12:44:46 +09:00 |
|
Dean Herbert
|
612db31c38
|
Apply newline additions
|
2019-04-01 12:16:32 +09:00 |
|
Dean Herbert
|
de80fc0eac
|
Update icon usage to match framework changes
|
2019-03-27 19:29:27 +09:00 |
|
Dean Herbert
|
baea7230bc
|
Rename RulesetContainer to DrawableRuleset
|
2019-03-19 23:47:31 +09:00 |
|
Dean Herbert
|
5487b011d6
|
Fix some inspections rider isn't able to deal with automatically
|
2019-03-02 14:34:56 +09:00 |
|
Dean Herbert
|
d10ad3c8a7
|
Fix warnings
|
2019-02-28 18:59:05 +09:00 |
|
Dean Herbert
|
5b53cf0961
|
Merge branch 'master' into hide-desktop-only-elements
|
2019-02-28 18:50:16 +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 |
|
Shane Woolcock
|
ce17e37c74
|
Conditionally add some UI elements only on desktop
Prevents crashes from trying to access features that are not applicable to mobile.
|
2019-02-28 13:10:53 +09:00 |
|
Dean Herbert
|
367bc53a06
|
Revert some more instances of 'e' variable names
|
2019-02-22 20:15:25 +09:00 |
|
Dean Herbert
|
3015d40f8f
|
Merge branch 'master' into osu-fontusage
|
2019-02-22 18:09:23 +09:00 |
|
Dean Herbert
|
3fe4b8fd1c
|
Update variable names
Also cleans up some weird code
|
2019-02-22 17:51:39 +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
|
4db5531e4b
|
Replace copy-constructor/method with extension method
|
2019-02-20 19:32:30 +09:00 |
|
smoogipoo
|
0693ab8e7d
|
Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
# osu.Game/Screens/Multi/Components/BeatmapTitle.cs
|
2019-02-20 15:04:08 +09:00 |
|
smoogipoo
|
a2aa3ec5cb
|
Adjust sprite texts in-line with framework changes
|
2019-02-20 15:03:20 +09:00 |
|
Dean Herbert
|
ca5c8d37d1
|
Use leased bindables
|
2019-02-01 16:44:06 +09:00 |
|
smoogipoo
|
91302ea0bc
|
Merge remote-tracking branch 'origin/master' into iscreen
# Conflicts:
# osu.Game/Screens/Multi/Match/MatchSubScreen.cs
# osu.Game/Screens/Multi/Multiplayer.cs
# osu.Game/Screens/Multi/MultiplayerSubScreen.cs
# osu.Game/Screens/OsuScreen.cs
# osu.Game/osu.Game.csproj
# osu.sln
|
2019-01-29 21:21:36 +09:00 |
|
smoogipoo
|
7b1c1f3728
|
Move toolbar showing and overlay activation to OsuGame
Now exposed through IOsuScreen.
|
2019-01-28 15:42:06 +09:00 |
|
smoogipoo
|
8ea7ec6445
|
Convert everything to use IScreen
|
2019-01-24 19:47:44 +09:00 |
|
Dean Herbert
|
8617aaa2a7
|
Update licence header (and remove year)
|
2019-01-24 17:43:03 +09:00 |
|
Unknown
|
6eff79913b
|
remove blank lines
|
2019-01-11 10:34:56 +01:00 |
|
smoogipoo
|
8692be9de3
|
Fix sliderbar not working correctly with TransferValueOnCommit = true
|
2019-01-08 16:07:54 +09:00 |
|
Roman Kapustin
|
4b5fc85875
|
Use Find instead of FirstOrDefault
|
2019-01-05 19:35:33 +03:00 |
|
smoogipoo
|
bc3fcb87b7
|
Use input events rather than scene graph traversals
|
2018-11-30 15:47:55 +09:00 |
|
Dan Balasescu
|
e83f6707bf
|
Merge branch 'master' into editor-keyboard-seek
|
2018-11-30 15:17:06 +09:00 |
|
Dean Herbert
|
ab621bd873
|
Toggle pause in editor with spacebar
|
2018-11-30 14:58:09 +09:00 |
|
Dean Herbert
|
0ee5a5bdb4
|
Add support for keyboard seeking in the editor
|
2018-11-30 14:57:25 +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 |
|
Dan Balasescu
|
b446a73c0c
|
Add brackets
Co-Authored-By: peppy <pe@ppy.sh>
|
2018-11-23 10:06:06 +09:00 |
|
Dean Herbert
|
10047e6815
|
Adjust tick-based wheel control to be more correct
|
2018-11-22 20:13:40 +09:00 |
|
Dean Herbert
|
a48c26d999
|
Fix precision scroll events being handled incorrectly by editor
|
2018-11-22 19:40:44 +09: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 |
|
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 |
|
smoogipoo
|
c963fc7cd2
|
Reduce chaining
|
2018-11-14 18:34:13 +09:00 |
|
smoogipoo
|
6d43baf4bf
|
Make show/hide only invoked once each
|
2018-11-13 13:12:11 +09:00 |
|
smoogipoo
|
fbc20d2d4d
|
Hide placement when cursor is not in the playfield
|
2018-11-13 12:52:04 +09:00 |
|
smoogipoo
|
5d51719572
|
Make selection blueprints handle position adjustments
|
2018-11-07 16:21:32 +09:00 |
|
smoogipoo
|
e9e50f41fb
|
Use Name/NameScreen format
|
2018-11-07 13:04:17 +09:00 |
|
smoogipoo
|
52f4923c8e
|
Remove intermediate Screens namespace
|
2018-11-06 18:28:22 +09:00 |
|
smoogipoo
|
ac25718c5a
|
Renamespace compose-mode components
|
2018-11-06 18:14:46 +09:00 |
|
smoogipoo
|
27d82052f4
|
BorderLayer -> EditorPlayfieldBorder
|
2018-11-06 18:10:46 +09: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
|
90c813618a
|
Merge PlacementContainer into BlueprintContainer
|
2018-11-06 18:02:55 +09:00 |
|
smoogipoo
|
f2a5f28ea2
|
SelectionMask -> SelectionBlueprint
|
2018-11-06 17:56:04 +09:00 |
|
smoogipoo
|
ad2836a61e
|
MaskSelection -> SelectionBox
|
2018-11-06 17:52:47 +09:00 |
|
smoogipoo
|
65bb91dcf7
|
Merge MaskContainer into BlueprintContainer
|
2018-11-06 17:51:26 +09:00 |
|
smoogipoo
|
26c9390c16
|
HitObjectMaskLayer -> BlueprintContainer
|
2018-11-06 17:36:10 +09:00 |
|
smoogipoo
|
faab744cbd
|
DragLayer -> DragBox
|
2018-11-06 17:24:57 +09:00 |
|
smoogipoo
|
171700cb91
|
Debounce editor summary timeline seeks
|
2018-11-05 15:59:40 +09:00 |
|
Dean Herbert
|
0a0023920f
|
Fix not being able to drag control points mid-snake
|
2018-11-02 04:09:33 +09:00 |
|
Dean Herbert
|
5eaf80ab76
|
Add missing newline
|
2018-10-31 12:07:06 +09:00 |
|
smoogipoo
|
72d48aa7f5
|
Add xmldocs to IPlacementHandler
|
2018-10-18 16:46:30 +09:00 |
|
smoogipoo
|
0e841628b6
|
Implement hitobject deletion
|
2018-10-18 16:36:06 +09:00 |
|
smoogipoo
|
969477dadd
|
Remove placement events, make everything pass top-down
|
2018-10-17 17:43:16 +09:00 |
|
smoogipoo
|
62635c5ab8
|
Add container to handle placement mask
|
2018-10-17 16:17:49 +09:00 |
|
smoogipoo
|
4ea4ec0d25
|
Move placement handling events to a higher level
|
2018-10-17 15:46:30 +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 |
|
Dean Herbert
|
841b2e8692
|
Merge branch 'master' into consistent-terminology-format
|
2018-10-10 19:19:36 +09:00 |
|
smoogipoo
|
934b687965
|
Fix selection masks not being added for new objects
|
2018-10-03 16:49:59 +09:00 |
|