8287 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
EVAST9919	4b21c83f35	Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed	2017-11-10 17:24:26 +03:00
Dan Balasescu	c9673bcd0d	Merge pull request #1481 from peppy/menu-select-transition-improvements ... Improve transition when exiting song select	2017-11-10 21:10:13 +09:00
Dan Balasescu	89fd92c15b	Merge branch 'master' into menu-select-transition-improvements	2017-11-10 21:03:24 +09:00
Dan Balasescu	ae0e3a01b8	Merge pull request #1484 from peppy/fix-player-audio-loading ... Ensure we wait for audio track reset before proceeding with player execution	2017-11-10 20:53:12 +09:00
Dean Herbert	819b0b1970	Update framework	2017-11-10 18:48:46 +09:00
Dean Herbert	bc54d4dd4f	Ensure we wait for audio track reset before proceeding with player execution	2017-11-10 18:32:15 +09:00
Dean Herbert	9e82fc21ac	Improve transition when exiting song select ... Reduces the delay before the main menu appears, but also synchronises the full main menu appearance animation with the logo's apperance.	2017-11-10 01:10:44 +09:00
Dean Herbert	4175f52f0b	Merge pull request #1480 from peppy/fix-loader-in-release ... Fix loader pushing children screens before it is displayed itself	2017-11-09 23:39:17 +09:00
Dean Herbert	5eb94f7e68	Fix loader pushing children screens before it is displayed itself	2017-11-09 23:29:56 +09:00
Dan Balasescu	8a8e6269ad	Merge pull request #1479 from peppy/fix-toolbar-display ... Fix toolbar not appearing at main menu	2017-11-09 21:30:43 +09:00
Dean Herbert	724540ceaa	Fix toolbar not appearing at main menu	2017-11-09 20:38:34 +09:00
Dan Balasescu	f430529776	Merge pull request #1472 from EVAST9919/user-overlay-crash-fix ... RankChartLineGraph improvements	2017-11-09 19:37:38 +09:00
Dan Balasescu	b6fa871f58	Merge branch 'master' into user-overlay-crash-fix	2017-11-09 19:24:15 +09:00
Dan Balasescu	91ccb1bffd	Merge pull request #1474 from miterosan/null_check ... Add null check in parameters.	2017-11-09 19:21:22 +09:00
Dan Balasescu	feca7a00c2	Merge branch 'master' into user-overlay-crash-fix	2017-11-09 19:21:05 +09:00
Dan Balasescu	128143a1f4	Merge branch 'master' into null_check	2017-11-09 18:39:06 +09:00
Dean Herbert	186877a290	Merge pull request #1476 from peppy/intro-v2 ... Add a new startup sequence	2017-11-09 18:22:43 +09:00
Dean Herbert	598e1652dc	Adjust timings	2017-11-09 18:12:33 +09:00
Dean Herbert	6d56b3c2df	Hide triangles during outro	2017-11-09 17:52:38 +09:00
Dean Herbert	e3a868744e	Merge branch 'master' into intro-v2	2017-11-09 17:48:42 +09:00
Dan Balasescu	10d0032c92	Merge pull request #1452 from peppy/single-osu-logo ... Make the osu! logo shared game-wide	2017-11-09 17:46:46 +09:00
Dean Herbert	a1cee2e61e	Merge remote-tracking branch 'upstream/master' into single-osu-logo	2017-11-09 17:39:14 +09:00
Dean Herbert	4874371dbf	Rename methods back	2017-11-09 17:38:20 +09:00
Dean Herbert	af35a2300e	Merge pull request #1468 from swoolcock/config-precision ... Add precision values to config bindables	2017-11-09 14:03:50 +09:00
Dean Herbert	8c0eee84a2	Merge branch 'master' into config-precision	2017-11-09 13:55:52 +09:00
Dean Herbert	e2005c4431	Add comment explaining necessity of AlwaysPresent for now	2017-11-08 20:36:18 +09:00
Dean Herbert	df6c808d28	Adjust animation to designer-san's liking	2017-11-08 17:04:36 +09:00
Dean Herbert	cabb22b6d1	Merge branch 'single-osu-logo' into intro-v2	2017-11-08 16:43:07 +09:00
Dean Herbert	c2d4a213b1	Rename logo-related methods	2017-11-08 16:34:03 +09:00
Dean Herbert	a8bacd1ed4	Remove unnecessary private method /shrug	2017-11-08 14:46:47 +09:00
Dean Herbert	7ad498cb29	Remove unused puzzle pieces	2017-11-08 14:45:01 +09:00
Dean Herbert	fafca093e8	Update framework	2017-11-08 14:43:15 +09:00
Dean Herbert	90fec5f370	Merge branch 'master' into single-osu-logo	2017-11-08 14:37:20 +09:00
Dean Herbert	41fcecf759	Add intro in to actual game	2017-11-08 14:31:11 +09:00
Dean Herbert	d8d7165164	Add a test case which starts the game	2017-11-08 13:52:44 +09:00
Dean Herbert	713d730d10	Simplify restart process and defaults initialisation	2017-11-08 13:32:03 +09:00
Dean Herbert	1771e003f7	Simplify more	2017-11-08 12:13:30 +09:00
Dean Herbert	419f041291	Fix text alignment	2017-11-08 12:12:27 +09:00
Dean Herbert	f83c095269	Simplify more	2017-11-08 12:10:32 +09:00
Dean Herbert	89426e1c11	Simplify lines	2017-11-08 12:07:52 +09:00
Dean Herbert	7dcdf78608	Make bars and circles better	2017-11-08 12:06:22 +09:00
Dean Herbert	a72e798b85	bar -> line	2017-11-08 11:21:50 +09:00
Dean Herbert	97b238d084	Simplify intro sequence a bit more	2017-11-08 11:20:21 +09:00
Dean Herbert	552a361a24	Merge remote-tracking branch 'upstream/master' into intro-v2	2017-11-08 11:08:42 +09:00
Miterosan	567cd6316c	beatmap can not be null in DifficultyColouredContainer.cs	2017-11-07 23:17:45 +01:00
Miterosan	b2e49c1e71	line can not be null in OsuLegacyDecoder.cs	2017-11-07 23:17:26 +01:00
Miterosan	13e75780d7	beatmap and stream can not be null in OsuLegacyDecoder.cs	2017-11-07 23:17:07 +01:00
Miterosan	1e6f1d07d2	line can not be null in OsuLegacyDecoder.cs	2017-11-07 23:16:42 +01:00
Miterosan	a15ab785f2	palette can not be null in DifficultyColouredContainer.cs	2017-11-07 23:16:19 +01:00
Miterosan	36ce287b88	panels can not be null in BeatmapSetHeader.cs	2017-11-07 23:15:51 +01:00