Code

History

Commits on master to interface/src/Application.cpp5390+
  1. Merge pull request #4768 from jherico/track-cameraPhilip Rosedale committed 11 years agod52d351
  2. Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereInZonesZappoMan committed 11 years ago77232e3
  3. Remove camera wobble cause by the face tracker and by idle animationsBradley Austin Davis committed 11 years agodc1b5a2
  4. removed some dead codeZappoMan committed 11 years ago32ef0c2
  5. wire up atmosphere.hasStars propertyZappoMan committed 11 years ago741323e
  6. wire up zone to environment atmosphere renderingZappoMan committed 11 years ago4561c59
  7. Fixing sixense and restoring lookatBradley Austin Davis committed 11 years ago098a9bd
  8. Merging back from part 1Bradley Austin Davis committed 11 years ago8119e3d
  9. Merge branch 'master' of https://github.com/highfidelity/hifi into orangeSam Gateau committed 11 years ago936eefd
  10. fixing commetns from reviewSam Gateau committed 11 years agoc7153bc
  11. Merge branch 'master' into plugins_pt1Bradley Austin Davis committed 11 years agofb3e309
  12. Fine tunning on windowsSam Gateau committed 11 years agob7baccc
  13. FINe tune the scales for the Mac Booksamcake committed 11 years ago8e65ce3
  14. Make the nw mapper work for th einputssamcake committed 11 years agod2e61db
  15. bringing the UserInputMapper to the applicationSam Gateau committed 11 years agoc9b2966
  16. quiet compilerSeth Alves committed 11 years ago0341caa
  17. remake foundation for CollisionEventsAndrew Meadows committed 11 years agofef8473
  18. Merge remote-tracking branch 'upstream/master' into plugins_pt1Brad Davis committed 11 years agoe72756a
  19. Removing access to the gl widget and display managersBrad Davis committed 11 years ago302aa9d
  20. Merge pull request #4735 from jherico/menu_fixPhilip Rosedale committed 11 years agod7cc76e
  21. fix simulation ownership infectionAndrew Meadows committed 11 years ago0a10257
  22. Merge branch 'master' into pluginsBrad Davis committed 11 years agoe6c241b
  23. Working on display pluginsBrad Davis committed 11 years agod8415ce
  24. merge upstream/master into andrew/novaAndrew Meadows committed 11 years ago3031d55
  25. make things compileAndrew Meadows committed 11 years agob023fe5
  26. Working on plugin rendering model:Brad Davis committed 11 years agoa482fa0
  27. cleanup how MotionStates are deleted from physicsAndrew Meadows committed 11 years ago4cb469d
  28. Make double click face tracking toggle button reset trackingDavid Rowe committed 11 years ago528f738
  29. Add face tracking toggle button beside microphone toggle buttonDavid Rowe committed 11 years agobc05159
  30. Add "Mute Face Tracking" menu itemDavid Rowe committed 11 years agod053379
  31. Working on merging in masterBrad Davis committed 11 years agoba4ae37
  32. Prevent the menu from coming up when alt is applied as a modifier to touch or mouse eventsBrad Davis committed 11 years ago57b7be3
  33. Merge branch 'master' into pluginsBrad Davis committed 11 years ago031b294
  34. Merge branch 'plugins2' into pluginsBrad Davis committed 11 years ago2fa92af
  35. Merge pull request #4673 from ctrlaltdavid/20496Brad Hefta-Gaub committed 11 years ago40d2e97