Code

History

Commits on master to interface/src/Application.cpp1470+
  1. Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotesterNissimHadar committed 8 years ago481eddb
  2. Check global switch as wellvladest committed 8 years ago1794113
  3. Merge branch 'master' into menu-updatesvladest committed 8 years agoc7ab1f3
  4. Merge branch 'master' into menu-updatesvladest committed 8 years ago5a5bfcf
  5. Disable current splash frame implementatonBradley Austin Davis committed 8 years ago38f43bd
  6. Alternate shaderBradley Austin Davis committed 8 years ago803bd28
  7. Additional work on splash screenBrad Davis committed 8 years ago7252678
  8. Merge remote-tracking branch 'hifi/master' into android_places_gotoCristian Luis Duarte committed 8 years ago03ca427
  9. Merge pull request #12956 from huffman/feat/client-texture-selection-bakingStephen Birarda committed 8 years agoec35462
  10. Patch for secondary camera assert error on AndroidGabriel Calero committed 8 years ago087c6ff
  11. Patch for secondary camera assert error on AndroidCristian Luis Duarte committed 8 years ago8c96d2b
  12. Fix for android buildsClement committed 8 years agoad60a79
  13. CRClement committed 8 years agob04c5bd
  14. Merge remote-tracking branch 'hifi/master' into android_places_gotoCristian Luis Duarte committed 8 years ago9f5365a
  15. Merge remote-tracking branch 'upstream/master' into android_new_loginGabriel Calero committed 8 years ago1330132
  16. merge from upstream master and fix conflictLiv Erickson committed 8 years agoee0af07
  17. Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotesterNissimHadar committed 8 years ago2311fa3
  18. Un-expose Application from javascript. Restore displayplugin deactivation when goes to backgroundGabriel Calero committed 8 years ago868b58e
  19. Snapshot notification sound settingsvladest committed 8 years ago9e5dbf9
  20. Correct usage of the test script URL.NissimHadar committed 8 years agoaef5ea0
  21. Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovementsZach Fox committed 8 years ago1da8409
  22. Fix warningClement committed 8 years ago487a630
  23. Update avatar query namesClement committed 8 years agod87cd2a
  24. Move all wire frustums to conical frustumsClement committed 8 years ago27c471e
  25. Rename ViewFrustum packets to AvatarQueryClement committed 8 years agoe400eb4
  26. Merge pull request #12990 from Atlante45/fix/spec-cam-avStephen Birarda committed 8 years ago2139628
  27. Merge pull request #12930 from Atlante45/fix/spec-camStephen Birarda committed 8 years ago31d5633
  28. Add testSnapshotLocation parameter to `takeSnapshot`.NissimHadar committed 8 years ago2c6c0a2
  29. Added `quitWhenFinished` parameter to the command line.NissimHadar committed 8 years agofe9c605
  30. Shutdown interface when test script finishes.NissimHadar committed 8 years ago3a54251
  31. Add cubemap output formatZach Fox committed 8 years agoc3d3cdc
  32. Don't display crash message if running from command line with a test script.NissimHadar committed 8 years ago46f461d
  33. Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotesterNissimHadar committed 8 years ago8b3c451
  34. Merge branch 'workload' of https://github.com/highfidelity/hifi into workloadsamcake committed 8 years ago1dc6988
  35. Merge 'master' into 'workload'Andrew Meadows committed 8 years ago99a75c5