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

8338 Commits

Author SHA1 Message Date
EVAST9919 1792075cf9 Loading animation fix 2017-11-12 07:50:01 +03:00
EVAST9919 7c0b13f9ef CI fixes and minor visual improvements 2017-11-12 07:31:08 +03:00
EVAST9919 569780d37b Move Api request outside the scores container itself 2017-11-12 07:05:50 +03:00
EVAST9919 bc45843def Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-12 06:21:53 +03:00
EVAST9919 36ac002820 Fix incorrect null check 2017-11-11 18:25:16 +03:00
Dean Herbert 6300e182e2
Merge pull request #1487 from smoogipoo/version-overlay-switch 
Add startup argument to disable the version overlay
 2017-11-11 23:26:58 +09:00
smoogipoo 3d6bb3befe Add startup argument to disable the version overlay 2017-11-11 22:56:02 +09:00
Dean Herbert 9a8d9aa781
Merge pull request #1486 from peppy/update-frameworks 
Update framework and resources
 2017-11-11 15:58:43 +09:00
Dean Herbert 9e447fcb27 Update framework an resources 2017-11-11 15:53:01 +09: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
Dean Herbert 855b849e84
Merge pull request #1336 from EVAST9919/replay_speed 
Add replay speed adjustment setting
 2017-11-11 13:09:49 +09: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
Dean Herbert fd5113ac3c
Merge pull request #1453 from smoogipoo/replay-rewinding 
Implement the necessary interfaces to allow replay rewinding
 2017-11-11 10:34:44 +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 e742c07f7d Update framework 2017-11-10 22:17:41 +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 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 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 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