7029 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Damnae	12de737084	Merge branch 'master' into storyboards ... # Conflicts: # osu.Game/Beatmaps/Beatmap.cs	2017-09-08 21:46:34 +02:00
Damnae	57e53ff03a	Fix diff-specific storyboard content being lost after loading.	2017-09-08 21:36:30 +02:00
Damnae	4ab243d885	CI fixes.	2017-09-08 21:23:24 +02:00
Damnae	e8ab853f6f	Make storyboard loops work.	2017-09-08 21:07:40 +02:00
Damnae	e4a2ad5eb5	Fix storyboard sprite flipping.	2017-09-08 20:39:17 +02:00
Dean Herbert	4dc67ed796	Merge pull request #1226 from MrTheMake/channelsection-initial-appearance ... Fix wrong initial topic color of not joined channels in the channel selection	2017-09-09 02:44:36 +09:00
Damnae	3f2598543c	Fix CommandLoop start and end time.	2017-09-08 18:03:04 +02:00
MrTheMake	5c125737cb	Fix wrong initial topic color of not joined channels in the channel selection	2017-09-08 17:47:23 +02:00
Dean Herbert	6b3b012960	Merge pull request #1225 from peppy/non-null-beatmap ... Ensure that WorkingBeatmap's Beatmap is never null	2017-09-08 23:43:32 +09:00
Dean Herbert	9b790157d8	Merge branch 'master' into non-null-beatmap	2017-09-08 23:33:03 +09:00
Dean Herbert	a769b94aa8	Merge pull request #1223 from peppy/home-hides-overlays ... Hide all overlays when home button is pressed	2017-09-08 23:32:50 +09:00
Dean Herbert	7b497c0ecb	Update framework	2017-09-08 23:24:47 +09:00
Dan Balasescu	3166394a59	Merge branch 'master' into home-hides-overlays	2017-09-08 23:23:20 +09:00
Dean Herbert	c0d7a257ee	Merge pull request #1103 from MrTheMake/leaderboard-scores ... Parse and show the mods of online leaderboards' scores	2017-09-08 21:51:51 +09:00
Damnae	e63fb5720c	Make CI happy.	2017-09-08 13:04:53 +02:00
Damnae	6cde687d87	Fix V commands parsing.	2017-09-08 12:36:13 +02:00
MrTheMake	0b1403683b	Moved OnlineScore inside GetScoresRequest.cs	2017-09-08 12:21:35 +02:00
MrTheMake	526ee107b8	Use a method to apply a beatmap, its ruleset and the mods.	2017-09-08 12:17:16 +02:00
Damnae	e02b481c69	An attempt at implementing storyboard loops.	2017-09-08 12:11:57 +02:00
Damnae	13322b4293	Improve compatibility with older storyboards.	2017-09-08 12:09:45 +02:00
Dean Herbert	a528173943	Ensure that WorkingBeatmap's Beatmap is never null ... Also ensures some extra fields inside Beatmap have non-null defaults.	2017-09-08 19:05:14 +09:00
Dean Herbert	80c35801a6	Hide all overlays when home button is pressed	2017-09-08 16:18:57 +09:00
Damnae	e547416193	Storyboards implementation.	2017-09-08 09:08:52 +02:00
MrTheMake	01553fc9ef	Moved all online related score parsing to its class	2017-09-08 02:46:54 +02:00
MrTheMake	e71f907f89	CI fix	2017-09-07 18:36:16 +02:00
MrTheMake	a7f874e5b6	Merge branch 'master' into leaderboard-scores	2017-09-07 18:25:33 +02:00
MrTheMake	709aa1ed3d	Moved all online score related parsing to its own class	2017-09-07 18:20:14 +02:00
Dean Herbert	c2b16dae10	Merge pull request #1183 from smoogipooo/menu-bar ... Implement EditorMenuBar inside a test case	2017-09-07 23:41:21 +09:00
Dean Herbert	439cbd09a0	Fix incorrect TestCase type	2017-09-07 23:28:34 +09:00
Dean Herbert	b9bec6a983	CI fixes	2017-09-07 23:06:35 +09:00
Dean Herbert	b135dc1f18	Merge remote-tracking branch 'upstream/master' into menu-bar	2017-09-07 22:58:41 +09:00
Dean Herbert	d4ae567f6c	Merge pull request #1220 from smoogipooo/mania-niceness ... Make osu!mania columns not progressively light up more	2017-09-07 22:56:40 +09:00
Dean Herbert	41398f57d6	Changes in line with framework	2017-09-07 20:36:32 +09:00
smoogipooo	b085208d24	Remove unused code	2017-09-07 16:15:33 +09:00
smoogipooo	ef9b87e8c7	Make column lights not increase in brightness when successfully pressed	2017-09-07 16:15:25 +09:00
smoogipooo	b98346c79f	Update framework.	2017-09-07 15:32:28 +09:00
smoogipooo	871ca7520f	Merge remote-tracking branch 'origin/master' into menu-bar	2017-09-07 15:32:01 +09:00
Dean Herbert	70e3ac30db	Merge pull request #1217 from peppy/fix-mania-input ... Fix incorrect initialisation order causing mania key bindings to not work	2017-09-06 23:30:03 +09:00
Dean Herbert	13c3ef65a8	Merge branch 'master' into fix-mania-input	2017-09-06 23:18:23 +09:00
Dean Herbert	c9e41e4b6f	Merge pull request #1120 from naoey/quit-chat-channels ... Add close button to chat channel tabs	2017-09-06 23:18:06 +09:00
Dean Herbert	e5308b6247	Method rename	2017-09-06 23:12:32 +09:00
Dean Herbert	da294c9605	Don't use base call when we don't have to	2017-09-06 23:10:08 +09:00
Dean Herbert	4f49a0c183	Simplify action	2017-09-06 22:58:21 +09:00
Dean Herbert	2c4de83298	Merge branch 'master' into fix-mania-input	2017-09-06 22:49:23 +09:00
Dean Herbert	a7fa66b9f9	Fix CI issue	2017-09-06 22:41:03 +09:00
Dean Herbert	858c41f86e	Merge branch 'master' into quit-chat-channels	2017-09-06 22:36:36 +09:00
Dean Herbert	632fe7d2e2	Merge pull request #1218 from smoogipooo/fix-testcases ... Remove a few unnecessary attributes in OsuTestCase.	2017-09-06 21:44:40 +09:00
Dean Herbert	940c45b6d1	Fix visual styling and code styling	2017-09-06 21:43:20 +09:00
Dean Herbert	c6fa899b15	Merge remote-tracking branch 'upstream/master' into quit-chat-channels	2017-09-06 21:43:03 +09:00
smoogipooo	f70b4839bd	Remove a few unnecessary attributes in OsuTestCase.	2017-09-06 21:22:23 +09:00