Commit Graph

4035 Commits

Author SHA1 Message Date
3937ebdc3d Add missing license headers 2017-09-26 15:58:30 +09:00
b8b54e95a5 Merge branch 'master' into editor-timing-timeline 2017-09-26 15:54:01 +09:00
10e5fe40b2 A bit of cleanup 2017-09-26 15:51:45 +09:00
5953c1084e Re-namespace SummaryTimeline 2017-09-26 15:45:27 +09:00
85cb541fef Implement MarkerPart for the marker 2017-09-26 15:45:08 +09:00
a1f88a17b1 Re-namespace and split out timeline parts from the SummaryTimeline 2017-09-26 15:44:40 +09:00
f129902ee0 Avoid nullrefs when data is not present 2017-09-25 23:35:02 +08:00
2d4616fd43 Apply beatmap settings when creating the DrawableStoryboard. 2017-09-25 11:03:57 +02:00
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
0996867112 Move StoryboardReplacesBackground and StoryboardAspect properties to Storyboard. 2017-09-25 10:40:22 +02:00
7fb8008e44 Merge remote-tracking branch 'origin/master' into editor-timing-timeline
# Conflicts:
#	osu-framework
2017-09-25 17:20:55 +09:00
0aebfdd578 Merge branch 'master' into icons_jumping_fix 2017-09-25 12:07:25 +08:00
94269e119e Reset text only if it has been changed 2017-09-23 19:59:34 +03:00
0615f375e1 Show current grade 2017-09-23 19:52:44 +03:00
a69bef8ec0 Use existing enum instead of my own 2017-09-23 16:51:31 +03:00
2da3ea00b6 Bind break overlay to accuracy 2017-09-23 16:42:18 +03:00
2290c3d5d5 Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-23 15:48:29 +03:00
442259d9e0 Fix overlay toggling in song select. 2017-09-23 19:47:23 +08:00
ced6204219 oops 2017-09-22 22:10:05 +03:00
d73b40768e More arrow adjustments to match the design 2017-09-22 21:12:58 +03:00
92eb8e4fa9 Move blurred icons to a parallax container 2017-09-22 21:00:45 +03:00
6fe2b64abd Start breakOut animation a bit earlier 2017-09-22 20:50:00 +03:00
d58e5a6130 Arrows improvements 2017-09-22 20:43:51 +03:00
3202d35a79 Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-22 17:36:37 +03:00
56bde64839 Add arrows overlay 2017-09-22 01:16:05 +03:00
5383e33f3d Remove useless clock assignment 2017-09-21 22:58:49 +03:00
22ab2c5e5d Apply suggested changes 2017-09-21 22:54:46 +03:00
9667270336 Remove using 2017-09-21 01:56:50 +03:00
e051bcc6df Fix wrong arrows position on startup 2017-09-21 01:51:40 +03:00
c79568135a Add arrows 2017-09-21 01:44:30 +03:00
18a714df74 Move every class to it's own file 2017-09-20 22:33:07 +03:00
581689a84d CI fixes 2017-09-20 20:58:20 +03:00
4699a44608 Add info container 2017-09-20 20:50:14 +03:00
8d7db52200 Add remaining time counter 2017-09-20 19:45:38 +03:00
0f04d8c6a7 Add remaining time container 2017-09-20 15:58:28 +03:00
e65a17ad96 Remove redundant usings 2017-09-20 18:40:41 +09:00
7168e8fd99 Improve layout of bottom bar in the Editor 2017-09-20 18:16:03 +09:00
7588f1b6ca Add SummaryTimeline to Editor 2017-09-20 17:09:38 +09:00
f9568619e7 Move SummaryTimeline into /Edit/Components/SummaryTimeline 2017-09-20 16:59:03 +09:00
120446e4a7 Ensure only one dialog is being displayed by the SongSelect footer at a time
Fixes #1208
2017-09-20 14:32:15 +09:00
fcaabf7fdf Merge branch 'master' into storyboard_integration 2017-09-19 17:36:29 +02:00
1b0ab414fa Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-19 17:23:10 +03:00
1de8bca7f6 Merge remote-tracking branch 'refs/remotes/ppy/master' into icons_jumping_fix 2017-09-19 17:08:32 +03:00
6d3d485565 And then everything became one 2017-09-19 16:06:58 +09:00
02ccea1c4e Merge branch 'master' into scores-lookup-requires-id 2017-09-16 08:43:59 +09:00
429e7723b3 Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-15 19:40:30 +03:00
740e766201 BreakOverlay and LetterboxOverlay implementation 2017-09-15 19:39:55 +03:00
757a159516 Display a non-parallax background at the appropriate size when storyboards do not replace it. 2017-09-15 14:31:54 +02:00
f5368505ab Load the storyboard asynchronously if it wasn't loaded with the beatmap. 2017-09-15 11:58:37 +02:00
4a15762139 Don't create drawables for hidden storyboards. 2017-09-15 11:58:37 +02:00