Code

History

Commits on master to interface/src/Application.cpp2030+
  1. Merge pull request #11935 from birarda/bug/atp-drop-actual-files-onlyClément Brisset committed 8 years ago18b9118
  2. only attempt default asset upload for local filesStephen Birarda committed 8 years ago3265eb4
  3. Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelistZach Fox committed 8 years agoa81a981
  4. Removed jitter samples from shader and added name to batches in DEBUG mode to ease render debugOlivier Prat committed 8 years ago92e1fe8
  5. Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3Seth Alves committed 8 years ago40412b8
  6. Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelistZach Fox committed 8 years agob2bafed
  7. Merge branch 'master' of https://github.com/highfidelity/hifi into mergeaccountglobalservicesDavid Back committed 8 years ago46d265e
  8. Merge branch 'master' into feature/domain-limited-heightAnthony J. Thibault committed 8 years agofbcecbf
  9. Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3Seth Alves committed 8 years ago86f58c1
  10. Merged with samcake's 'black' branchOlivier Prat committed 8 years ago1ce1aca
  11. Merge branch 'master' into mergeAccountGlobalServicesDavid Back committed 8 years ago3873a8f
  12. avatar-entities which are children of an avatar will scale with the avatarSeth Alves committed 8 years agob590cd5
  13. expose Window.getDeviceSize()SamGondelman committed 8 years agoc5ebb8a
  14. Merge pull request #11834 from highfidelity/pointersSam Gateau committed 8 years ago8389137
  15. remove unused variable warningDante Ruiz committed 8 years ago767b0fa
  16. Merging with mastersamcake committed 8 years ago84ff40c
  17. Merge branch 'master' of github.com:highfidelity/hifi into fix-modalDante Ruiz committed 8 years agoc9ad7b1
  18. change askToReplaceDomainContent to use async question and warningDante Ruiz committed 8 years ago88c3adb
  19. Change domain setting from min/max avatar scale to min/max avatar heightAnthony J. Thibault committed 8 years ago9f54ce5
  20. Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanupZappoMan committed 8 years ago3a967ca
  21. Merge pull request #11845 from thoys/feat/parentJointNameBrad Hefta-Gaub committed 8 years ago5dadec0
  22. Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanupZappoMan committed 8 years agob44ced4
  23. added support for exporting parentJointNameThijs Wenker committed 8 years ago627fee8
  24. Merge pull request #11849 from elisa-lj11/blocksElisa Lupin-Jimenez committed 8 years ago3211aa7
  25. hopefully fixed build error resulting from escape sequenceElisa Lupin-Jimenez committed 8 years agofb62875
  26. smart pointerThijs Wenker committed 8 years agoc3754d6
  27. simplified naming of zip foldersElisa Lupin-Jimenez committed 8 years agoa54f4ec
  28. Merge branch 'master' of https://github.com/highfidelity/hifi into blocksElisa Lupin-Jimenez committed 8 years agob6e75d1
  29. file structures in zip files replicated, more useful unzip debug print, updated blocks tablet app urlElisa Lupin-Jimenez committed 8 years ago3aa7cb4
  30. fixing merge conflictDante Ruiz committed 8 years ago76935c1
  31. Merge branch 'master' of github.com:highfidelity/hifi into feat/parentJointNameThijs Wenker committed 8 years agoe94199a
  32. reverted special property case, parentJointName is now only parsed from the JSON importThijs Wenker committed 8 years ago84ec989
  33. Merge branch 'master' of github.com:highfidelity/hifi into av-ent-misc-fixesSeth Alves committed 8 years agodf07b66
  34. Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanupZappoMan committed 8 years ago04ee1ad
  35. Merge pull request #11793 from ElderOrb/FB9032Brad Hefta-Gaub committed 8 years agoe070033