Code

History

Commits on master to interface/src/Application.cpp2345+
  1. Open file async implementedvladest committed 9 years agoac7aa60
  2. Merge branch 'master' into modal_dialogs_asyncvladest committed 9 years ago63e907e
  3. Merge pull request #11169 from anshuman64/new-branchSeth Alves committed 9 years ago972a24f
  4. merge from masterSamGondelman committed 9 years ago4c55849
  5. Merge pull request #11021 from Zvork/fade2Sam Gateau committed 9 years ago79f3be1
  6. High Fidelity Interface renameAnshuman Dewangan committed 9 years agof79bf4e
  7. Merge branch 'master' into modal_dialogs_asyncvladest committed 9 years agob780d4b
  8. wrap in marketplace check and change landing pointLiv committed 9 years ago6bde4db
  9. fixed merge conflicts in marketplacesInject.jsElisa Lupin-Jimenez committed 9 years agoa2e407f
  10. Downloading blocks from marketplace in own asset folderElisa Lupin-Jimenez committed 9 years ago1ac9536
  11. Merge branch 'master' into sharksSam Gondelman committed 9 years ago85c3f94
  12. basic commerce infrastructurehoward-stearns committed 9 years ago1cf8149
  13. Download from blocks in marketplace workingElisa Lupin-Jimenez committed 9 years ago17acf05
  14. small typo fixLiv committed 9 years ago0784686
  15. Merge branch 'master' of https://github.com/highfidelity/hifi into buyhoward-stearns committed 9 years ago9349e72
  16. update error message wordingLiv committed 9 years agobd1619b
  17. 1st stage of moving to async dialogsvladest committed 9 years ago5565698
  18. Started blocks download catch, fixed a debug typoElisa Lupin-Jimenez committed 9 years agod599753
  19. add user logging detail messageLiv committed 9 years agoab8f5c1
  20. Make spawning point not 0,0,0 and change error messageLiv committed 9 years ago3f30162
  21. remove LaserPointerManager as a dependencySamGondelman committed 9 years ago4214764
  22. Merge branch 'master' of https://github.com/highfidelity/hifi into sharksSamGondelman committed 9 years ago489e08a
  23. Merge pull request #11053 from hyperlogic/feature/secondary-pose-supportSeth Alves committed 9 years agoaf1e27d
  24. stub fileshoward-stearns committed 9 years ago9bad26c
  25. Merge branch 'master' into feat/domain-setupLiv Erickson committed 9 years agoda70071
  26. changed debug print for unsupported entity filesElisa Lupin-Jimenez committed 9 years agoa246c59
  27. Fixed Mac and Ubuntu platform build issue (hopefully)Elisa Lupin-Jimenez committed 9 years ago8c9ce82
  28. Renamed isBlocks to isZip, added debug print for non-entity filesElisa Lupin-Jimenez committed 9 years agoebc28a6
  29. Drag zip cleaned up, marketplaces stylized, back button fixedElisa Lupin-Jimenez committed 9 years ago06ff766
  30. Clara download working again, still can drag in Blocks zipElisa Lupin-Jimenez committed 9 years ago692aa4c
  31. Removed extraneous print statementsElisa Lupin-Jimenez committed 9 years agoc6d5b1a
  32. Drag zip folder worksElisa Lupin-Jimenez committed 9 years agoc3d943f
  33. Blocks drag does not work yetElisa Lupin-Jimenez committed 9 years agoed1ed4f
  34. Can drag blocks zip folder into hifi and upload the .objElisa Lupin-Jimenez committed 9 years agoca6a323
  35. Merge branch 'master' into feature/secondary-pose-supportAnthony J. Thibault committed 9 years ago98bbe88