RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,833 Commits 3 Branches 650 Tags 350 MiB
Commit Graph

1684 Commits

Author SHA1 Message Date
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
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
Dean Herbert 55267abe67 Merge branch 'master' into editor-screens 2017-10-06 23:19:16 +08:00
EVAST9919 95ac4e9265 Remove useless using 2017-10-06 04:57:46 +03:00
EVAST9919 96fcc095eb Apply suggested shrinking bar changes 2017-10-06 04:49:16 +03:00
TocoToucan 887aa7496b Rework EF Core usage in model classes 2017-10-06 00:23:26 +03:00
smoogipoo 0a9d23b4ba Update with framework changes (removal of WaveformDisplay) 2017-10-05 14:33:39 +09:00
EVAST9919 5caca1d328 Don't use '#' in RankDisplay for now 2017-10-05 05:27:52 +03:00
EVAST9919 cb0dbc6d9e Fix shrinking bar lingering on the screen for too long 2017-10-05 05:23:18 +03:00
EVAST9919 cc99678a96 Remove useless usings 2017-10-05 05:09:23 +03:00
Dean Herbert 20bf0502ab Use scheduling rather than raw transform delays 2017-10-05 10:03:48 +08:00
EVAST9919 22a59d753b Make all the overlays IStateful 2017-10-05 04:38:13 +03:00
TocoToucan 6a4198d0d6 Initial EF Core commit 2017-10-04 22:52:12 +03: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