Dean Herbert
8f78d84ad6
Make intro resume slower
2017-11-02 21:52:23 +09:00
Dean Herbert
c99ffb4aa3
Fix potential nullref
2017-11-02 21:52:12 +09:00
Dean Herbert
9b2d41f4eb
Fix quick retry looking bad
2017-11-02 21:52:01 +09:00
Dean Herbert
b8b05fe8d2
Make the osu! logo shared game-wide
...
There should only ever be one osu! logo. It is now passed around between screens in a superfluous manner.
2017-11-02 20:38:02 +09: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
5001e9f264
Fix Hide/Restore/Delete etc.
2017-10-25 22:08:34 +09:00
Dean Herbert
26d8b67f25
Merge branch 'master' into config-slider-keyboardstep
2017-10-24 08:14:56 +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
Shane Woolcock
ea2934d92c
Add KeyboardStep values for configuration options
2017-10-23 16:06:08 +10:30
Dean Herbert
f69fa0cf1f
Fix selection after hiding all difficulties in a set
2017-10-20 11:16:56 +09:00
Dean Herbert
5d5ea5fb2e
Fix all remaining db structure issues
2017-10-19 14:05:11 +09:00
Dean Herbert
a85de09c0f
Fix beatmap carousel interactions with deletion when not yet displayed
2017-10-18 18:36:35 +09:00
Dean Herbert
2f3319552d
Merge remote-tracking branch 'upstream/master' into EfCore
2017-10-18 11:43:37 +09:00
EVAST9919
bae91d7de7
Simplify gradient usage in Letterbox Overlay
2017-10-18 05:06:17 +03:00
Dean Herbert
31dc5c97f2
Fix intro and duplicate inserts
2017-10-17 11:22:42 +09:00
Huo Yaoyuan
c2836a8393
Use format string for double instead of Math.Round.
2017-10-16 12:59:59 +09:00
Huo Yaoyuan
9b3676c562
Use format string for double instead of Math.Round.
2017-10-15 16:44:15 +08:00
smoogipoo
9924f518b7
Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore
...
# Conflicts:
# osu-framework
# osu.Game/Beatmaps/BeatmapMetadata.cs
# osu.Game/osu.Game.csproj
# osu.Game/packages.config
2017-10-14 16:36:37 +09:00
smoogipoo
b178be21d1
Let's not rename columns yet
2017-10-14 14:30:58 +09:00
smoogipoo
b83d7cd4df
Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore
...
# Conflicts:
# osu-framework
# osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
# osu.Game/Beatmaps/BeatmapInfo.cs
# osu.Game/Online/API/Requests/GetBeatmapSetsResponse.cs
2017-10-14 12:38:59 +09:00
Dean Herbert
cd722e4abb
Fix beatmap author being stored in two different places
2017-10-14 11:39:55 +09:00
Dean Herbert
c0d64bf409
Use Gray instead of FromHex for grays
2017-10-12 22:19:29 +09:00
Dean Herbert
37fc69b9f7
Set a default zoom level that isn't the whole track
2017-10-12 22:19:02 +09:00
Dean Herbert
37b88d834e
Adjust padding slightly
2017-10-12 22:10:37 +09:00
smoogipoo
ab62390336
Make TimelineButtons combined take up the full height of the timeline
2017-10-12 18:32:39 +09:00
smoogipoo
a6901c0a27
Change TimelineButton icon colour to white when hovered
2017-10-12 18:17:36 +09:00
smoogipoo
5ccfc1918e
Hook up more bindables for hitobjects/hitsounds
2017-10-12 17:51:01 +09:00
smoogipoo
db672becbc
Implement waveform checkbox
2017-10-12 17:50:51 +09:00
smoogipoo
3c35a7a6ae
graph -> waveform
2017-10-12 17:37:40 +09:00
smoogipoo
4586877239
Implement magnification buttons
2017-10-12 17:31:21 +09:00
smoogipoo
de8f9325a3
Implement TimelineButton and use for the magnification buttons
2017-10-12 16:10:33 +09:00
smoogipoo
2844764e3c
Hit Objects/Hit Sounds -> Hitobjects/Hitsounds
2017-10-12 15:37:45 +09:00
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
TocoToucan
4653470779
Fix RulesetStore preparation
2017-10-10 22:29:16 +03:00
TocoToucan
8b01f8671f
Merge from ppy/master
2017-10-10 21:07:36 +03: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
TocoToucan
81b9e08fb6
Fix foreign key constraint failure
2017-10-09 00:30:52 +03: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
d3109a5950
Hook up BeatmapPanel "Edit" item
2017-10-07 00:59:14 +09:00
smoogipoo
a154ee3a89
Add File -> Exit to editor menu
2017-10-07 00:51:30 +09:00
