Upgrade to Pro — share decks privately, control downloads, hide ads and more …

Porting Sonic Dash to x86 with Git

Lee Winder
October 23, 2014

Porting Sonic Dash to x86 with Git

Talk given at Intel Buzz Stockholm about the Git process we use, with the Sonic Dash x86 port as an example.

Lee Winder

October 23, 2014
Tweet

More Decks by Lee Winder

Other Decks in Programming

Transcript

  1. Time release branches master develop hotfixes feature branches Feature for

    future Tag 1.0 Major feature for next From this point on, “next release” means the release after Severe bug fixed for productio n: hotfix 0.2 Bugfixes from rel. branch may be continuously merged back Tag 0.1 Tag 0.2 Incorporate bugfix in develop Only bugfixes! Start of release branch for 1.0 Author: Vincent Driessen Original blog post: http://nvie.com/archives/323 License: Creative Commons
  2. Time release branches master develop hotfixes feature branches Feature for

    future Tag 1.0 Major feature for next From this point on, “next release” means the release after Severe bug fixed for productio n: hotfix 0.2 Bugfixes from rel. branch may be continuously merged back Tag 0.1 Tag 0.2 Incorporate bugfix in develop Only bugfixes! Start of release branch for 1.0 Author: Vincent Driessen Original blog post: http://nvie.com/archives/323 License: Creative Commons The End
  3. Time release branches master develop hotfixes feature branches Feature for

    future Tag 1.0 Major feature for next From this point on, “next release” means the release after Severe bug fixed for productio n: hotfix 0.2 Bugfixes from rel. branch may be continuously merged back Tag 0.1 Tag 0.2 Incorporate bugfix in develop Only bugfixes! Start of release branch for 1.0 Author: Vincent Driessen Original blog post: http://nvie.com/archives/323 License: Creative Commons
  4. Doesn’t scale The concept of a single master branch when

    you have multiple supported releases
  5. develop features/ releases/ bugs/ Tag 1.1.0 Tag 1.0.0 Tag 1.0.1

    Branched as releases/1.0.x Branched as releases/1.1.x bugs/ branched and merged to releases/ only features/ branched and merged to develop only Cherry Pick this commit if we need it
  6. APP size 50MB Google Store Limit Game released Additional characters

    added Texture optimisation FAT binary support
  7. APP size 50MB Google Store Limit Game released Additional characters

    added Texture optimisation FAT binary support Split APK
  8. develop Unity beta installed Tag + release 1.16.0 Branched as

    releases/1.16.x features/ releases/ Time to merge back into develop
  9. develop Unity beta installed Tag + release 1.16.0 Branched as

    releases/1.16.x features/ releases/ Branched as releases/1.17.x
  10. develop Unity beta installed Tag + release 1.16.0 Branched as

    releases/1.16.x features/ releases/ Branched as releases/1.17.x
  11. develop Unity beta installed Tag + release 1.16.0 Branched as

    releases/1.16.x features/ releases/ Branched as releases/1.17.x Tag + submit 1.17.0
  12. develop Unity beta installed Tag + release 1.16.0 Branched as

    releases/1.16.x features/ releases/ Branched as releases/1.17.x Serious bug found in 1.16.0 Tag + submit 1.17.0
  13. 1.17.0 is in apple submission We can’t wait a week

    until we release a fix for Google
  14. develop Tag + release 1.16.0 features/ releases/ Tag + submit

    1.17.0 Tag + release 1.16.1 Cherry Pick this commit if we need it bugs/
  15. pull request process is even more important Tag + release

    1.16.0 releases/ Tag + release 1.16.1 Cherry Pick this submission if we need it bugs/
  16. Frame rate Menus Game highest average highest average 45 59

    40 54 45 35 emulated binary fat binary
  17. Frame rate Menus Game highest average highest average 45 59

    40 54 45 60 55 35 emulated binary fat binary
  18. develop features/ releases/ bugs/ Tag 1.1.0 Tag 1.0.0 Tag 1.0.1

    Branched as releases/1.0.x Branched as releases/1.1.x bugs/ branched and merged to releases/ only features/ branched and merged to develop only Cherry Pick this commit if we need it