1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 16:27:26 +08:00
Commit Graph

1031 Commits

Author SHA1 Message Date
smoogipoo
4a5cd6520c Extract playfield scaling into a separate class
And make it more general.
2018-02-20 13:50:31 +09:00
smoogipoo
4898c321f8 Merge branch 'osu-rulesetcontainer-aspect' into editor-hitobject-movement 2018-02-19 17:07:03 +09:00
Dean Herbert
1b13be1372 Cleanups and xmldoc additions 2018-02-15 16:24:14 +09:00
Dean Herbert
a0a65abcac Crentalise all import logic 2018-02-15 14:22:39 +09:00
Dean Herbert
d340509b1d Move ArchiveReaders to a more global namespace
Also moves delete and action logic to a shared implementation
2018-02-15 14:22:39 +09:00
Dean Herbert
6ff63c2f0c Move deletion to ArchiveModelImportManager 2018-02-15 14:22:39 +09:00
Dean Herbert
e0d28564d0 Move import logic to shared implementation 2018-02-15 14:22:39 +09:00
Dean Herbert
58f20c3723
Merge branch 'master' into editor-hitobject-movement 2018-02-13 18:56:16 +09:00
Dean Herbert
a738664167 Add interface for database context factory 2018-02-12 23:10:05 +09:00
smoogipoo
87baa6febd Merge remote-tracking branch 'origin/master' into editor-pattern-adjustments 2018-02-12 19:08:13 +09:00
smoogipoo
c3212d36ef Remove handles for now (will be re-implemented) 2018-02-12 18:36:16 +09:00
smoogipoo
e10bb2db05 Unify SelectionLayer and HitObjectCapturer, rename SelectionBox 2018-02-12 18:35:01 +09:00
smoogipoo
20c0dee17d Remove SelectionInfo 2018-02-12 18:22:52 +09:00
smoogipoo
ee168f9a77 Split out drag selection box from post-capture box
Cleans up a lot of code, removes handles for now.
2018-02-12 18:20:05 +09:00
Dean Herbert
edc3638175 DatabaseWriteUsage 2018-02-12 17:55:11 +09:00
smoogipoo
1adbe3585c HitObjectSelectionBox -> SelectionDragger 2018-02-12 16:03:59 +09:00
smoogipoo
cfb2b3f1e8 Rework SelctionLayer to support click-selections 2018-02-12 16:02:42 +09:00
Dean Herbert
db654004b7 Move BeatmapManagerWorkingBeatmap to its own file 2018-02-09 19:32:18 +09:00
Dean Herbert
534eb223b3
Merge branch 'master' into unified-hitwindows 2018-02-08 17:46:29 +09:00
Dean Herbert
789e25069f Fix non-visual tests not cleaning up previous executions 2018-02-08 17:07:59 +09:00
smoogipoo
beaecbafbd Merge branch 'master' into unified-hitwindows 2018-02-08 13:22:44 +09:00
Dean Herbert
dfc344b47a Update OpenTK version 2018-02-06 13:47:54 +09:00
Dean Herbert
6b35ef7063 Update OpenTK version 2018-02-05 16:13:30 +09:00
smoogipoo
a0c1662fb7 Move mania's HitWindows to osu.Game 2018-02-02 17:52:55 +09:00
smoogipoo
13f16077d4 Implement Catmull-Rom curve approximator 2018-02-01 20:04:41 +09:00
Dan Balasescu
c1d5a68e4d
Merge branch 'master' into VisualSettingsOverlay 2018-02-01 16:37:04 +09:00
Dan Balasescu
d332a2dddd
Merge branch 'master' into url-parsing-support 2018-02-01 16:13:32 +09:00
Dean Herbert
042a34e1c2 Add migration to ensure database aligns to changed enum 2018-01-31 16:10:48 +09:00
Dean Herbert
28b67e3d77
Merge branch 'master' into url-parsing-support 2018-01-30 17:47:55 +09:00
smoogipoo
b4cd8ea716 GlobalKeyBindingContainer -> GlobalActionContainer
Consitent with "FrameworkActionContainer".
2018-01-30 14:54:30 +09:00
smoogipoo
ef3fb8c05a InputManager -> Container where KeyBindings are involved 2018-01-30 14:49:12 +09:00
Dean Herbert
0879366a30 Merge remote-tracking branch 'upstream/master' into add-r#-annotation-support 2018-01-29 13:52:21 +09:00
Dean Herbert
2b14438fe4 Merge remote-tracking branch 'upstream/master' into url-parsing-support 2018-01-29 12:55:32 +09:00
Dean Herbert
247833174c Fix incorrect case on migration file 2018-01-27 23:20:49 +09:00
Dean Herbert
a5b0d51205 Merge remote-tracking branch 'upstream/master' into url-parsing-support
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-01-27 14:06:58 +09:00
TocoToucan
615c831069 Merge from ppy/master 2018-01-26 21:56:17 +03:00
FreezyLemon
8f0ab2040f Add Jetbrains.Annotations NuGet package 2018-01-26 12:46:28 +01:00
Dean Herbert
03154dbc63 Fix incorrect initial migration
Also adds variant to settings
2018-01-25 23:41:03 +09:00
Dean Herbert
53c6526b22 Remove unused code file 2018-01-24 18:04:54 +09:00
Dean Herbert
5a00ae36d1 Add database-based configuration for rulesets 2018-01-24 17:45:28 +09:00
TocoToucan
e88f514cf4 Resolve merge conflicts 2018-01-21 18:32:21 +03:00
smoogipoo
0b7e1ce667 Add a way to have ruleset-specific configs 2018-01-17 19:45:18 +09:00
Dean Herbert
54b0f4b912 Merge branch 'master' into url-parsing-support 2018-01-17 16:16:55 +09:00
TocoToucan
a81f32a388 PlayerGroup -> PlayerSettingsGroup 2018-01-15 20:52:52 +03:00
Dean Herbert
0796d33e66
Merge branch 'master' into fix-skipbutton-ordering 2018-01-15 15:54:18 +09:00
smoogipoo
43f8a8e8c5 Rename OsuCursorVisualiser -> CursorOverrideContainer 2018-01-15 14:00:13 +09:00
TocoToucan
6e35484160 Fix osu.Game.csproj which was broken during resolving merge conflict 2018-01-13 23:09:43 +03:00
TocoToucan
43d2ae348a Rename ReplaySomething -> PlayerSomething 2018-01-13 22:25:09 +03:00
smoogipoo
78441c05cb OsuCursorContainer -> OsuCursorVisualiser 2018-01-12 19:45:09 +09:00
smoogipoo
16d739580b IProvideLocalCursor -> IProvideCursor 2018-01-12 19:37:03 +09:00