1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-18 03:43:22 +08:00
Commit Graph

933 Commits

Author SHA1 Message Date
smoogipoo
c2f3c0e6df Add TestCaseIconButton to demonstrate IconButton usages 2017-10-10 18:32:09 +09:00
smoogipoo
1cf8c0284a Re-namespace a few classes 2017-10-10 15:22:39 +09:00
EVAST9919
0baceaaf0d Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-10 00:56:54 +03:00
TocoToucan
cbae19b604 Fix BeatmapMetadata removing 2017-10-10 00:17:12 +03: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
Jorolf
de2181b8f5 Merge branch 'master' of git://github.com/ppy/osu into direct-previews 2017-10-06 21:02:48 +02:00
Jorolf
5a8b8dacbb move stuff thats duplicated in PreviewButton and DirectPanel to PlayButton 2017-10-06 21:02:00 +02:00
EVAST9919
402531d04c Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-06 20:37:59 +03:00
smoogipoo
fc99860f4e Remove EditorMenuBarItem 2017-10-07 00:51:20 +09:00
Dean Herbert
55267abe67 Merge branch 'master' into editor-screens 2017-10-06 23:19:16 +08:00
EVAST9919
0ec7d2dcf6 Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-06 15:56:08 +03:00
smoogipoo
0a9d23b4ba Update with framework changes (removal of WaveformDisplay) 2017-10-05 14:33:39 +09:00
EVAST9919
6fa45aafc6 Basic logic 2017-10-04 23:06:31 +03:00
TocoToucan
6a4198d0d6 Initial EF Core commit 2017-10-04 22:52:12 +03:00
smoogipoo
8427bb44d1 Implement basic layout for the compose screen ScrollableTimeline 2017-10-04 22:00:42 +09:00
smoogipoo
8bc20a2545 Merge branch 'editor-waveform' into editor-waveform-timeline 2017-10-04 19:49:23 +09:00
smoogipoo
34eede0d04 Re-namespace EditorScreenMode 2017-10-04 19:36:55 +09:00
smoogipoo
357a467337 Implement design mode 2017-10-04 19:24:19 +09:00
smoogipoo
01c839eda7 Move WaveformDisplay into separate class and add some commenting 2017-10-04 17:51:28 +09:00
smoogipoo
1a7e3fa09e Initial implementation of a test case which showcases waveforms 2017-10-04 17:51:27 +09:00
EVAST9919
b94c78e993 Hide/Show Replay settings on pressing Ctrl+H 2017-10-02 19:33:58 +03:00
smoogipoo
69b61a62a5 Implement base Compose screen 2017-10-02 10:09:21 +09:00
smoogipoo
c2d63eb0bd Add EditorScreen + screen changing functionality 2017-10-02 09:26:52 +09:00
smoogipoo
2a9edcbb4f Add test case for the editor 2017-10-02 08:11:02 +09:00
EVAST9919
2f852d705e Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-10-01 23:10:49 +03:00
Jorolf
259d49e6b9 Merge branch 'master' of git://github.com/ppy/osu into direct-previews 2017-09-29 23:09:33 +02:00
Jorolf
647304c14b move logic to DirectPanel and reuse stuff for the PreviewButton 2017-09-29 23:08:30 +02:00
Dean Herbert
eed358a2c1 Merge branch 'master' into editor-screen-selection 2017-09-29 18:24:46 +08:00
EVAST9919
e7632b6e6f Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-28 14:44:31 +03:00
Dean Herbert
4eaf6b4b94 Remove single usage of dynamic and stop referencing Microsoft.CSharp.dll 2017-09-28 00:14:04 +08:00
smoogipoo
ba8bf6cbd5 Add ScreenSelectionTabControl to EditorMenuBar 2017-09-27 22:01:53 +09:00
EVAST9919
3cd6319ffa Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-27 00:32:38 +03:00
Jorolf
355a7b6649 Merge branch 'master' of git://github.com/ppy/osu into direct-previews 2017-09-26 12:22:11 +02:00
Dan Balasescu
b8b54e95a5 Merge branch 'master' into editor-timing-timeline 2017-09-26 15:54:01 +09:00
smoogipoo
5953c1084e Re-namespace SummaryTimeline 2017-09-26 15:45:27 +09:00
smoogipoo
85cb541fef Implement MarkerPart for the marker 2017-09-26 15:45:08 +09:00
smoogipoo
a1f88a17b1 Re-namespace and split out timeline parts from the SummaryTimeline 2017-09-26 15:44:40 +09:00
Dean Herbert
40f597f762 Add download button to grid view panels 2017-09-26 00:18:35 +08:00
Dean Herbert
5be11f539b Rename to BeatmapSetOverlay 2017-09-25 17:26:27 +08:00
smoogipoo
7fb8008e44 Merge remote-tracking branch 'origin/master' into editor-timing-timeline
# Conflicts:
#	osu-framework
2017-09-25 17:20:55 +09:00
Dean Herbert
b83596b44d Merge branch 'master' into online-beatmap-set-overlay 2017-09-25 16:15:58 +08:00
EVAST9919
2da3ea00b6 Bind break overlay to accuracy 2017-09-23 16:42:18 +03:00
MrTheMake
0a27916761 Added infoMessage class to the project, use the class for the /help command and handle command parameter better 2017-09-22 15:31:30 +02:00
EVAST9919
56bde64839 Add arrows overlay 2017-09-22 01:16:05 +03:00
Jorolf
72141935e8 make pagination work and remove duplication in RanksSection 2017-09-21 22:07:23 +02:00
DrabWeb
cb4818e84e Merge https://github.com/ppy/osu into online-beatmap-set-overlay 2017-09-21 14:25:34 -03:00
EVAST9919
c79568135a Add arrows 2017-09-21 01:44:30 +03:00
EVAST9919
18a714df74 Move every class to it's own file 2017-09-20 22:33:07 +03:00
smoogipooo
f9568619e7 Move SummaryTimeline into /Edit/Components/SummaryTimeline 2017-09-20 16:59:03 +09:00
smoogipooo
5978668d2b Mini -> Summary 2017-09-20 16:48:30 +09:00
smoogipooo
fd278256ad EditorTimingTimeline -> EditorMiniTimeline 2017-09-20 15:50:32 +09:00
Jorolf
5b90f45691 Merge branch 'master' of git://github.com/ppy/osu into ranks-section 2017-09-19 21:26:05 +02:00
jorolf
ce4a44000f Merge branch 'master' into direct-previews 2017-09-19 19:25:41 +02:00
EVAST9919
4cf88c72bf Move testcase to the correct project 2017-09-19 17:37:34 +03:00
EVAST9919
c59d398aa5 Fix includes 2017-09-19 17:26:17 +03:00
EVAST9919
1b0ab414fa Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-19 17:23:10 +03:00
smoogipooo
67d3861226 Initial implementation of the EditorTimingTimeline in TestCaseEditorTimingTimeline
Will probably rename this to MiniTimeline or something... But the basic structure is there plus most of functionality minus keyboard input.
2017-09-19 23:09:08 +09:00
Dean Herbert
511874389a Define trace for VisualTests 2017-09-19 16:07:00 +09:00
Dean Herbert
1f20c5eb69 Optimise project references 2017-09-19 16:07:00 +09:00
Dean Herbert
6db705a3a8 Update relative paths 2017-09-19 16:06:58 +09:00
Dean Herbert
6d3d485565 And then everything became one 2017-09-19 16:06:58 +09:00
Jorolf
f8b09df13c Merge branch 'master' of git://github.com/ppy/osu into direct-previews 2017-09-17 22:40:14 +02:00
Jorolf
be1e868a2a add previews to osu!direct 2017-09-17 22:39:34 +02:00
EVAST9919
740e766201 BreakOverlay and LetterboxOverlay implementation 2017-09-15 19:39:55 +03:00
Dean Herbert
98b847b025 Add API retrieval support 2017-09-14 20:08:07 +09:00
Dean Herbert
9c4876d135 Merge remote-tracking branch 'upstream/master' into ranks-section 2017-09-14 18:52:44 +09:00
Dean Herbert
02fa9eeb3b Merge branch 'master' into online-beatmap-set-overlay 2017-09-14 16:52:44 +09:00
Dean Herbert
33d33a49ae Merge branch 'master' into storyboards 2017-09-14 16:06:19 +09:00
Dean Herbert
fb7740a3ab Update all dependencies in line with framework 2017-09-13 20:25:40 +09:00
Damnae
bab3ef0669 Rename storyboard classes. 2017-09-13 11:22:24 +02:00
DrabWeb
08b5d4e16c Merge https://github.com/ppy/osu into online-beatmap-set-overlay 2017-09-12 21:26:06 -03:00
Dean Herbert
28a25c201f Merge remote-tracking branch 'upstream/master' into ranks-section 2017-09-12 19:50:58 +09:00
Damnae
47cd1d486b Merge branch 'master' into storyboards 2017-09-11 12:29:19 +02:00
DrabWeb
43fa314fe0 Details and more data displaying. 2017-09-11 02:48:48 -03:00
Dean Herbert
5ce76d8023 Merge remote-tracking branch 'upstream/master' into judgement-revamp 2017-09-11 14:36:51 +09:00
DrabWeb
e61ab72c0d Merge https://github.com/ppy/osu into online-beatmap-set-overlay 2017-09-11 01:24:52 -03:00
Dean Herbert
7170fbd087 Target .NET 4.6.1 2017-09-11 12:39:00 +09:00
Dean Herbert
6d33e39c5e Merge branch 'master' into beatmap-details-rewrite 2017-09-10 11:26:00 +09:00
Damnae
bc01d9a1b0 Animate Additive / FlipH and FlipV. 2017-09-09 15:41:56 +02:00
DrabWeb
1d3139d3c3 Basic layout. 2017-09-08 18:32:07 -03:00
naoey
20f93c83d6
Make downloads happen in BeatmapManager. 2017-09-09 00:57:40 +05:30
Damnae
e63fb5720c Make CI happy. 2017-09-08 13:04:53 +02:00
Damnae
e547416193 Storyboards implementation. 2017-09-08 09:08:52 +02:00
DrabWeb
109531b66c Cleanup, remove unneeded files. 2017-09-07 15:21:18 -03:00
DrabWeb
5e685ff5b1 Rewrite BeatmapDetails to be more modular for future code sharing. 2017-09-07 14:53:53 -03:00
smoogipooo
e85d511645 No more partial judgements. 2017-09-06 17:48:01 +09:00
Dean Herbert
d7d0e96e6b Merge branch 'master' into ranks-section 2017-09-01 18:46:53 +09:00
smoogipooo
b17d9ac06e Move EditorMenuBar into the Edit namespace, and fix a minor styling issue. 2017-08-28 17:55:50 +09:00
smoogipooo
fc6c682d88 Update in-line with framework changes. 2017-08-28 14:42:52 +09:00
smoogipooo
4fb9570618 Create IHasOsuContextMenu and update OsuContextMenuContainer in line with framework. 2017-08-25 15:10:29 +09:00
Dean Herbert
307c4dd392 Merge branch 'master' into direct-downloads 2017-08-24 21:30:38 +09:00
Dean Herbert
9adff5f697 Add osu!direct toggle to toolbar 2017-08-24 20:18:47 +09:00
Dean Herbert
36629f5207 Make ProgressBar usable in more places than just MusicController 2017-08-24 18:51:34 +09:00
Dean Herbert
189988236b Move PlayerInputManager logic inside RulesetInputManager 2017-08-24 15:23:17 +09:00
smoogipooo
c1860f2ce2 Make KeyBindingOverlay support variants as settings sub sections. 2017-08-23 12:49:30 +09:00
Dean Herbert
250fb33fbc Merge branch 'master' into ranks-section 2017-08-22 12:46:28 +09:00
Dean Herbert
102caf4b91 Merge branch 'master' into chat-local-echo-v2 2017-08-21 18:27:32 +09:00
Dean Herbert
877c69d5fe Add local chat echo support 2017-08-21 17:43:26 +09:00
Dean Herbert
16e96888ab Update KeyCounterCollection to support action-based buttons 2017-08-21 12:39:22 +09:00
Dean Herbert
3df51540e1 Code review fixes 2017-08-16 17:39:57 +09:00
Dean Herbert
dc82a88bb8 Improve namespaces of key bindings 2017-08-16 17:24:01 +09:00
Dean Herbert
9c75df884f Add initial implementation of KeyConfiguration overlay 2017-08-16 00:17:33 +09:00
Dean Herbert
7c9d6c9c83 Initial refactoring of key binding logic 2017-08-14 20:19:25 +09:00
Dean Herbert
66fa84a451 Make settings more modular 2017-08-14 13:09:59 +09:00
Dean Herbert
48d4ed55e9 Move a lot of code to framework 2017-08-11 16:11:46 +09:00
Dean Herbert
a93a92a2bb Remove GlobalHotkeys 2017-08-10 19:52:45 +09:00
Dean Herbert
798fff00b2 Remove shortcomings, remove InputState.Data usage, make everything amazing
No more casting!
2017-08-10 19:28:24 +09:00
Dean Herbert
1fe273cbc0 Move GameplayCursor to osu! ruleset and make work with OsuActions 2017-08-10 18:37:41 +09:00
Dean Herbert
c82db54fb5 Rename OsuAction to GlobalAction 2017-08-10 17:22:08 +09:00
Dean Herbert
30bd1d70b5 ActionMapping doesn't support concurrent actions by default
But can when required. Also supports key combination bindings now.
2017-08-10 16:08:43 +09:00
jorolf
934c2a1dc8 Merge branch 'master' into ranks-section 2017-08-09 18:47:25 +02:00
Dean Herbert
34b12fbfa4 Add global actions; improve default assignment 2017-08-09 17:10:32 +09:00
Dean Herbert
c70f96a9cd Add basic documentation and split out classes. 2017-08-09 14:50:10 +09:00
Dean Herbert
723e27353c HitRenderer -> RulesetContainer 2017-08-09 13:28:29 +09:00
Dean Herbert
b88f37de45 Add custom actions for Catch
Reworks input management for rulesets
2017-08-09 11:50:34 +09:00
Jorolf
7d7cfe5d92 Merge branch 'master' of git://github.com/ppy/osu into ranks-section 2017-08-08 23:13:25 +02:00
Jorolf
1c2329f111 generalize the hover code 2017-08-08 23:11:46 +02:00
smoogipooo
62ee613da3 Merge remote-tracking branch 'origin/master' into timingchange-improvements 2017-08-07 17:35:53 +09:00
smoogipooo
933740664c SpeedAdjustedHitRenderer -> ScrollingHitRenderer for consistent naming. 2017-08-07 16:43:54 +09:00
Dean Herbert
e75f438c29 Add difficulty application mods
Also fixes circular references when using IJsonSerializable.
2017-08-07 08:54:54 +09:00
smoogipooo
b1d25ed388 Implement ScrollingPlayfield, now containing ScrollingHitObjectContainer (prev. SpeedAdjustmentCollection).
Also removing a lot of mania code relating to gravity mod for now.
2017-08-04 23:07:08 +09:00
smoogipooo
54503eef71 Rename *ScrollingDrawableTimingSection -> *ScrollingContainer, move LinearScrollingContainer to osu.Game, make SpeedAdjustmentContainer non-abstract. 2017-08-04 22:50:29 +09:30
smoogipooo
0f901c99a0 Implement SpeedAdjustedPlayfield and a new HitRenderer derivation. 2017-08-04 20:11:18 +09:30
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
Dean Herbert
57d45b180c Merge remote-tracking branch 'upstream/master' into import-from-stable 2017-07-31 17:31:10 +09:00
Dean Herbert
17c5bdbc92 Merge branch 'master' into fix-notification-threading 2017-07-31 16:33:34 +09:00
Jorolf
4720a47363 Merge branch 'master' of git://github.com/ppy/osu into ranks-section 2017-07-29 00:45:14 +02:00
Jorolf
88f206cfe4 rename file 2017-07-29 00:39:47 +02:00
Jorolf
0fc36065f4 replace Play with Score 2017-07-29 00:31:52 +02:00
Dean Herbert
f705589bf2 Rename NotificationManager to NotificationOverlay 2017-07-28 15:03:42 +09:00
Dean Herbert
7d4218ea6c Add option to import from osu-stable
Also adds an option to delete all beatmaps for testing purposes.
2017-07-28 12:58:35 +09:00
Dean Herbert
9ee59dd637 Add the ability to create migrations on a per-store level
Now stores store versions to the database itself.
2017-07-28 12:58:35 +09:00
Dean Herbert
3a6f3cdd8a Add the ability to create migrations on a per-store level
Now stores store versions to the database itself.
2017-07-27 20:38:40 +09:00
Dean Herbert
5f53426a9a *Database -> *Store
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
Jorolf
8e685a98d4 add RanksSection 2017-07-26 19:21:45 +02:00
Dean Herbert
898a601098 Introduce a reference counting file store 2017-07-26 20:22:02 +09:00
Dean Herbert
9e20a02c0a Split out BeatmapDatabase into BeatmapStore
Hide database functionality at a lower level in preparation from eventually making it private.
2017-07-26 16:31:34 +09:00
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Thomas Müller
c4619f614a Merge branch 'master' of github.com:ppy/osu into better-transforms
# Conflicts:
#	osu-framework
2017-07-19 19:15:51 +02:00
Dean Herbert
e47faf4e85 Add a dummy beatmap provider for use in BeatmapInfoWedge 2017-07-19 15:16:33 +09:00
Thomas Müller
4d8261fe0b Merge branch 'master' of https://github.com/ppy/osu into better-transforms
# Conflicts:
#	osu-framework
#	osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
#	osu.Game/Overlays/DragBar.cs
2017-07-18 15:16:02 +03:00
Dean Herbert
c5d23daa6b Merge remote-tracking branch 'upstream/master' into remove-dragbar
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
2017-07-18 13:44:23 +09:00
Thomas Müller
6063219b72 Update framework 2017-07-16 13:59:26 +03:00
Huo Yaoyuan
6cf36da389 Merge branch 'master' into profile 2017-07-14 22:52:19 +08:00
Dan Balasescu
3914b3ba13 Merge branch 'master' into right-mouse-scrollbar 2017-07-14 19:15:00 +10:00
Dean Herbert
3aeed86392 Merge branch 'master' into drawable-room-update 2017-07-14 15:29:27 +09:00
Dean Herbert
ab5341eadc Merge remote-tracking branch 'upstream/master' into DrabWeb/medal-splash 2017-07-14 09:46:36 +09:00
Dean Herbert
ce204b8e7b Merge remote-tracking branch 'ppy/master' into right-mouse-scrollbar 2017-07-14 06:23:07 +09:00
Dean Herbert
c7a13740f9 Move sections to own namespace 2017-07-13 13:53:45 +09:00
Dean Herbert
3a4150c6c3 Merge remote-tracking branch 'upstream/master' into profile
# Conflicts:
#	osu.Game/Graphics/Containers/SectionsContainer.cs
2017-07-13 13:44:21 +09:00
DrabWeb
fea40ccc1a Share BeatmapSet cover sprite code. 2017-07-13 01:17:47 -03:00
DrabWeb
dc5ec319a2 Merge https://github.com/ppy/osu into drawable-room-update 2017-07-13 01:00:32 -03:00
Dean Herbert
56c817e4b6 Merge branch 'master' into osu-direct-search 2017-07-13 10:16:27 +09:00
Dean Herbert
9d47dd9ff9 Add support for right mouse absolute scrolling (when enabled)
Will likely need to be bindable when hooked up to settings and actually used.
2017-07-12 18:57:44 +09:00
Dean Herbert
c8c1dcae28 Fix incorrect filename 2017-07-12 12:55:40 +09:00
Seth
b30721edbe Merge branch 'master' into drawable-room-update 2017-07-11 20:42:44 -03:00
Thomas Müller
4045083dcd Update sorting comparers in line with framework changes 2017-07-11 21:21:58 +03:00
DrabWeb
202e3ca530 Merge https://github.com/ppy/osu into medal-splash 2017-07-11 02:00:36 -03:00
DrabWeb
84701846ec Merge https://github.com/ppy/osu into osu-direct-search 2017-07-11 00:26:49 -03:00
Jai Sharma
6eaeba5a92 Merge branch 'master' into remove-dragbar 2017-07-06 20:14:08 +01:00
Huo Yaoyuan
cadc191602 Merge branch 'master' into profile 2017-07-02 22:03:30 +08:00
Dean Herbert
28f0da606a Add OsuFocusedOverlayContainer with predefined sounds. 2017-06-28 10:18:12 -07:00
Dean Herbert
480cdba023 Add OsuClickableContainer with generic sounds 2017-06-27 21:05:49 +09:00
DrabWeb
fe875957a7 Share ruleset and type displaying, fix tag team icon. 2017-06-24 05:43:52 -03:00
DrabWeb
05b5fe8ae7 Share host/participant info displaying. 2017-06-24 05:21:42 -03:00
DrabWeb
e09625e49d Merge https://github.com/ppy/osu into medal-splash 2017-06-23 22:42:36 -03:00
Jai Sharma
de50a1694f Merge branch 'master' into remove-dragbar 2017-06-23 19:26:47 +01:00
Dean Herbert
b90c9bcacf Merge branch 'master' into profile 2017-06-23 22:51:31 +09:00
Dean Herbert
81de1bd5a7 Merge branch 'master' into multiplayer-room-inspector 2017-06-23 21:55:18 +09:00
Dean Herbert
076d561615 Merge branch 'master' into profile 2017-06-23 13:12:36 +09:00
Jai Sharma
73c004fb71 Removed DragBar from song progress 2017-06-22 17:42:29 +01:00
Dean Herbert
89c8a34025 Merge branch 'master' into better-drawablehitobject-lifetimes 2017-06-21 20:13:57 +09:00
Huo Yaoyuan
2cbed67b01 Merge branch 'master' into profile 2017-06-20 05:05:05 +08:00
smoogipooo
34ac932fe2 Reduce pollution in DrawableHitObject in favor of a loosely-coupled IScrollingHitObject. 2017-06-19 10:54:23 +09:00
ColdVolcano
ccac2e9a75 Add a visualizer around the logo 2017-06-18 19:33:50 -05:00
Huo Yaoyuan
6372cd0a13 Move namespace under Overlays. 2017-06-16 16:36:23 +08:00
Huo Yaoyuan
af4ddf8fbd Merge branch 'master' into profile. 2017-06-16 16:32:54 +08:00
Huo Yaoyuan
273e2b4a3c Fill more json fields. 2017-06-15 22:09:53 +08:00
smoogipooo
fda220acbc Move speed adjustment code from ManiaHitRenderer to SpeedAdjustedHitRenderer. 2017-06-15 19:34:28 +09:00
Huo Yaoyuan
13d9f3b9bb Move namespace and setup for DI. 2017-06-15 17:53:12 +08:00
Dan Balasescu
6fd37ebc32 Merge branch 'master' into timingchange-rework 2017-06-15 16:23:51 +09:00
Huo Yaoyuan
53ad7bc8ca Add RankChart. 2017-06-15 00:48:01 +08:00
Huo Yaoyuan
190de76d9a Add LineGraph. 2017-06-14 20:37:07 +08:00
Huo Yaoyuan
9ceb4930e9 Merge branch 'master' into profile 2017-06-13 15:23:12 +08:00
Dean Herbert
178e2b716e Merge branch 'master' into us 2017-06-13 15:46:53 +09:00
Dean Herbert
679786c76f Move MenuItemType to correct namespace 2017-06-13 15:20:21 +09:00
Dean Herbert
41d4aee4f5 Update nuget packages
- [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820
2017-06-13 11:50:46 +09:00
Huo Yaoyuan
fcd137ced2 Add OsuTextFlowContainer. 2017-06-13 00:51:06 +08:00
EVAST9919
41eb084191 CI fixes 2017-06-12 13:37:13 +03:00
EVAST9919
1711258038 Context Menu 2017-06-12 12:56:07 +03:00
smoogipooo
419682b740 Merge remote-tracking branch 'origin/master' into timingchange-rework
# Conflicts:
#	osu-framework
2017-06-12 13:09:02 +09:00
Huo Yaoyuan
d5dc37ec62 Merge branch 'master' into profile 2017-06-11 23:41:08 +08:00
Krzysztof "Nairaner" Machura
e7a732068c Fix issue where nuget was only sometimes updating modules case-sensitive 2017-06-09 12:03:18 +02:00
smoogipooo
921350128d Rename SpeedAdjustment -> MultiplierControlPoint + reworking. 2017-06-09 16:57:17 +09:00
smoogipooo
4b2669e65d Namespace movement. 2017-06-09 16:20:55 +09:00
smoogipooo
d11002e499 Use new naming structure + VisibleTimeRange bindable. 2017-06-09 16:11:49 +09:00
Huo Yaoyuan
283b6b2b5e Merge branch 'master' into profile 2017-06-09 13:45:32 +08:00
smoogipooo
cd435f7ec6 Merge remote-tracking branch 'origin/master' into timingchange-rework
# Conflicts:
#	osu-framework
#	osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs
2017-06-09 03:37:55 +09:00
smoogipooo
1231d5d35e More renaming + fixes. 2017-06-09 02:42:17 +09:00