Code

History

Commits on master to interface/src/Application.cpp4690+
  1. merge with upstreamSam Gateau committed 11 years ago8b7ad9c
  2. merge with upstreamSam Gateau committed 11 years agoab4b940
  3. press o to toggle overlays in case you don't have a middle mouse clickSam Gondelman committed 11 years ago9025bc3
  4. Merge branch 'master' into 20639David Rowe committed 11 years ago02ae008
  5. Merge branch 'master' into 20639David Rowe committed 11 years agoed259e6
  6. Don't check SMI Eye Tracker menu item if tracking doesn't startDavid Rowe committed 11 years agoe5d2a78
  7. Merge pull request #5369 from ericrius1/hitEffectsamcake committed 11 years ago4ebc75d
  8. Control eyes only if in HMD view or simulatingDavid Rowe committed 11 years ago76fe0c8
  9. Merge pull request #5435 from MarcelEdward/hifi-2-20069Andrew Meadows committed 11 years agoa1e6fdc
  10. Another whack at touch eventsBrad Davis committed 11 years ago900c2c1
  11. fixed merge conflicts and refactored hit effect to catch up with refactored rendering engineericrius1 committed 11 years ago697cb4c
  12. Accept touch events in the GL windowBrad Davis committed 11 years ago07553e7
  13. Calculate and look at the point the eye tracker user is looking atDavid Rowe committed 11 years ago1ae9203
  14. Merge remote-tracking branch 'upstream/master' into pluginsBrad Davis committed 11 years agobb29127
  15. Changed mirror position to not be achored to the head.Anthony J. Thibault committed 11 years ago044ea2a
  16. Merge pull request #5449 from ZappoMan/pluginsBrad Davis committed 11 years ago3210037
  17. Merge pull request #5450 from SamGondelman/sam/input-pluginsBrad Davis committed 11 years ago91768b3
  18. Working on display plugins stabilityBrad Davis committed 11 years ago8202862
  19. test this on windows ?samcake committed 11 years ago9cf3dfd
  20. fix crash in Particle Entities and pendingChanges.updateItem()ZappoMan committed 11 years agoc15161b
  21. Add menu item that enables / disables simulated eye trackingDavid Rowe committed 11 years agof0ed8d8
  22. Merge remote-tracking branch 'upstream/plugins' into sam/input-pluginsSamGondelman committed 11 years ago482f064
  23. removed hand lasers because they had been renamed so they weren't removedSamGondelman committed 11 years ago782a5c4
  24. Bad variable usage on OSXBradley Austin Davis committed 11 years ago6df260b
  25. Working on fullscreen targetingBrad Davis committed 11 years ago2bb7a20
  26. Initialize, start, and stop eye tracking with simulated dataDavid Rowe committed 11 years ago72a590e
  27. merged masterSam Gateau committed 11 years ago22e70ee
  28. Merge remote-tracking branch 'upstream/plugins' into sam/input-pluginsSam Gondelman committed 11 years ago469696f
  29. Merge remote-tracking branch 'upstream/master' into pluginsBrad Davis committed 11 years agoa049b14
  30. Merge pull request #5376 from venkatn93/avatarBrad Hefta-Gaub committed 11 years ago43eec08
  31. Make Throttle FPS If Not Focus be enabled by defaultDavid Rowe committed 11 years ago8a7cdb1
  32. Merge branch 'master' of https://github.com/highfidelity/hifi into punkSam Gateau committed 11 years agobaf7873
  33. Removing all the unecessary calls of Batch from the gl legacy timeSam Gateau committed 11 years agof525a8a
  34. Changing var name to 'DebugAmbientOcclusion'Niraj Venkat committed 11 years ago34e400a
  35. Add eye tracker class and menu itemDavid Rowe committed 11 years agoe0ca6eb