Code

History

Commits on master to interface/src/Application.cpp2485+
  1. Merge remote-tracking branch 'upstream/master' into 21180-C++humbletim committed 9 years ago026e05f
  2. Merged with masterOlivier Prat committed 9 years agod9a8353
  3. Merge pull request #10797 from ctrlaltdavid/21396Brad Davis committed 9 years ago31d2c99
  4. Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreviewDavid Kelly committed 9 years ago09d959b
  5. Improve naming and APIZach Fox committed 9 years ago9bd80ec
  6. Switch to preprocessor macro for blocking invokes to capture function informationBrad Davis committed 9 years ago6fc82bb
  7. Additional thread safetyBrad Davis committed 9 years ago8372d73
  8. Don't use blocking connections on the main threadBrad Davis committed 9 years agob52dd7b
  9. Additional tracing of CPU coresBrad Davis committed 9 years ago8ec20ef
  10. Merge branch 'master' of https://github.com/highfidelity/hifi into orangeSam Gateau committed 9 years agoca7e782
  11. Merge pull request #10846 from sethalves/fix-server-scripts-moreThijs Wenker committed 9 years agoe781f97
  12. Merge pull request #10836 from davidkelly/dk/scriptsSwitchBugHoward Stearns committed 9 years ago3606418
  13. make ResourceManager be owned by DependencyManagerSeth Alves committed 9 years ago794495c
  14. cr feedbackDavid Kelly committed 9 years ago48de801
  15. Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreviewDavid Kelly committed 9 years agob73102d
  16. Merge branch 'master' of git://github.com/highfidelity/hifi into 21378Olivier Prat committed 9 years agob76a8a6
  17. Merge branch 'master' of https://github.com/highfidelity/hifi into orangeSam Gateau committed 9 years ago1e2b0ca
  18. Cleanup entity dependenciesBrad Davis committed 9 years ago8130a91
  19. make scripts tree show scripts in directory passed in with --scriptsDavid Kelly committed 9 years ago9417a17
  20. this handles redirecting ktx_cache, data8, preparedDavid Kelly committed 9 years ago01155ba
  21. Merge branch 'master' of https://github.com/highfidelity/hifi into orangeSam Gateau committed 9 years ago63835d0
  22. Merge pull request #10799 from jherico/object_parent_warningsSeth Alves committed 9 years ago2f2a13e
  23. Merged with masterOlivier Prat committed 9 years ago1bb0d51
  24. Merge branch 'master' of https://github.com/highfidelity/hifi into orangeSam Gateau committed 9 years ago75e457c
  25. Merge branch 'master' into 21396David Rowe committed 9 years agobed0e8e
  26. Fix static plugin initialization on LinuxBradley Austin Davis committed 9 years ago960017d
  27. Merge branch 'master' of https://github.com/highfidelity/hifi into orangesamcake committed 9 years ago77650ac
  28. add support for switching cursor from arrow to reticlehumbletim committed 9 years agoc104751
  29. Merge pull request #10800 from hyperlogic/bug-fix/eyes-forwardSeth Alves committed 9 years ago43ba5f3
  30. Merge branch 'master' into 21396David Rowe committed 9 years ago6e266df
  31. Merge remote-tracking branch 'upstream/master' into 21180-C++humbletim committed 9 years agof6262ad
  32. Merge branch 'master' of https://github.com/highfidelity/hifi into orangesamcake committed 9 years ago17e2140
  33. Merge pull request #10804 from jherico/fix_deps_3Brad Davis committed 9 years agof1fe4ed
  34. Merge pull request #10792 from jherico/qml_crashesBrad Hefta-Gaub committed 9 years agodc649e8
  35. Remove dependency between codec plugins and UIBrad Davis committed 9 years agofe7d4b1