4852 Commits

Author	SHA1	Message	Date
Dean Herbert	7c70d3d2cb	Merge branch 'master' into storyboard_integration	2017-09-26 20:19:26 +08:00
smoogipoo	10dbd68c1e	Simplify null check	2017-09-26 20:11:45 +09:00
smoogipoo	c578509a20	Bind to the screen Beatmap instead of the game-wide Beatmap	2017-09-26 17:58:40 +09:00
smoogipoo	3937ebdc3d	Add missing license headers	2017-09-26 15:58:30 +09:00
Dan Balasescu	b8b54e95a5	Merge branch 'master' into editor-timing-timeline	2017-09-26 15:54:01 +09:00
smoogipoo	10e5fe40b2	A bit of cleanup	2017-09-26 15:51:45 +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	c1081e02b2	Close beatmap overlay on stray mouse clicks	2017-09-25 23:41:27 +08:00
Dean Herbert	f129902ee0	Avoid nullrefs when data is not present	2017-09-25 23:35:02 +08:00
Dean Herbert	f9300ec3fe	Populate author using existing data for now	2017-09-25 23:34:56 +08:00
Dean Herbert	c2bb3ea7bc	Add minimal viable implementation of BeatmapSetOver in game	2017-09-25 17:58:03 +08:00
Dean Herbert	5be11f539b	Rename to BeatmapSetOverlay	2017-09-25 17:26:27 +08:00
Damnae	2d4616fd43	Apply beatmap settings when creating the DrawableStoryboard.	2017-09-25 11:03:57 +02:00
smoogipoo	d86e81f07c	Better expression to avoid invalid values	2017-09-25 18:00:52 +09:00
smoogipoo	d787c740fa	Fix bookmarks not working ... We should be dealing with the array in every situation, with the exception of the database.	2017-09-25 17:46:51 +09:00
Damnae	0996867112	Move StoryboardReplacesBackground and StoryboardAspect properties to Storyboard.	2017-09-25 10:40:22 +02: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
Dan Balasescu	c8cad6d9aa	Merge branch 'master' into set-busy-timeout	2017-09-25 17:05:40 +09:00
Dean Herbert	a80f0d4858	Merge branch 'master' into chat-commands	2017-09-25 15:52:35 +08:00
Dean Herbert	2c99fa29f0	Merge branch 'master' into net46	2017-09-25 12:43:35 +08:00
Dean Herbert	0aebfdd578	Merge branch 'master' into icons_jumping_fix	2017-09-25 12:07:25 +08:00
Dean Herbert	33a9bb6997	Merge branch 'master' into set-busy-timeout	2017-09-25 12:05:57 +08:00
Dean Herbert	a1b313620c	Set a busy timeout when creating an SQLIteConnection	2017-09-25 11:51:48 +08:00
Dan Balasescu	a5622bb293	Merge branch 'master' into master	2017-09-25 09:58:29 +09:00
Huo Yaoyuan	2b11ecec13	Remove usings to extensions.	2017-09-24 06:03:52 +08:00
Huo Yaoyuan	87c8278139	Use Array.Empty.	2017-09-24 03:45:46 +08:00
Huo Yaoyuan	c5aebf6401	Use TimeSpan to represent time.	2017-09-24 03:23:31 +08:00
Huo Yaoyuan	d277952e0f	Use DateTimeOffset.ToUnixTime	2017-09-24 00:42:46 +08:00
Huo Yaoyuan	442259d9e0	Fix overlay toggling in song select.	2017-09-23 19:47:23 +08:00
WebFreak001	e04526222c	URL encode beatmap filename	2017-09-22 22:47:26 +02:00
MrTheMake	34fb6ccdf5	Removed generic parameter function	2017-09-22 16:17:03 +02:00
Dan Balasescu	9e02570802	Merge branch 'master' into song-select-toggle-overlays	2017-09-22 22:41:52 +09:00
MrTheMake	02bc429911	CI fix	2017-09-22 15:37:17 +02: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
MrTheMake	18c26a85ba	Added an infoMessage class to represent system messages that aren't errors	2017-09-22 15:30:07 +02:00
MrTheMake	29707788f9	Code formatting	2017-09-22 15:29:04 +02:00
MrTheMake	dc5c046d4b	Fixed wrong action message color	2017-09-22 14:33:20 +02:00
Damnae	2c245f4c22	Merge branch 'master' into storyboard_integration ... # Conflicts: # osu.Game/Configuration/OsuConfigManager.cs # osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs	2017-09-22 12:45:34 +02:00
MrTheMake	3e8941f8e1	Fix chat message style for non action messages	2017-09-22 11:35:07 +02:00
MrTheMake	dce577f92a	Updated design	2017-09-22 11:30:01 +02:00
Dean Herbert	98c22e8111	Merge branch 'master' into master	2017-09-22 15:19:23 +08:00
MrTheMake	31e26364a6	Initial implementation of chat commands	2017-09-22 01:47:24 +02:00
gabixdev	8438ea1267	Fix formatting ;_;	2017-09-21 22:11:35 +02:00
DrabWeb	01e70f9bef	Change type check to safe cast.	2017-09-21 14:53:42 -03:00
DrabWeb	46af17f00c	Fix preview button potential null ref.	2017-09-21 14:46:51 -03:00
DrabWeb	cb4818e84e	Merge https://github.com/ppy/osu into online-beatmap-set-overlay	2017-09-21 14:25:34 -03:00