Code

History

Commits on master to interface/src/Application.cpp2170+
  1. Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsZach Fox committed 9 years agof037eab
  2. Merge pull request #11542 from SamGondelman/bubbleBoySam Gateau committed 9 years agof143c28
  3. Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsZach Fox committed 9 years ago0ae69b6
  4. Merge pull request #11555 from zfox23/commerce_daveIntegration2Zach Fox committed 9 years agob105248
  5. Merge pull request #11451 from huffman/feat/upload-user-eventClément Brisset committed 9 years ago3b48833
  6. replace parent avatar-id with avatar-self-id when exporting entitiesSeth Alves committed 9 years agof349ba3
  7. Final fixesZach Fox committed 9 years agob81a8a9
  8. don't export avatar-parent sessions IDs into jsonSeth Alves committed 9 years agod1d2b8a
  9. move stuff out of writelock when possibleAndrew Meadows committed 9 years agobbde1bc
  10. be picky when finding nearby entities at loginAndrew Meadows committed 9 years ago0bcecdb
  11. workaround for bad physics polling on loginAndrew Meadows committed 9 years ago0f4e7fb
  12. fix missing sensorToWorld matrixSamGondelman committed 9 years agoe95ecc3
  13. merge with masterSamGondelman committed 9 years ago7e6d5d9
  14. Better implementation of location change and bugfixesZach Fox committed 9 years ago1fa9bd8
  15. Merge pull request #11326 from cain-kilgore/21537Ryan Huffman committed 9 years ago9c06afc
  16. Merge branch 'master' of https://github.com/highfidelity/hifi into blackSam Gateau committed 9 years ago69e68ef
  17. Merge branch 'master' of https://github.com/highfidelity/hifi into blacksamcake committed 9 years ago7f86a4e
  18. Merging with mastersamcake committed 9 years agod7333d3
  19. merge from masterSamGondelman committed 9 years agofa838e4
  20. Merge pull request #11495 from zfox23/pop_interfaceChanges2Zach Fox committed 9 years agoea3da6c
  21. put more of Application::update() under time measurementAndrew Meadows committed 9 years agocd4be14
  22. Merge branch 'master' of https://github.com/highfidelity/hifi into blueSam Gateau committed 9 years ago316156d
  23. Avoiding the need for the GLobal frameTiing Scriptiong interface and just a regular member of APplication insteadsamcake committed 9 years agobb99f68
  24. Merging with mastersamcake committed 9 years ago6639287
  25. cleanup debug stats, use more correct namesAndrew Meadows committed 9 years ago8d2153d
  26. Merge pull request #11471 from Atlante45/feat/auto-bakeAndrew Meadows committed 9 years ago0fc6bf1
  27. Merge pull request #11491 from jherico/dev/disable_watchdogSam Gateau committed 9 years ago68046ae
  28. Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2Zach Fox committed 9 years ago1ec0f5d
  29. Merge branch 'master' into tablet_extended_soundsvladest committed 9 years agoe360c13
  30. fine tuning the changes to respect clean upSam Gateau committed 9 years ago6c510bc
  31. Removing commentssamcake committed 9 years ago0cbf19b
  32. Cleaning up the changed codesamcake committed 9 years agoaa10c29
  33. moving render specific code from Application.cpp to Application_render.cppSam Gateau committed 9 years ago44cc6de
  34. Adding stuff that seems to break?samcake committed 9 years ago577378f
  35. Merge branch 'master' of https://github.com/highfidelity/hifi into bluesamcake committed 9 years ago225d2bb