Code

History

Commits on master to interface/src/Application.cpp2555+
  1. Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619Zach Fox committed 9 years agocbdffce
  2. Merge branch 'master' of github.com:highfidelity/hifi into hand-pucksDante Ruiz committed 9 years agocfffb74
  3. Merge pull request #10718 from jherico/frame_threadBrad Davis committed 9 years agoed6620f
  4. report and quit command line switcheshoward-stearns committed 9 years agoc6d66d4
  5. Put back test if not physics enabled in entity items should fade function as it gives too many undesired refadesOlivier Prat committed 9 years ago0211338
  6. fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look atSeth Alves committed 9 years ago39fb94d
  7. Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-cameraZach Fox committed 9 years ago08eb072
  8. Merge branch 'master' of https://github.com/highfidelity/hifi into orangesamcake committed 9 years agoebc4745
  9. Merge branch 'master' of git://github.com/highfidelity/hifi into 21378Olivier Prat committed 9 years ago21276a8
  10. Disabled check on enabled physics when deciding is fade is adequateOlivier Prat committed 9 years agob6b1875
  11. Merge remote-tracking branch 'upstream/master' into HEADhumbletim committed 9 years ago26f651a
  12. CleanupVladyslav Stelmakhovskyi committed 9 years ago59a77c1
  13. Merge branch 'master' into fix_tablet_buttons_qt59Vladyslav Stelmakhovskyi committed 9 years agob8bb802
  14. Send mouse events before touch event. It seems the order is important for Qt 5.9Vladyslav Stelmakhovskyi committed 9 years ago5a0783c
  15. PR feedback and cmake fixesBrad Davis committed 9 years agoa69cf31
  16. fixed merge conflict'Dante Ruiz committed 9 years agoda29157
  17. Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreviewDavid Kelly committed 9 years ago6dd1e6e
  18. Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-cameraZach Fox committed 9 years ago7a76c9c
  19. Merge branch 'master' into 21180-C++humbletim committed 9 years agofc33e95
  20. Cleanup and refactoringBrad Davis committed 9 years agofece438
  21. got rid of tabsBurt Sloane committed 9 years ago4f7a1a6
  22. more PR fixesBurt Sloane committed 9 years ago7d92ef9
  23. fix PR issuesBurt Sloane committed 9 years agoa73281b
  24. Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreviewDavid Kelly committed 9 years agof75cbfa
  25. midi in and outBurt Sloane committed 9 years ago7022c40
  26. Merge branch 'master' of github.com:highfidelity/hifi into audio/parityZach Pomerantz committed 9 years ago3093a73
  27. Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-cameraZach Fox committed 9 years ago6054907
  28. Merge pull request #10684 from howard-stearns/avatar-whitelistBrad Hefta-Gaub committed 9 years ago035a9e8
  29. Merge branch 'master' of github.com:highfidelity/hifi into controller-uiDante Ruiz committed 9 years agod65c0df
  30. Remove old Leap Motion codeDavid Rowe committed 9 years agoa8501a7
  31. Introducing the SCeneUpdtate job to the engine to take care of performing transactions and introducing the stagessamcake committed 9 years agod838092
  32. initial skeleton of qml objectsDavid Kelly committed 9 years ago54dfc33
  33. Fix crash on exit when tablet is openBrad Davis committed 9 years ago7a6df85
  34. reset avatar on domain change if the last domain imposed something on usHoward Stearns committed 9 years ago87f3ce7
  35. rm debuggingZach Pomerantz committed 9 years agob246811