640 Commits

Author	SHA1	Message	Date
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
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