7471 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Shawdooow	a0cb624c9d	start at 1	2017-10-12 10:28:55 -04:00
Shawdooow	cfb1804aa1	address review	2017-09-27 11:28:44 -04:00
Shawdooow	4e8944de04	fix maps ending early	2017-09-26 22:54:33 -04:00
Shawdooow	801fa39145	remove old SliderBouncer	2017-09-26 12:23:13 -04:00
Shawdooow	b5ad6ae735	appveyor fixes	2017-09-26 12:21:39 -04:00
Shawdooow	adebe166d4	slider bouncers	2017-09-26 12:13:34 -04:00
Shawdooow	243ed43777	Merge remote-tracking branch 'refs/remotes/ppy/master'	2017-09-26 12:04:52 -04:00
Dean Herbert	3fd4a97a19	Merge pull request #1278 from Damnae/storyboard_integration ... Storyboard integration	2017-09-26 20:47:07 +08:00
Dean Herbert	7c70d3d2cb	Merge branch 'master' into storyboard_integration	2017-09-26 20:19:26 +08:00
Dean Herbert	9892572db4	Merge pull request #1312 from Xinnoh/patch-1 ... changed description for hidden	2017-09-26 20:12:46 +08:00
Dean Herbert	00067d0d18	Merge branch 'master' into patch-1	2017-09-26 19:28:03 +08:00
Dean Herbert	76cba2b311	Merge pull request #1299 from smoogipoo/editor-timing-timeline ... Initial implementation of the editor summary timeline	2017-09-26 19:27:34 +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
Sinnoh	3b9c2d1d5f	changed description for hidden ... ctb doesn't have approach circles	2017-09-26 16:50:12 +08: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	797e77e651	Merge pull request #1253 from DrabWeb/online-beatmap-set-overlay ... Online beatmap set overlay	2017-09-26 09:17:49 +08: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	2d0555b552	Merge pull request #1306 from peppy/set-busy-timeout ... Add BusyTimeout to avoid hard crashes on database contention	2017-09-25 17:14:47 +09:00
Dan Balasescu	c8cad6d9aa	Merge branch 'master' into set-busy-timeout	2017-09-25 17:05:40 +09:00
Dean Herbert	4151285190	Merge pull request #1303 from MrTheMake/chat-commands ... Initial implementation of chat commands	2017-09-25 15:58:20 +08:00
Dean Herbert	a80f0d4858	Merge branch 'master' into chat-commands	2017-09-25 15:52:35 +08:00
Dean Herbert	6349c50510	Merge pull request #1309 from huoyaoyuan/net46 ... Use .net 4.6 features	2017-09-25 13:26:16 +08:00
Dean Herbert	b6a6042b5c	Update framework	2017-09-25 13:09:06 +08:00
Dean Herbert	2c99fa29f0	Merge branch 'master' into net46	2017-09-25 12:43:35 +08:00
Dean Herbert	3001d6826b	Merge pull request #1275 from EVAST9919/icons_jumping_fix ... Fix icons in main button system jumps on one side for a long time	2017-09-25 12:19:20 +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	1e6c480791	Add back missing tests	2017-09-25 11:58:37 +08:00
Dean Herbert	a1b313620c	Set a busy timeout when creating an SQLIteConnection	2017-09-25 11:51:48 +08:00
Dan Balasescu	860b389e9a	Merge pull request #1305 from WebFreak001/master ... URL encode beatmap filename	2017-09-25 10:02:56 +09: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