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
smoogipooo
55f238f6a9
Remove IHasTimeSpan, add rename to TimingSection.
2017-06-08 23:40:24 +09:00
Alex Amadori
59e539f166
Fix build error on unix
2017-06-07 18:03:27 +02:00
Huo Yaoyuan
e3cdb9f6fe
Create section classes.
2017-06-07 22:53:31 +08:00
DrabWeb
8006fab3c7
Merge https://github.com/ppy/osu into osu-direct-search
2017-06-07 09:56:13 -03:00
Dean Herbert
97db4856fc
Add toolbar toggle button
...
Also ensure chat is hidden when social is displayed and vice-versa.
2017-06-07 20:15:58 +09:00
Dean Herbert
6a12173175
Add very temporary data source for social browser
2017-06-07 20:05:43 +09:00
Dean Herbert
a07f6801da
Merge remote-tracking branch 'upstream/master' into timingchange-rework
2017-06-07 18:39:27 +09:00
Dean Herbert
1de296747f
Merge remote-tracking branch 'upstream/master' into social-browser
2017-06-07 17:38:06 +09:00
Dan Balasescu
eb545d907d
Merge branch 'master' into simplify-hud-overlay
2017-06-06 14:31:54 +09:00
Huo Yaoyuan
8fa076b5d7
Merge branch 'master' into userpage
2017-06-05 21:14:46 +08:00
Huo Yaoyuan
428b44f7d9
UserPage -> Profile.
2017-06-05 21:07:57 +08:00
Dean Herbert
bf971f6613
Merge branch 'master' into social-browser
2017-06-05 19:16:28 +09:00
Dean Herbert
778865b6eb
Merge remote-tracking branch 'upstream/master' into channel-selection
2017-06-05 17:36:14 +09:00
Dean Herbert
5568df1aee
Remove StandardHUDOverlay
...
This class hierarchy was originally when we had different HUDs for rulesets, but this is no longer the case. Skins will be able to build off the base (new) HUDOverlay without issue, so there is no real need for the abstract class for now.
We can add it back if a need for it arises; for the moment I'd like to avoid as many Standard* classes as possible.
2017-06-05 17:18:07 +09:00
Dean Herbert
af6f8bbd89
Fix namespaces and class names
2017-06-05 16:47:42 +09:00
Dean Herbert
0cb1df35e9
Merge remote-tracking branch 'upstream/master' into ingame_options
2017-06-05 14:53:37 +09:00
smoogipooo
a3299809fe
Merge remote-tracking branch 'origin/master' into timingchange-rework
...
# Conflicts:
# osu.Game/Graphics/Containers/ReverseDepthFillFlowContainer.cs
2017-06-05 10:19:53 +09:00
Dan Balasescu
d6a1205d08
Merge branch 'master' into Daycore
2017-06-05 09:33:30 +09:00
Jorolf
a43890ffb4
update osu to use the framework's TooltipContainer
2017-06-03 14:50:35 +02:00
Dan Balasescu
43f73c298f
Merge branch 'master' into timingchange-rework
2017-06-02 20:19:23 +09:00
smoogipooo
7022c8d496
Move timing change stuff to osu.Game project.
2017-06-02 20:17:44 +09:00
DrabWeb
fc6f8b9c0c
Merge https://github.com/ppy/osu into medal-splash
2017-06-01 21:19:11 -03:00
DrabWeb
212b2c1142
Initial layout and animation
2017-06-01 04:45:46 -03:00
Patrick Andersson
1dd85b5986
Add alternative for random beatmap selection
...
"Never repeat" will not repeat until all songs have been seen by repeatedly pressing F2/Random button
2017-05-31 20:11:26 +02:00
DrabWeb
9e01074852
Add GameType and DrawableGameType
2017-05-30 21:41:20 -03:00
Shawdooow
ecc0d0b11c
Daycore mod
2017-05-30 12:49:06 -04:00
EVAST9919
e737ded382
Applied suggested changes
2017-05-30 12:23:53 +03:00
DrabWeb
3aa1f35127
Basic layout
2017-05-30 05:12:11 -03:00
smoogipooo
72fa50f944
Make replay settings match design colours.
2017-05-30 17:02:04 +09:00
DrabWeb
21a8071293
Merge https://github.com/ppy/osu into channel-selection
2017-05-29 20:31:35 -03:00
Dean Herbert
5e4558cc54
Merge branch 'master' into social-browser
2017-05-29 18:35:22 +09:00
Dan Balasescu
6918368afc
Merge branch 'master' into ingame_options
2017-05-29 18:12:02 +09:00
Dean Herbert
4a0c8fb5dd
Merge branch 'master' into breadcrumbs
2017-05-29 15:59:37 +09:00
DrabWeb
8745948a01
Basic searching in osu!direct, move BeatmapSetOnlineInfo covers into their own class
2017-05-28 02:26:25 -03:00
DrabWeb
ab32e962ca
Make BeatmapOnlineInfo and BeatmapSetOnlineInfo separate classes, -OnlineWorkingBeatmap
2017-05-28 00:37:55 -03:00
Huo Yaoyuan
159e8d84c2
Move namespace and make cover background public.
2017-05-27 23:37:15 +08:00
Huo Yaoyuan
25387c996f
Merge branch 'master' into userpage
2017-05-27 22:42:56 +08:00
EVAST9919
bedcf04043
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
2017-05-27 02:25:03 +03:00
DrabWeb
cbe36259c3
Add BreadcrumbControl
2017-05-26 07:49:45 -03:00
smoogipooo
9517bfc2f1
Add file to csproj.
2017-05-26 19:33:23 +09:00
DrabWeb
64016f9466
Merge https://github.com/ppy/osu into channel-selection
2017-05-26 03:24:41 -03:00
DrabWeb
68377494f7
Browser - SearchableList
2017-05-26 02:44:09 -03:00
DrabWeb
8fca0fddb3
Abstract DirectOverlay layout into base class for Social and osu!direct - BrowseOverlay, initial layout of social browser
2017-05-26 00:54:03 -03:00
Huo Yaoyuan
9bc1eece0a
Basic section management of userpage.
2017-05-25 02:11:07 +08:00
Seth
3094a8267f
Merge branch 'master' into drawable-multiplayer-room
2017-05-24 04:39:57 -03:00
Dean Herbert
3134f92051
Merge branch 'master' into user-panel
2017-05-24 16:32:09 +09:00
DrabWeb
ba2627d4e2
Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct
2017-05-24 02:40:00 -03:00
DrabWeb
4490596f5f
Keep one object per file
2017-05-24 02:37:27 -03:00
Dean Herbert
4ee11764b8
Merge branch 'master' into osu-direct
2017-05-24 12:16:34 +09:00
ColdVolcano
c6d744eb7c
Merge branch 'master' of ppy/osu into menu-flashes
2017-05-23 20:00:02 -05:00
EVAST9919
2ca0794b37
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
2017-05-23 14:45:38 +03:00
Dean Herbert
0634a3a5c5
Merge branch 'master' into osu-direct
2017-05-23 17:33:20 +09:00
smoogipooo
3cdfd2eef5
Split ControlPoint into different types.
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
Dean Herbert
1295b0a7e1
Merge branch 'master' into ColdVolcano/beat-syncing
2017-05-23 10:51:47 +09:00
DrabWeb
9798117d53
Move RoomStatus to a class instead of enum
2017-05-22 21:13:57 -03:00
DrabWeb
03f6cded84
MultiplayerRoom -> Room
2017-05-22 12:44:58 -03:00
ColdVolcano
a1547f12d4
Applied suggestions + Update Framework
2017-05-22 04:38:21 -05:00
smoogipooo
3235e280a9
Add to csproj.
2017-05-22 17:32:18 +09:00
EVAST9919
b99bad055d
oops
2017-05-22 09:28:36 +03:00
EVAST9919
50e3feb761
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
2017-05-22 09:12:40 +03:00
DrabWeb
7ce3b73ecd
Added UserPanel and UserStatus
2017-05-22 03:11:42 -03:00
EVAST9919
d717ccf85e
Settings -> ReplaySettings
2017-05-22 09:07:08 +03:00
Huo Yaoyuan
d0ff9e6576
Merge branch 'master' into sections
2017-05-22 12:52:27 +08:00
DrabWeb
800a319470
Remove newline
2017-05-22 01:08:35 -03:00
DrabWeb
0c30b2c698
Remove folder from osu.Game.csproj
2017-05-22 01:07:26 -03:00
DrabWeb
0795089d86
Merge https://github.com/ppy/osu into drawable-multiplayer-room
2017-05-22 01:06:05 -03:00
DrabWeb
e5ee7096f8
Initial cleanup
2017-05-22 00:07:15 -03:00
DrabWeb
c4e6870c12
Merge https://github.com/ppy/osu into roompanel
2017-05-21 22:37:00 -03:00
DrabWeb
bc980b60ac
Add files to project, update with framework changes
2017-05-21 22:36:46 -03:00
smoogipooo
0a0139aded
Remove the concept of beatmap events, rename BreakEvent -> BreakPeriod.
2017-05-22 10:12:33 +09:00
Jorolf
5b244367ee
allow for solutions were the osu repository isn't at the solution level
2017-05-21 20:29:05 +02:00
EVAST9919
0615f104f0
SettingsContainer -> SettingsDropdownContainer
2017-05-21 18:22:27 +03:00
DrabWeb
6a8d745db1
Use Channels in ChannelListItems, ChannelSection, fix ChannelListItem being misaligned
2017-05-20 18:29:57 -03:00
DrabWeb
31890a1e01
Initial layout, channels items
2017-05-20 18:06:25 -03:00
Dean Herbert
0b987be600
Merge branch 'master' into osu-direct
2017-05-20 16:17:59 +09:00
DrabWeb
e030573436
Add ReverseDepthFillFlowContainer to remove code duplication
2017-05-19 23:44:36 -03:00
DrabWeb
cdd2b54dc7
Move SlimEnumDropdown into it's own file
2017-05-19 20:25:08 -03:00
DrabWeb
83c81c0626
Cleanup (again)
2017-05-19 20:03:07 -03:00
Huo Yaoyuan
24a813e907
Basic children management of SectionsContainer.
2017-05-20 05:15:57 +08:00
DrabWeb
5b2c74be50
Remove Direct folder from csproj
2017-05-19 16:24:27 -03:00
DrabWeb
e1c4c36122
+BeatmapOnlineInfo, +OnlineWorkingBeatmap, minor cleanups, panel beatmap backgrounds
2017-05-19 15:43:18 -03:00
EVAST9919
4d0d27aa88
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
2017-05-19 15:25:48 +03:00
EVAST9919
f2af31aceb
Naming fixes
2017-05-18 20:21:58 +03:00
EVAST9919
83a89ce22d
options -> settings
2017-05-18 11:39:22 +03:00
EVAST9919
d07d94d606
better resizing
2017-05-18 07:09:36 +03:00
EVAST9919
35bc3a42aa
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
2017-05-18 06:36:15 +03:00
smoogipooo
eebd5a910e
Merge remote-tracking branch 'origin/master' into mania-beatmap-conversion
2017-05-18 11:59:31 +09:00
DrabWeb
cabfe72c92
Changed DirectPanel to a base class for DirectGridPanel and DirectListPanel
2017-05-17 18:02:33 -03:00
DrabWeb
5fb445e3fe
Basic direct panel, minor cleanups
2017-05-17 16:37:34 -03:00
Dean Herbert
41c252760d
Move all pause logic into PauseContainer
2017-05-17 21:57:01 +09:00
EVAST9919
e0625a9b30
More overlays and overall fixes
2017-05-17 15:39:26 +03:00
smoogipooo
74c23ff6d8
Add base for event parsing code.
2017-05-17 20:46:23 +09:00
DrabWeb
9ba356f2c6
Added osu!direct header and filter control
2017-05-17 05:58:34 -03:00
EVAST9919
1a4025ab3c
ingame options basic logic
2017-05-17 10:36:57 +03:00
smoogipooo
17466a662c
Add hold note conversion.
2017-05-17 13:09:07 +09:00
Dan Balasescu
91de72e161
Merge branch 'master' into on-screen-display
2017-05-16 16:27:19 +09:00
Dean Herbert
5e5ad9a899
Add basic on-screen display
2017-05-16 15:03:03 +09:00
Dean Herbert
dcd4b4450d
Add error message in chat when attempting to use commands
2017-05-15 13:26:35 +09:00
Dean Herbert
eaaba11586
Change all instances of options to settings where applicable
2017-05-15 10:55:29 +09:00
Dan Balasescu
815379646c
Merge branch 'master' into new-option-search
2017-05-12 20:22:11 +09:00
Dean Herbert
d3770d8395
Merge branch 'master' into chat-design-update
2017-05-12 19:57:57 +09:00
Dean Herbert
d2e066ca35
Move SearchTextBox to better namespace
...
Is being used in multiple places now.
2017-05-12 19:57:06 +09:00
Dean Herbert
dbf60d24bf
Second design update pass.
2017-05-12 15:39:00 +09:00
Dean Herbert
c4a93cbc85
Move drawable chat related classes to better namespace
2017-05-12 15:38:51 +09:00
EVAST9919
1f34cec5ce
Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage
2017-05-11 22:22:57 +03:00
Dean Herbert
9a1c662d1f
Update framework
2017-05-11 21:25:43 +09:00
Dean Herbert
ec67b617ae
Add OptionsHeader class
...
Makes search textbox anchor correctly. Also improves visual styling.
2017-05-11 16:06:18 +09:00
EVAST9919
ae2186970c
Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage
2017-05-08 18:16:16 +03:00
Dean Herbert
df4a737c9b
Merge remote-tracking branch 'ppy/master' into hud-mod-display
2017-05-08 10:56:34 +09:00
EVAST9919
d06b5783cb
Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage
2017-05-06 17:33:51 +03:00
Dean Herbert
c9ba1ac4f6
Adjust namespaces.
...
Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.
2017-05-05 13:00:05 +09:00
Dean Herbert
6298b3effd
Refactor ModSection and ModIcon to avoid null mods.
2017-05-05 12:16:41 +09:00
Dean Herbert
153951d3dd
Add OptionItem class
...
Allow for centalised logic for all option UI controls.
2017-05-04 23:07:48 +09:00
EVAST9919
26985dbc62
Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor
2017-05-03 16:22:40 +03:00
Dean Herbert
19f6d58723
Merge remote-tracking branch 'upstream/master' into options-implementation
2017-05-03 21:54:27 +09:00
EVAST9919
f49cc124ed
Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor
2017-05-03 08:26:54 +03:00
EVAST9919
a897dcbfbe
Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage
2017-05-03 08:26:01 +03:00
EVAST9919
7e1efcc20b
Added ModsContainer
2017-05-02 22:34:07 +03:00
Dean Herbert
691742b828
Remove most options which have not yet been implemented.
2017-05-02 19:40:30 +09:00
smoogipooo
8e88d86639
Fix naming confusion.
2017-05-02 18:00:37 +09:00
Dean Herbert
1b0f353af3
Add support for framework-level mouse confining.
2017-05-02 17:45:42 +09:00
Dean Herbert
bef15fe637
Improve organisation of some options and config code.
2017-05-02 17:45:22 +09:00
EVAST9919
108cd28e96
Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage
2017-05-02 10:15:56 +03:00
smoogipooo
e856abe59a
Let's not use Country for drawings-specific stuff...
2017-05-02 13:02:14 +09:00
Dean Herbert
2e0eda6b15
Merge branch 'master' into playlist
2017-05-01 19:44:57 +09:00
Dean Herbert
580cf93147
Refactoring part 4.
2017-05-01 15:03:11 +09:00
Dean Herbert
37944bb04e
Initial refactoring.
2017-05-01 13:01:08 +09:00
DrabWeb
c193a90a16
Merge https://github.com/ppy/osu into playlist
2017-04-29 05:39:52 -03:00
Thomas Tan
9b8b88601f
Create "AutoGenerator" base class and interface.
2017-04-29 02:08:48 +08:00
EVAST9919
eacf2045f0
Initial commit
2017-04-28 04:56:34 +03:00
smoogipooo
28f7e0cdba
Introduce SampleInfoList as List<SampleInfo> to reduce generic nesting. Fix CI warnings.
2017-04-26 14:12:21 +09:00
Dan Balasescu
91b264da1a
Merge branch 'master' into info-wedge-design-update
2017-04-25 08:14:59 +09:00
Dean Herbert
c7b789424b
Update BeatmapInfoWedge design
...
- Adds colour difficulty strip.
- Adjusts paddings.
- Fixes source/artist confusion.
- Double dash to em-dash.
2017-04-24 20:19:44 +09:00
Dean Herbert
e1a2f1bc7a
Add beatmap metrics lookup.
2017-04-24 19:17:11 +09:00
Dean Herbert
239f19ad02
Fix incorrect line endings.
2017-04-24 14:10:44 +09:00
Dan Balasescu
6fb8676215
Merge branch 'master' into nodal-hit-sounds
2017-04-22 22:11:19 +09:00
smoogipooo
2af9bf1423
Prefix everything inside Rulesets.Objects.Legacy with "Convert" to avoid naming clashes with Ruleset projects.
2017-04-22 21:33:11 +09:00
smoogipooo
5cdbb226f8
Remove CurvedHitObject to make RepeatSamples not tied to curve.
2017-04-21 20:40:11 +09:00
Dean Herbert
3f832731c9
Add DoubleTime, HalfTime and Nightcore support.
2017-04-21 17:33:37 +09:00
Dean Herbert
c87657707f
Add tooltip to sliderbars. Move interface.
2017-04-20 17:33:07 +09:00
Dean Herbert
4ca27a5395
Merge branch 'master' into tooltips
2017-04-20 15:08:26 +09:00
Dean Herbert
2a422ca5fa
Remove ScoreStatistic.
2017-04-20 11:26:02 +09:00
Dean Herbert
6cf026e5c1
Remove OsuScore and change the way statistics are stored (dynamic dictionary).
2017-04-20 11:03:11 +09:00
Dan Balasescu
66cb604081
Merge branch 'master' into score-statistics
2017-04-20 10:06:43 +09:00
Jorolf
e8aea3ccd2
Merge branch 'master' of git://github.com/ppy/osu into tooltips
2017-04-19 15:33:35 +02:00
Jorolf
d04893a43a
---changing---
2017-04-19 15:33:24 +02:00
Dan Balasescu
dd3f9c1cdd
Merge branch 'master' into results-screen
2017-04-19 21:58:40 +09:00
Jorolf
af9a45fd6c
Merge branch 'master' into tooltips
2017-04-19 13:51:39 +02:00
Dean Herbert
093abd6872
Add chat toggle button.
2017-04-19 19:54:03 +09:00
Dean Herbert
3129708ccb
Add chat sending support.
2017-04-19 18:46:52 +09:00
Dean Herbert
3b95fbab7d
Add score statistic tracking (osu!).
2017-04-19 16:29:27 +09:00
Dean Herbert
72fcc09a98
Add beatmap info and score date.
...
Also adjusts design metrics.
2017-04-18 22:22:14 +09:00
Dean Herbert
d51b37cb44
Add a basic implementation of the new design results screen.
2017-04-18 22:22:14 +09:00
Dean Herbert
3b21340e1b
Split SquareGraph out and make SongProgressGraph also able to take a list of Objects.
2017-04-18 18:40:02 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset.
2017-04-18 16:05:58 +09:00
smoogipooo
d04353aed0
Legacy mania hit objects don't have a "column", this should be determined by the beatmap converter.
2017-04-18 11:13:11 +09:00
smoogipooo
0e1ce333e3
Make IBeatmapProcessor a class with virtual methods.
2017-04-18 09:43:43 +09:00
smoogipooo
efc050a95a
Make IBeatmapConverter an abstract class instead of an interface.
2017-04-18 09:38:52 +09:00
smoogipooo
456aee63ca
Mode IBeatmapConverter and IBeatmapProcessor to osu.Game.Modes.Beatmaps namespace.
2017-04-18 09:36:08 +09:00
smoogipooo
09208adf81
Re-implement legacy hit object conversion.
2017-04-18 08:58:21 +09:00
Jorolf
dd26f9fcac
Merge branch 'master' of git://github.com/ppy/osu into tooltips
2017-04-17 14:45:46 +02:00
Dean Herbert
a4e2f34ee7
Make a RulesetDatabase.
2017-04-17 17:43:48 +09:00
Dean Herbert
83b083ce64
Move SQLite connections out of database classes; make abstract Database.
2017-04-17 14:37:52 +09:00
Dean Herbert
ce12cc20bd
Merge remote-tracking branch 'upstream/master' into remove-playmode
2017-04-17 13:00:53 +09:00
Adrian Kaz Scherzinger
60f7879875
Explicitly set C# 6.0 for now.
2017-04-16 06:44:08 +09:00
smoogipooo
0a1376c2db
Remove PlayMode game-wide.
2017-04-15 05:22:41 +09:00
smoogipooo
59bfc7abad
Move statics to RulesetCollection to avoid conflicts later on.
2017-04-15 04:53:37 +09:00
Dan Balasescu
3de3b94978
Merge branch 'master' into song-progress-graph
2017-04-15 01:29:02 +09:00
Dean Herbert
ac3b435f00
Merge remote-tracking branch 'upstream/master' into hud-improvements
...
# Conflicts:
# osu.Game.Modes.Osu/Scoring/OsuScoreProcessor.cs
2017-04-14 19:29:59 +09:00
Dean Herbert
09195a03a2
Merge remote-tracking branch 'upstream/master' into song-progress-graph
...
# Conflicts:
# osu.Game/Overlays/DragBar.cs
2017-04-14 11:25:00 +09:00
Jorolf
f6f75fac74
Merge branch 'master' of git://github.com/ppy/osu into tooltips
...
# Conflicts:
# osu.Game/Graphics/Cursor/MenuCursor.cs
2017-04-13 23:12:07 +02:00
Jorolf
c2b2e5ec19
changed way the tool tip is found and displayed
2017-04-13 23:00:49 +02:00
Dean Herbert
2c3fa30386
Metric -> Metrics.
2017-04-12 21:09:39 +09:00
Dean Herbert
157ad17606
Merge branch 'master' into details
2017-04-12 20:25:51 +09:00
Dean Herbert
c0338a82e7
Update nuget packages.
...
Includes fix in OpenTK for focus issues.
2017-04-12 19:35:16 +09:00
Dean Herbert
c615762da6
wip
2017-04-11 18:56:25 +09:00
Jorolf
a597149b7f
Merge branch 'details' of github.com:Jorolf/osu into details
2017-04-10 16:42:42 +02:00
Jorolf
24b4b3ad7d
update to everything
2017-04-10 16:42:23 +02:00
Dean Herbert
c6a24bb549
Merge branch 'master' into details
2017-04-10 20:07:13 +09:00
Andrey Zavadskiy
e73f543c4f
Applied suggestions
2017-04-10 06:06:10 +03:00
Andrey Zavadskiy
425e96c45c
Moved logic to it's own class
2017-04-09 17:44:19 +03:00
DrabWeb
963cd09bd0
Merge https://github.com/ppy/osu into playlist
2017-04-09 04:04:13 -03:00
Jorolf
899e559b5c
ratings hide now + remove unnessary stuff
2017-04-07 19:58:49 +02:00
Jorolf
eb4b3772e9
put Bar into its own file and let it only add a background if BackgroundColour is changed
2017-04-07 18:13:55 +02:00
Dean Herbert
12d2102a88
Merge remote-tracking branch 'upstream/master' into song-progress-graph
...
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
# osu.Game/Modes/UI/HudOverlay.cs
# osu.Game/Screens/Play/PauseOverlay.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/osu.Game.csproj
2017-04-07 09:22:18 +09:00
Jorolf
e59c0a770f
Merge branch 'master' into details
2017-04-06 15:42:00 +02:00
Huo Yaoyuan
9b1e010dcc
Fix filename mismatch.
2017-04-06 16:05:41 +08:00
Dan Balasescu
6fc1384927
Merge branch 'master' into taiko-fixes
2017-04-06 16:23:22 +09:00
Dean Herbert
4783d17d94
Merge branch 'master' into better-hitsounds
2017-04-06 16:00:56 +09:00
smoogipooo
cec8bca78a
Implement IJsonSerializable, BeatmapInfo IJsonSerializable.
2017-04-06 15:54:50 +09:00
Dean Herbert
a18367454d
InGameOverlay -> MenuOverlay.
2017-04-06 15:34:52 +09:00
smoogipooo
c65ab5b6f1
General cleanup.
2017-04-06 11:56:19 +09:00
smoogipooo
eb82a4c090
Back to using SampleInfo + fix taiko beatmap conversion.
2017-04-06 11:41:16 +09:00
smoogipooo
2d8239a3f7
Re-implement the SampleBank/Sample structure. No parsing support yet.
2017-04-05 21:34:28 +09:00
Andrey Zavadskiy
62655b70c9
Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor
2017-04-04 18:41:37 +03:00
smoogipooo
5e67bcb581
Remove a few unused classes.
2017-04-04 13:14:45 +09:00
Jorolf
5a694e0c9d
changed location of BarGraph to be more generic
2017-04-03 19:29:13 +02:00
Jorolf
f3946bebb4
Merge branch 'master' of git://github.com/ppy/osu into details
2017-04-03 18:33:47 +02:00
smoogipooo
19b5555ef2
Slightly clean up archive readers + decoders. Read beatmap version into BeatmapInfo.
2017-04-03 20:26:46 +09:00
Jorolf
e835b19d4a
add Tooltips
2017-04-02 18:19:59 +02:00
Andrey Zavadskiy
3574dac780
Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor
2017-04-01 21:03:19 +03:00
Jorolf
47698be1f5
Merge branch 'master' into details
2017-03-31 21:10:45 +02:00
Dean Herbert
14fcc197e9
Merge branch 'master' into partial-judgements
2017-03-31 16:53:49 +09:00
Dean Herbert
50c328f1b4
Merge remote-tracking branch 'upstream/master' into partial-judgements
...
# Conflicts:
# osu.Game/osu.Game.csproj
2017-03-31 16:46:40 +09:00
Dean Herbert
5d25fa3282
Merge remote-tracking branch 'upstream/master' into accented-interface
2017-03-31 16:38:19 +09:00
Dean Herbert
fa7c72a099
Refactor ReplayInputHandler creation for more flexibility.
2017-03-31 15:59:53 +09:00
Dean Herbert
0f4b98ce73
Move FramedReplayInputHandler to own file and un-nest.
2017-03-31 15:32:34 +09:00
smoogipooo
43c306d658
IAccented -> IHasAccentColour.
2017-03-31 15:06:31 +09:00
Dean Herbert
e7ecc479c9
Add FramedReplay and use where legacy is not needed.
2017-03-31 12:43:42 +09:00
smoogipooo
d944b8c192
Implement IAccented interface + transform.
2017-03-31 11:01:42 +09:00
Jorolf
0d4f2c59a5
there's probably something in here I overlooked
2017-03-30 17:32:18 +02:00
Jorolf
6982529481
Merge branch 'master' of git://github.com/ppy/osu into details
2017-03-29 15:47:00 +02:00
smoogipooo
3050039972
Implement partial judgements + make Result non-nullable.
2017-03-29 18:35:28 +09:00
Jorolf
305bc9cff6
Merge branch 'master' of git://github.com/ppy/osu into details
2017-03-28 17:14:35 +02:00
Andrey Zavadskiy
cf3db49631
Inherit Pause/Fail overlay from InGameOverlay
2017-03-28 12:09:26 +03:00
Andrey Zavadskiy
62693a6a59
Again separate classes
2017-03-28 10:49:58 +03:00
Andrey Zavadskiy
9774f826ab
Pause and fail overlays -> StopOverlay
2017-03-28 06:08:31 +03:00
Andrey Zavadskiy
5461c6516a
Refactor PauseOverlay, FailDialog -> FailOverlay
2017-03-28 04:53:57 +03:00
Dean Herbert
13272e6995
Make Avatar accept a user.
...
Add UpdateableAvatar to handle the toolbar use-case.
2017-03-28 00:08:26 +09:00
Dean Herbert
039f4a65dc
Combine user models.
2017-03-28 00:08:24 +09:00
Jorolf
775fd63d0f
Added difficulty container
2017-03-25 23:33:03 +01:00
ElegantMonkey
0678274118
Rename OptionDropdown and OptionEnumDropdown files
2017-03-25 07:45:04 -03:00
Jorolf
d8724e5e3e
Add metadata details
2017-03-24 23:02:24 +01:00
DrabWeb
215b016f32
Initial implementation
2017-03-24 05:59:26 -03:00
DrabWeb
befbc63c35
Merge https://github.com/ppy/osu into song-progress-graph
2017-03-23 23:42:06 -03:00
smoogipooo
2074812f46
Move ScoreProcessor and Score to Scoring/.
2017-03-24 09:51:52 +09:00
Dean Herbert
2cb801317d
JudgementInfo -> Judgement.
...
There is no case where we use the term "Judgement" without the suffix, so deemed it unnecessary.
2017-03-23 19:00:18 +09:00
DrabWeb
0337f18fb9
Cleaning
2017-03-23 06:37:12 -03:00
Dean Herbert
4d61424abd
Merge branch 'master' into song-progress-graph
2017-03-23 17:44:22 +09:00
Dan Balasescu
e9a061c709
Merge branch 'master' into beatmap-detail-tabs
2017-03-23 17:13:02 +09:00
smoogipooo
c9fe9e681d
Make judgement text generic to be used between game modes.
2017-03-23 12:49:28 +09:00
DrabWeb
c173c4b7ee
Tab control
2017-03-23 00:22:31 -03:00
Dean Herbert
9601e143d4
Merge branch 'master' into working-beatmap
2017-03-23 09:37:21 +09:00
Dean Herbert
ba32d50456
Consolidate nested classes.
2017-03-23 08:44:52 +09:00
Huo Yaoyuan
0dbc232ebf
Rename all DropDown -> Dropdown.
2017-03-22 22:32:32 +08:00
DrabWeb
29c54d4d8b
Merge https://github.com/ppy/osu into song-progress-graph
2017-03-22 08:50:17 -03:00
Drew DeVault
cc2b4c5c5b
Refactor WorkingBeatmap
...
Gets ArchiveReader out of WorkingBeatmap and delegates extracting stuff
from it to subclasses. Should enable us to make an OnlineWorkingBeatmap
or so.
2017-03-22 05:57:08 -04:00
Huo Yaoyuan
e217c67bcf
Merge branch 'master' into controls
2017-03-22 08:54:03 +08:00
Dean Herbert
8983bbcaad
Merge branch 'master' into leaderboards
2017-03-22 08:24:49 +09:00
Huo Yaoyuan
f0edf5d3d3
Update to DropDown and Menu.
2017-03-22 07:18:53 +08:00
smoogipooo
a272675705
Parse time signature from legacy beatmap control points.
2017-03-21 21:18:08 +09:00
Dean Herbert
5d0adc6454
Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards
2017-03-19 18:51:53 +09:00
Dean Herbert
6c12da54f1
Merge pull request #499 from smoogipooo/legacy_beatmap_flag
...
Add legacy beatmap flag.
2017-03-19 12:39:41 +09:00
DrabWeb
b0e7296e25
-IHasDrawableRepresentation, User.Region -> Country
2017-03-19 00:09:58 -03:00
smoogipooo
26b0bb02d8
Remove IIsLegacy, expose LegacyBeatmap without a public constructor.
2017-03-18 18:32:54 +09:00
Seth
4aea06be22
Merge branch 'master' into leaderboards
2017-03-17 18:23:01 -03:00
DrabWeb
0834b5b794
Made requested changes
2017-03-17 18:16:59 -03:00
Dan Balasescu
e529f5e439
Merge branch 'master' into song-select-loading-reoptimisation
2017-03-18 02:12:56 +09:00
Dean Herbert
292de44a0b
WIP menu cursor.
2017-03-17 20:45:27 +09:00
Dean Herbert
907236e475
Move filtering to BeatmapCarousel (but actual logic is now in FilterCriteria.
2017-03-17 19:54:51 +09:00
Dean Herbert
4b97304603
CarouselContainer -> BeatmapCarousel.
2017-03-17 19:12:54 +09:00
smoogipooo
862c4c408f
Add legacy beatmap flag.
2017-03-17 14:24:46 +09:00
Dean Herbert
60fc782e93
Merge branch 'master' into beatmap_timinginfo
2017-03-16 23:08:24 +09:00
Dean Herbert
271dddc9a7
Merge branch 'master' into generic_scoreprocessor
2017-03-16 23:04:19 +09:00
Dean Herbert
110bdbd0c1
Make everything share DropDown implementations again. Remove unnecessary files.
2017-03-16 21:17:14 +09:00
