Commit Graph

1803 Commits

Author SHA1 Message Date
EVAST9919 d62da4334e Add and place all the bottom bar objects 2017-11-17 12:26:13 +03:00
Dean Herbert 62358c0b53
Merge branch 'master' into beatmap_scores 2017-11-16 00:45:17 +09:00
Dean Herbert f912744acc Fix sizing of ModIcon 2017-11-16 00:15:27 +09:00
Dean Herbert 8011048540 Fix hard crash when clicking play button with no map selected
Resolves #1507.
2017-11-15 20:03:18 +09:00
Dean Herbert eaf1a60fe1
Merge branch 'master' into beatmap_scores 2017-11-15 17:58:07 +09:00
EVAST9919 ea2fa5fa00 Fix wrong ratings calculations 2017-11-15 09:48:40 +03:00
EVAST9919 8688afecde Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-14 20:13:07 +03:00
smoogipoo 9344502b71 More warning fixes 2017-11-14 18:05:07 +09:00
smoogipoo bd7a6a90f5 Remove unused fields 2017-11-14 17:43:19 +09:00
smoogipoo cd8d7af9db Clean up a few warnings in preparation for net-standard 2017-11-14 13:06:25 +09:00
EVAST9919 d157e6baf1 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-13 16:02:44 +03:00
Dean Herbert a2cb9d4086 Fix audio not playing during player loading
Regression due to changed audio initialisation logic.
2017-11-13 19:43:00 +09:00
Dean Herbert 49a5af60e2 Fix multiple order-of-execution issues with osu! logo
Also sets better defaults.
2017-11-13 18:43:16 +09:00
Dean Herbert ee3a5b38f4
Merge branch 'master' into performance-improvements 2017-11-13 13:50:57 +09:00
EVAST9919 51adea2a60 Convert text to a local variable 2017-11-13 05:58:19 +03:00
EVAST9919 89e9f84753 Add padding to the text container 2017-11-13 05:52:05 +03:00
EVAST9919 ec75837965 Replay speed setting visual improvements 2017-11-13 05:04:21 +03:00
Dean Herbert 11077546d1 Load logo async 2017-11-13 09:50:37 +09:00
EVAST9919 072e5db6ef Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-11 07:16:26 +03:00
Dean Herbert 7d4e1b6f22 Don't require a local storage variable for restoring playback speed 2017-11-11 13:03:46 +09:00
Dean Herbert 3142832693 Add precision to playback speed 2017-11-11 13:00:29 +09:00
EVAST9919 5bf756c3c6 Add DrawableTopScore 2017-11-11 06:54:52 +03:00
Dean Herbert 3d1d66d886
Merge branch 'master' into replay_speed 2017-11-11 10:41:38 +09:00
EVAST9919 4b21c83f35 Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-11-10 17:24:26 +03:00
smoogipoo 5816d25358 Merge remote-tracking branch 'origin/master' into replay-rewinding 2017-11-10 22:19:17 +09:00
Dan Balasescu 89fd92c15b
Merge branch 'master' into menu-select-transition-improvements 2017-11-10 21:03:24 +09:00
Dean Herbert 49731f4c05 Remove unused parmeter 2017-11-10 19:32:09 +09:00
Dean Herbert bd2de89918 Why weren't these fixed previously 2017-11-10 19:26:25 +09:00
Dean Herbert 4a5a293376 Merge branch 'master' into replay-rewinding 2017-11-10 19:08:13 +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 5eb94f7e68 Fix loader pushing children screens before it is displayed itself 2017-11-09 23:29:56 +09:00
Dean Herbert 724540ceaa Fix toolbar not appearing at main menu 2017-11-09 20:38:34 +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
Dean Herbert 4874371dbf Rename methods back 2017-11-09 17:38:20 +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 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