RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,335 Commits 3 Branches 651 Tags 355 MiB
Commit Graph

5476 Commits

Author SHA1 Message Date
EVAST9919 36ac002820 Fix incorrect null check 2017-11-11 18:25:16 +03:00
EVAST9919 74bcc61a67 Fix possible overlapping 2017-11-11 07:51:07 +03:00
EVAST9919 057ada0183 Fix nulls 2017-11-11 07:50:40 +03:00
EVAST9919 072e5db6ef Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-11 07:16:26 +03:00
EVAST9919 944bdc1c25 CI fixes 2017-11-11 07:07:41 +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 3261af5200 Add scores container 2017-11-11 03:46:06 +03:00
EVAST9919 6def49d6a4 Allow beatmap set response get online id 2017-11-11 01:51:42 +03: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
smoogipoo 5277c3c164 Set the frame time appropriately to reverse judgements a little better 2017-11-10 22:11:25 +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
Dan Balasescu b6fa871f58
Merge branch 'master' into user-overlay-crash-fix 2017-11-09 19:24:15 +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 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 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
smoogipoo 66ee9d1631 Update in-line with framework changes 2017-11-09 17:04:04 +09:00
smoogipoo 348083f589 Update with framework state transformation 
Removes explicit initial state setting in DrawableOsuHitObjects.
 2017-11-09 14:05:05 +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 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