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
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
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
Dean Herbert
81de1bd5a7
Merge branch 'master' into multiplayer-room-inspector
2017-06-23 21:55:18 +09:00
Dean Herbert
89c8a34025
Merge branch 'master' into better-drawablehitobject-lifetimes
2017-06-21 20:13:57 +09: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
smoogipooo
fda220acbc
Move speed adjustment code from ManiaHitRenderer to SpeedAdjustedHitRenderer.
2017-06-15 19:34:28 +09:00
Dan Balasescu
6fd37ebc32
Merge branch 'master' into timingchange-rework
2017-06-15 16:23:51 +09: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
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
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
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
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
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
