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 |
|
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
|
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 |
|
smoogipoo
|
0bd35ab7bb
|
Turn on warnings, resolve issues
|
2019-04-25 17:36:17 +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 |
|
Dean Herbert
|
612db31c38
|
Apply newline additions
|
2019-04-01 12:16:32 +09:00 |
|
Dean Herbert
|
baea7230bc
|
Rename RulesetContainer to DrawableRuleset
|
2019-03-19 23:47:31 +09:00 |
|
Dean Herbert
|
d10ad3c8a7
|
Fix warnings
|
2019-02-28 18:59:05 +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 |
|
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 |
|
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 |
|
smoogipoo
|
bc3fcb87b7
|
Use input events rather than scene graph traversals
|
2018-11-30 15:47:55 +09:00 |
|
Dean Herbert
|
0ee5a5bdb4
|
Add support for keyboard seeking in the editor
|
2018-11-30 14:57:25 +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
|
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 |
|
ekrctb
|
50091252e2
|
Adapt signature change of event handlers
|
2018-10-02 12:02:55 +09:00 |
|
ekrctb
|
99fc04c8af
|
Change signature to new event handler
|
2018-10-02 12:02:47 +09:00 |
|
Dean Herbert
|
0f37758314
|
Update framework
|
2018-07-21 16:21:53 +09:00 |
|
Dean Herbert
|
fbc5250bf1
|
Update framework
|
2018-07-11 17:12:01 +09:00 |
|
Dean Herbert
|
5c63b3ddac
|
Merge pull request #2828 from smoogipoo/improve-editor-scrolling
Always perform non-seeked scroll in the editor while audio is playing
|
2018-06-21 17:24:15 +09:00 |
|
Dean Herbert
|
3819ecb2be
|
Update framework
|
2018-06-19 20:19:52 +09:00 |
|
smoogipoo
|
8c671f93fc
|
Always perform non-seeked scroll in the editor while audio is playing
|
2018-06-18 19:32:04 +09:00 |
|
smoogipoo
|
4086ff7313
|
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
# osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
# osu.Game/Screens/Menu/Intro.cs
# osu.Game/Screens/Menu/MenuSideFlashes.cs
|
2018-06-06 18:26:51 +09:00 |
|
Dean Herbert
|
64eda27547
|
Update framework
|
2018-06-03 03:05:53 +09:00 |
|
smoogipoo
|
a3470f9ec3
|
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
# osu.Game/Overlays/Music/PlaylistOverlay.cs
# osu.Game/Screens/OsuScreen.cs
|
2018-05-28 18:01:15 +09:00 |
|
Dean Herbert
|
699f661b02
|
Merge remote-tracking branch 'upstream/master' into AlFasGD-editor-seekbar-fix
|
2018-05-25 19:07:30 +09:00 |
|
smoogipoo
|
f1ac84d95b
|
Fix base.CreateLocalDependencies sometimes not being called
|
2018-05-24 13:03:25 +09:00 |
|
smoogipoo
|
8004b8af4d
|
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
|
2018-05-23 17:38:02 +09:00 |
|
Aergwyn
|
b7e3ea348b
|
expose two Bindables with split logic instead of one with mixed logic
|
2018-05-21 15:53:55 +02:00 |
|
Aergwyn
|
1482bca147
|
Rename for better understanding
ShowOverlays -> AllowOverlays
ShowOverlaysOnEnter -> HideOverlaysOnEnter
|
2018-05-21 09:42:29 +02:00 |
|
AlFasGD
|
dd9b9a18ac
|
Prevent user from scrolling outside the timeline in the editor
|
2018-05-08 16:21:54 +03:00 |
|
smoogipoo
|
674e45d49b
|
Fix beatmap/ruleset being changeable while in the editor
|
2018-05-07 16:32:15 +09:00 |
|
Dean Herbert
|
de85436534
|
Merge remote-tracking branch 'upstream/master' into peppy-async-screens
|
2018-04-20 16:52:58 +09:00 |
|
Dean Herbert
|
32a74f95a5
|
Normalize all the line endings
|
2018-04-13 18:26:38 +09:00 |
|
smoogipoo
|
a2484fbf56
|
Move back to DI-ing adjustable clock into SummaryTimeline
|
2018-04-12 13:37:02 +09:00 |
|
smoogipoo
|
9e8490735f
|
Fix Compose not binding to the editor's beat divisor
|
2018-04-06 18:22:24 +09:00 |
|
smoogipoo
|
c7abd56fc4
|
Give editor a custom clock to handle seeking
|
2018-04-06 18:11:37 +09:00 |
|
Dean Herbert
|
31ade986a7
|
Scren async changes in line with framework changes
Makes editor not stutter on load, amongst other screens.
|
2018-03-30 14:58:11 +09:00 |
|
smoogipoo
|
e25d1f6982
|
Pass down editor clocks through DI
|
2018-03-19 16:27:52 +09:00 |
|
smoogipoo
|
d05947ef48
|
Pass adjustable clocks to components, rather than relying on the track
|
2018-03-15 18:19:28 +09:00 |
|
smoogipoo
|
c8f6a6980b
|
Move clock construction to Editor
|
2018-03-15 17:27:37 +09:00 |
|
smoogipoo
|
5e742eb466
|
Move editor constructions to BDL load
|
2018-03-15 17:10:08 +09:00 |
|
Dean Herbert
|
37d393bca0
|
Update licence headers
|
2018-01-05 20:21:19 +09:00 |
|
Dean Herbert
|
71a94d6b44
|
Add a bindable Enabled flag to NotificationManager
Also better handles delays before notifications are displayed.
|
2017-12-25 20:53:23 +09:00 |
|
smoogipoo
|
2fb8895e66
|
Add spacer to menu
|
2017-12-21 19:57:09 +09:00 |
|
smoogipoo
|
b2c0b013aa
|
Remove migration setting in favour of export option in the editor
|
2017-12-21 19:56:12 +09:00 |
|
Dean Herbert
|
0f8499c580
|
Rename to PlaybackControl and add a TestCase
|
2017-11-22 11:22:46 +09:00 |
|
smoogipoo
|
0d1b5ae44f
|
Adjust bottom bar sizing as suggested
|
2017-11-21 17:51:07 +09:00 |
|
EVAST9919
|
ecc2877be6
|
Fix possible null and adjust timeline width
|
2017-11-20 09:29:26 +03:00 |
|
EVAST9919
|
58e7263108
|
CI fixes
|
2017-11-18 03:09:09 +03:00 |
|
EVAST9919
|
0b8fed4e5a
|
Remove useless Dimention params
|
2017-11-18 01:51:23 +03:00 |
|
EVAST9919
|
7492ab6495
|
Use GridContainer to place the bottom bar objects
|
2017-11-18 01:48:50 +03:00 |
|
EVAST9919
|
07e0aba01c
|
Remove using
|
2017-11-17 14:10:13 +03:00 |
|
EVAST9919
|
1680c0905f
|
Fix track tempo could be less than 1 on exiting the editor
|
2017-11-17 14:02:07 +03:00 |
|
EVAST9919
|
cc04d5bc61
|
Add all the objects to the PlaybackContainer
|
2017-11-17 13:35:41 +03:00 |
|
EVAST9919
|
d62da4334e
|
Add and place all the bottom bar objects
|
2017-11-17 12:26:13 +03:00 |
|
Dean Herbert
|
6fa02ce9bb
|
Use internal less
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
|
2017-11-01 17:10:54 +09:00 |
|
Dean Herbert
|
dc9c474033
|
Move all TestCases to Testing project
This allows tests to successfully retrieve rulesets, as they are referenced.
|
2017-10-23 19:32:02 +09:00 |
|
smoogipoo
|
10abaa866b
|
Put screens below the top and bottom bars of the editor
|
2017-10-07 01:56:11 +09:00 |
|
smoogipoo
|
a154ee3a89
|
Add File -> Exit to editor menu
|
2017-10-07 00:51:30 +09:00 |
|
smoogipoo
|
8a52fdc8fa
|
Use a bindable for the current screen in EditorMenuBar
Replaces the current Action.
|
2017-10-04 19:37:17 +09:00 |
|
smoogipoo
|
357a467337
|
Implement design mode
|
2017-10-04 19:24:19 +09:00 |
|
smoogipoo
|
cf44868bcd
|
Give EditorScreen a Beatmap
|
2017-10-04 15:02:11 +09:00 |
|
smoogipoo
|
7211dd2015
|
Remove unnecessary usings
|
2017-10-02 10:11:43 +09:00 |
|
smoogipoo
|
69b61a62a5
|
Implement base Compose screen
|
2017-10-02 10:09:21 +09:00 |
|
smoogipoo
|
91cede79c2
|
Mask the editor screens
|
2017-10-02 10:07:34 +09:00 |
|
smoogipoo
|
2a310f02bc
|
modeContainer -> screenContainer
|
2017-10-02 09:27:27 +09:00 |
|
smoogipoo
|
c2d63eb0bd
|
Add EditorScreen + screen changing functionality
|
2017-10-02 09:26:52 +09:00 |
|
smoogipoo
|
221902f4fe
|
Restructure Editor construction
|
2017-10-02 09:26:16 +09:00 |
|
smoogipoo
|
8ed23a60e9
|
Remove items from the editor menu bar
|
2017-10-02 09:10:40 +09:00 |
|
smoogipoo
|
545c375199
|
Update design of EditorMenuBar to match flyte's design more closely
|
2017-09-27 22:01:03 +09:00 |
|
smoogipoo
|
c578509a20
|
Bind to the screen Beatmap instead of the game-wide Beatmap
|
2017-09-26 17:58:40 +09:00 |
|
smoogipoo
|
5953c1084e
|
Re-namespace SummaryTimeline
|
2017-09-26 15:45:27 +09:00 |
|
smoogipooo
|
e65a17ad96
|
Remove redundant usings
|
2017-09-20 18:40:41 +09:00 |
|
smoogipooo
|
7168e8fd99
|
Improve layout of bottom bar in the Editor
|
2017-09-20 18:16:03 +09:00 |
|
smoogipooo
|
7588f1b6ca
|
Add SummaryTimeline to Editor
|
2017-09-20 17:09:38 +09:00 |
|
Dean Herbert
|
b9bec6a983
|
CI fixes
|
2017-09-07 23:06:35 +09:00 |
|
smoogipooo
|
b17d9ac06e
|
Move EditorMenuBar into the Edit namespace, and fix a minor styling issue.
|
2017-08-28 17:55:50 +09:00 |
|
Thomas Müller
|
c4619f614a
|
Merge branch 'master' of github.com:ppy/osu into better-transforms
# Conflicts:
# osu-framework
|
2017-07-19 19:15:51 +02:00 |
|
Dean Herbert
|
d0dea33faa
|
Make Beatmap (bindable) non-nullable.
|
2017-07-19 15:16:53 +09:00 |
|
Thomas Müller
|
a5e610a7ba
|
Update framework and fix compilation
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
|
2017-07-14 19:18:12 +03:00 |
|
Dean Herbert
|
64682a741c
|
Update framework
|
2017-06-08 17:05:25 +09:00 |
|
Huo Yaoyuan
|
8c991eae01
|
Fix CI issues.
|
2017-03-14 22:27:24 +08:00 |
|
Huo Yaoyuan
|
b2dd9afcf3
|
Update editor workflow and make edit button works.
|
2017-03-14 22:18:40 +08:00 |
|
Huo Yaoyuan
|
259d39c6ad
|
Stop playing the track in editor
to avoid unused member warning
|
2017-03-14 21:28:33 +08:00 |
|
Huo Yaoyuan
|
f97e8ae97f
|
Fix typo and warnings.
|
2017-03-14 21:20:38 +08:00 |
|
Huo Yaoyuan
|
618e8e822b
|
Implement EditSongSelect and MatchSongSelect.
|
2017-03-14 19:53:20 +08:00 |
|
Dean Herbert
|
0cad5d7d41
|
Fix most warnings.
|
2017-03-07 13:05:57 +09:00 |
|
Dean Herbert
|
e6ef9f67aa
|
GameMode -> Screen.
|
2017-02-17 19:23:58 +09:00 |
|
Dean Herbert
|
50bd80cb0c
|
Update and standardise license headers.
|
2017-02-07 14:27:41 +09:00 |
|
Dean Herbert
|
0f4538f69f
|
Rename GameModes namespace to Screens.
|
2016-11-14 17:23:33 +09:00 |
|