Code

History

Commits on master to interface/src/Application.cpp2135+
  1. [WL21389] WL21389 PR2: Representation of collision shapes need updating (details below).LaShonda Hopper committed 9 years ago5b50b36
  2. Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMasterZach Fox committed 9 years agocda43ec
  3. add missing 'eyeToWorld' assignmentbeholder committed 9 years agocadf00f
  4. Merge branch 'master' into webbrowser_updatesvladest committed 9 years agod46578e
  5. resolve conflicts and cleanupSamGondelman committed 9 years ago7686948
  6. generalized scripting interfacesSamGondelman committed 9 years agofb96996
  7. Merge pull request #11387 from vladest/tablet_extended_soundsBrad Hefta-Gaub committed 9 years agof6af1d1
  8. Merge pull request #11611 from AndrewMeadows/faster-update-renderablesBrad Hefta-Gaub committed 9 years agod6ad389
  9. generalized pointer, laserpointermanager -> pointermanagerSamGondelman committed 9 years ago24ce09f
  10. Merge branch 'master' into tablet_extended_soundsvladest committed 9 years agoea6c2e1
  11. one global pickmanagerSamGondelman committed 9 years agod7745ef
  12. non-templated pickresult wipSamGondelman committed 9 years ago3572f7f
  13. Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMasterZach Fox committed 9 years ago9537e19
  14. Merge branch 'master' into webbrowser_updatesvladest committed 9 years ago92fc6da
  15. Merge pull request #11588 from jherico/future/qrcBradley Austin Davis committed 9 years agoaa6c841
  16. Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMasterZach Fox committed 9 years ago3f0b08a
  17. updates based on austin's commentsSamGondelman committed 9 years ago640ad51
  18. working generalized pickmanagerSamGondelman committed 9 years ago3ef7ebf
  19. merge from masterSamGondelman committed 9 years agod274d99
  20. update profiling timersAndrew Meadows committed 9 years agoe109101
  21. Merge branch 'RC-57' of https://github.com/highfidelity/hifi into pop_dynamicTests57Zach Fox committed 9 years agofebc725
  22. CLeaning up the pr regarding the scripts with my branch blueSam Gateau committed 9 years agoec93433
  23. Prototype packaging QML and related resources into a QRCBrad Davis committed 9 years ago2ae61cb
  24. move contextoverlay connection to contextoverlayinterfaceSamGondelman committed 9 years agoc4e6cb2
  25. Use atomic<bool> and compare_exchange_strongAnthony J. Thibault committed 9 years ago67d43b4
  26. const referencesSamGondelman committed 9 years ago5bfb0ba
  27. Reduce present traffic on main thread event queue.Anthony J. Thibault committed 9 years agoa2a6cd0
  28. put back overlay signals for scriptsSamGondelman committed 9 years agodacd488
  29. cleanup mousePressOffEntity signalSamGondelman committed 9 years ago0d16436
  30. Merge pull request #11554 from sethalves/import-av-entitiesBrad Hefta-Gaub committed 9 years ago1bba5ff
  31. cleaning up pointerevents, wipSamGondelman committed 9 years ago53fde83
  32. Merge branch 'master' into webbrowser_updatesvladest committed 9 years ago67ee4a7
  33. Getting closerZach Fox committed 9 years ago5efa920
  34. Merge branch 'master' into tablet_extended_soundsvladest committed 9 years ago145149f
  35. remove unused HFMetaEventsSamGondelman committed 9 years ago403b189