RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,763 Commits 3 Branches 651 Tags 355 MiB
Commit Graph

599 Commits

Author SHA1 Message Date
Dean Herbert 56c817e4b6 Merge branch 'master' into osu-direct-search 2017-07-13 10:16:27 +09:00
Dean Herbert c8c1dcae28 Fix incorrect filename 2017-07-12 12:55:40 +09:00
Thomas Müller 4045083dcd Update sorting comparers in line with framework changes 2017-07-11 21:21:58 +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
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
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
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