Commit Graph

5137 Commits

Author SHA1 Message Date
1cf8c0284a Re-namespace a few classes 2017-10-10 15:22:39 +09:00
166194e6b6 Further logic simplification 2017-10-10 15:09:26 +09:00
074a1db4a1 Implement scrolling and better zoom 2017-10-10 12:45:27 +09:00
cbae19b604 Fix BeatmapMetadata removing 2017-10-10 00:17:12 +03:00
ef417c6388 Small DB-related refactoring 2017-10-09 23:30:32 +03:00
41a90c8b11 Add missing eager loading 2017-10-09 23:28:28 +03:00
d1f02538cb Add tooltip to username in the profile overlay 2017-10-09 21:12:04 +03:00
d5892cf54e Add a bool to specify whether judgements should be visible for certain DrawableHitObjects 2017-10-09 20:17:05 +09:00
29c2a29798 Fix trimming too early in OsuLegacyDecoder crashing storyboards 2017-10-09 18:47:12 +09:00
cb58a1371e Merge branch 'editor-waveform' into editor-waveform-timeline
# Conflicts:
#	osu.Game/osu.Game.csproj
2017-10-09 18:10:52 +09:00
222d0c8694 Fix visual regressions in MedalOverlay 2017-10-09 17:52:48 +09:00
b97b575b27 Merge remote-tracking branch 'origin/master' into editor-waveform
# Conflicts:
#	osu-framework
2017-10-09 17:20:24 +09:00
19b38983df Update in-line with framework 2017-10-09 17:18:11 +09:00
81b9e08fb6 Fix foreign key constraint failure 2017-10-09 00:30:52 +03:00
5d27c66efa Use one DbContext with configured CommandTimeout for all stores 2017-10-08 18:18:28 +03:00
bd9f2db477 Trim line 2017-10-08 17:30:21 +09:00
6c5c734ff1 Trim end of line
Fix ArgumentOutOfRangeException when parsing http://osu.ppy.sh/osu/1004136
2017-10-08 09:42:09 +09:00
f3ca6cc387 remove redundant stuff 2017-10-06 22:02:33 +02:00
de2181b8f5 Merge branch 'master' of git://github.com/ppy/osu into direct-previews 2017-10-06 21:02:48 +02:00
5a8b8dacbb move stuff thats duplicated in PreviewButton and DirectPanel to PlayButton 2017-10-06 21:02:00 +02:00
10abaa866b Put screens below the top and bottom bars of the editor 2017-10-07 01:56:11 +09:00
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
d432ab7510 Reorder screen tab control items 2017-10-07 01:44:20 +09:00
38ae9d905e Fix bindable binding to make the editor load a screen by default again 2017-10-07 01:42:45 +09:00
837d1ba12e Remove rounded corners on the editor menu bar 2017-10-07 01:38:13 +09:00
d3109a5950 Hook up BeatmapPanel "Edit" item 2017-10-07 00:59:14 +09:00
a154ee3a89 Add File -> Exit to editor menu 2017-10-07 00:51:30 +09:00
fc99860f4e Remove EditorMenuBarItem 2017-10-07 00:51:20 +09:00
19c663da11 Remove scale effect on editor screen switches 2017-10-06 23:41:49 +08:00
55267abe67 Merge branch 'master' into editor-screens 2017-10-06 23:19:16 +08:00
95ac4e9265 Remove useless using 2017-10-06 04:57:46 +03:00
96fcc095eb Apply suggested shrinking bar changes 2017-10-06 04:49:16 +03:00
887aa7496b Rework EF Core usage in model classes 2017-10-06 00:23:26 +03:00
7926757898 Remove unneeded parens 2017-10-05 14:33:49 +09:00
0a9d23b4ba Update with framework changes (removal of WaveformDisplay) 2017-10-05 14:33:39 +09:00
2bc8fe027b Extend the testcase to test short breaks 2017-10-05 06:17:48 +03:00
5caca1d328 Don't use '#' in RankDisplay for now 2017-10-05 05:27:52 +03:00
cb0dbc6d9e Fix shrinking bar lingering on the screen for too long 2017-10-05 05:23:18 +03:00
cc99678a96 Remove useless usings 2017-10-05 05:09:23 +03:00
20bf0502ab Use scheduling rather than raw transform delays 2017-10-05 10:03:48 +08:00
22a59d753b Make all the overlays IStateful 2017-10-05 04:38:13 +03:00
6a4198d0d6 Initial EF Core commit 2017-10-04 22:52:12 +03:00
dcd5cc6753 Merge branch 'editor-waveform' into editor-waveform-timeline 2017-10-04 22:00:44 +09:00
8427bb44d1 Implement basic layout for the compose screen ScrollableTimeline 2017-10-04 22:00:42 +09:00
ea45452993 Allow resolution > 1 2017-10-04 21:57:46 +09:00
1377f73b46 Multiply resolution before clamping 2017-10-04 21:57:29 +09:00
80fb14e3dc Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-10-04 14:50:02 +03:00
8bc20a2545 Merge branch 'editor-waveform' into editor-waveform-timeline 2017-10-04 19:49:23 +09:00
8a52fdc8fa Use a bindable for the current screen in EditorMenuBar
Replaces the current Action.
2017-10-04 19:37:17 +09:00
34eede0d04 Re-namespace EditorScreenMode 2017-10-04 19:36:55 +09:00