1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 15:42:54 +08:00
Commit Graph

835 Commits

Author SHA1 Message Date
smoogipoo
e12fa49436 Integrate timeline into Compose 2017-10-12 15:37:00 +09:00
smoogipoo
6fbf52c3eb Remove unused usings 2017-10-12 15:32:18 +09:00
smoogipoo
1cf8c0284a Re-namespace a few classes 2017-10-10 15:22:39 +09:00
smoogipoo
166194e6b6 Further logic simplification 2017-10-10 15:09:26 +09:00
smoogipoo
074a1db4a1 Implement scrolling and better zoom 2017-10-10 12:45:27 +09:00
smoogipoo
cb58a1371e Merge branch 'editor-waveform' into editor-waveform-timeline
# Conflicts:
#	osu.Game/osu.Game.csproj
2017-10-09 18:10:52 +09:00
smoogipoo
b97b575b27 Merge remote-tracking branch 'origin/master' into editor-waveform
# Conflicts:
#	osu-framework
2017-10-09 17:20:24 +09:00
smoogipoo
19b38983df Update in-line with framework 2017-10-09 17:18:11 +09:00
smoogipoo
10abaa866b Put screens below the top and bottom bars of the editor 2017-10-07 01:56:11 +09:00
smoogipoo
c0b394811f Make compose mode the default
Hopefully we can keep this at a ScreenSelectionTabControl level, but it may need to be moved to the Editor at some point. I'm leaving that for a future change however, if it's needed.
2017-10-07 01:46:54 +09:00
smoogipoo
d432ab7510 Reorder screen tab control items 2017-10-07 01:44:20 +09:00
smoogipoo
38ae9d905e Fix bindable binding to make the editor load a screen by default again 2017-10-07 01:42:45 +09:00
smoogipoo
837d1ba12e Remove rounded corners on the editor menu bar 2017-10-07 01:38:13 +09:00
smoogipoo
a154ee3a89 Add File -> Exit to editor menu 2017-10-07 00:51:30 +09:00
smoogipoo
fc99860f4e Remove EditorMenuBarItem 2017-10-07 00:51:20 +09:00
Dean Herbert
19c663da11 Remove scale effect on editor screen switches 2017-10-06 23:41:49 +08:00
smoogipoo
0a9d23b4ba Update with framework changes (removal of WaveformDisplay) 2017-10-05 14:33:39 +09:00
smoogipoo
dcd5cc6753 Merge branch 'editor-waveform' into editor-waveform-timeline 2017-10-04 22:00:44 +09:00
smoogipoo
8427bb44d1 Implement basic layout for the compose screen ScrollableTimeline 2017-10-04 22:00:42 +09:00
smoogipoo
ea45452993 Allow resolution > 1 2017-10-04 21:57:46 +09:00
smoogipoo
1377f73b46 Multiply resolution before clamping 2017-10-04 21:57:29 +09:00
smoogipoo
8bc20a2545 Merge branch 'editor-waveform' into editor-waveform-timeline 2017-10-04 19:49:23 +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
34eede0d04 Re-namespace EditorScreenMode 2017-10-04 19:36:55 +09:00
smoogipoo
e2824d4732 Reduce harshness of scale for now
Though I don't feel like we should worry about this much just yet until we have actual designs and can see how it looks. It's very well possible that we use different transitions here...
2017-10-04 19:26:26 +09:00
smoogipoo
357a467337 Implement design mode 2017-10-04 19:24:19 +09:00
smoogipoo
5ca4a2d2c8 Add some nullchecks to WaveformDisplay 2017-10-04 19:09:39 +09:00
smoogipoo
81960c7b48 CI fixes 2017-10-04 19:03:02 +09:00
smoogipoo
80e984f72d Update in-line with framework 2017-10-04 18:55:38 +09:00
smoogipoo
01c839eda7 Move WaveformDisplay into separate class and add some commenting 2017-10-04 17:51:28 +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
af4c6276e4 Adjust transforms of EditorScreen 2017-10-02 10:09:10 +09:00
smoogipoo
91cede79c2 Mask the editor screens 2017-10-02 10:07:34 +09:00
smoogipoo
6018b4e5e4 Make EditorScreen a Container 2017-10-02 09:34:51 +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
7b1ef53f36 Expose a mode change event from EditorMenuBar 2017-10-02 09:24:25 +09:00
smoogipoo
8ed23a60e9 Remove items from the editor menu bar 2017-10-02 09:10:40 +09:00
smoogipoo
21c6a63fa1 Use using for Description 2017-09-29 20:03:09 +09:00
smoogipoo
7b4348254c Don't use new 2017-09-29 20:02:55 +09:00
smoogipoo
775e8bada5 Make the background bottom corners look nice with the new hover functionality 2017-09-29 15:13:38 +09:00
smoogipoo
b2eab1f435 Set the hover background colour as dictated by flyte 2017-09-29 15:09:56 +09:00
smoogipoo
6bb5210c7c Remove the parentSizedBox 2017-09-29 15:09:28 +09:00
smoogipoo
95364d0173 No more box background 2017-09-27 22:15:11 +09:00
smoogipoo
ba8bf6cbd5 Add ScreenSelectionTabControl to EditorMenuBar 2017-09-27 22:01:53 +09:00
smoogipoo
545c375199 Update design of EditorMenuBar to match flyte's design more closely 2017-09-27 22:01:03 +09:00
Dean Herbert
e64860ad45 Fix test case not working as expected 2017-09-27 12:46:34 +08:00
Dean Herbert
faad3fc7d3 Arbitrarily move colour assignment 2017-09-27 12:40:32 +08:00
Dean Herbert
d5ed218488 Fix timeline sizes being updated potentially before the track has a length 2017-09-27 11:07:43 +08:00
Dean Herbert
7ad21d9a6d Simplify marker part construction 2017-09-27 11:07:23 +08:00
Dean Herbert
eae29820c0 Fix marker being cleared each beatmap change 2017-09-27 11:07:17 +08:00
Dean Herbert
708632bca8 Remove second unnecessary colour set 2017-09-27 10:06:36 +08:00
smoogipoo
10dbd68c1e Simplify null check 2017-09-26 20:11:45 +09:00
smoogipoo
c578509a20 Bind to the screen Beatmap instead of the game-wide Beatmap 2017-09-26 17:58:40 +09:00
smoogipoo
3937ebdc3d Add missing license headers 2017-09-26 15:58:30 +09:00
smoogipoo
10e5fe40b2 A bit of cleanup 2017-09-26 15:51:45 +09:00
smoogipoo
5953c1084e Re-namespace SummaryTimeline 2017-09-26 15:45:27 +09:00
smoogipoo
85cb541fef Implement MarkerPart for the marker 2017-09-26 15:45:08 +09:00
smoogipoo
a1f88a17b1 Re-namespace and split out timeline parts from the SummaryTimeline 2017-09-26 15:44:40 +09:00
smoogipoo
d787c740fa Fix bookmarks not working
We should be dealing with the array in every situation, with the exception of the database.
2017-09-25 17:46:51 +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
smoogipooo
f9568619e7 Move SummaryTimeline into /Edit/Components/SummaryTimeline 2017-09-20 16:59:03 +09:00
Dean Herbert
b9bec6a983 CI fixes 2017-09-07 23:06:35 +09:00
Dean Herbert
41398f57d6 Changes in line with framework 2017-09-07 20:36:32 +09:00
smoogipooo
06fac913bf Re-implement EditorMenuBar. 2017-09-06 21:14:29 +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
Thomas Müller
c6d688898f Initial implementation of a beatmap carousell and various minor improvements to song select.
No big optimizations yet, but groundwork is laid out.
2016-11-20 20:34:16 +01:00
Dean Herbert
0f4538f69f Rename GameModes namespace to Screens. 2016-11-14 17:23:33 +09:00