Code

History

Commits on b36a39b2bcda94de87fdc831da884611f8a85eea to interface/src/Menu.cpp1120+
  1. Merge branch 'master' of https://github.com/worklist/hifi into 19484stojce committed 12 years ago13f223f
  2. fix 3d mode switch on/off issueBrad Hefta-Gaub committed 12 years ago1cfbfe6
  3. Merge branch 'master' of https://github.com/worklist/hifi into deboneAndrzej Kapolka committed 12 years ago865b495
  4. WL job #19484stojce committed 12 years ago150a667
  5. merge of windows-buildAndrew Meadows committed 12 years ago1266ffd
  6. Skeleton removal checkpoint; compiles, but there are a few bits missing.Andrzej Kapolka committed 12 years ago2c7b6b9
  7. added option to disable local cache fileBrad Hefta-Gaub committed 12 years agof1e9872
  8. Merge branch 'master' of git://github.com/worklist/hifi into windows_buildBrad Hefta-Gaub committed 12 years ago4778409
  9. Merge branch 'master' of git://github.com/worklist/hifi into windows_buildBrad Hefta-Gaub committed 12 years ago170dbe6
  10. Merge branch 'master' of git://github.com/worklist/hifi into 19485Lucas Crisman committed 12 years ago73dfc5d
  11. initial newline removal from all QDebug callsStephen Birarda committed 12 years ago987c639
  12. Merge branch 'master' of git://github.com/worklist/hifi into windows_buildBrad Hefta-Gaub committed 12 years ago392ff94
  13. more surgical removal of WebCam with HAVE_LIBVPXBrad Hefta-Gaub committed 12 years agob947d1e
  14. Merge branch 'master' of https://github.com/worklist/hifiAndrzej Kapolka committed 12 years ago7abb7d9
  15. allow fade scale to get smaller than minimum avatar scaleStephen Birarda committed 12 years ago42e3bcf
  16. Persist the user orientation as well as the position, show up a couple meters in front of (and facing) target. Closes #1367.Andrzej Kapolka committed 12 years ago2d5df38
  17. windows type mismatch warning fixesBrad Hefta-Gaub committed 12 years ago55babbf
  18. equal sign key as shortcut for Reset Avatar SizeLucas Crisman committed 12 years agoe1aa74a
  19. #19466 - Add avatar scale to preferences panelstojce committed 12 years ago2814cca
  20. Merge branch 'master' of https://github.com/worklist/hifi into 19463Stojce Slavkovski committed 12 years agof583013
  21. first cut at 3D TV supportZappoMan committed 12 years agoa438444
  22. replace LogDisplay with File loggerStojce Slavkovski committed 12 years agoee1eb25
  23. Fix for menu shortcuts; just include widget library rather than using awkward workaround.Andrzej Kapolka committed 12 years agof10dccb
  24. CR fixesStojce Slavkovski committed 12 years ago45d926d
  25. Merge branch 'master' of https://github.com/worklist/hifi into 19461Stojce Slavkovski committed 12 years ago4c1226f
  26. Merge branch 'master' of https://github.com/worklist/hifi into metavoxelsAndrzej Kapolka committed 12 years ago6cffce5
  27. get abstract menu class to workZappoMan committed 12 years agoccd6058
  28. Merge branch 'master' of https://github.com/worklist/hifi into metavoxelsAndrzej Kapolka committed 12 years agoa5c8531
  29. Dialog position / toggleStojce Slavkovski committed 12 years ago57b4148
  30. Merge branch 'master' of https://github.com/worklist/hifi into 19461Stojce Slavkovski committed 12 years ago3e1c857
  31. Merge branch 'master' of https://github.com/worklist/hifi into 19461Stojce Slavkovski committed 12 years ago841d491
  32. Merge branch 'master' of https://github.com/worklist/hifi into particle_blinky_bugZappoMan committed 12 years agoa2f1b3e
  33. added particle server details to voxel stats dialogZappoMan committed 12 years ago74d9c05
  34. Made drumming and slaps into menu choices from ‘Hand Options’Philip Rosedale committed 12 years ago35e7cfd
  35. Merge branch 'master' of https://github.com/worklist/hifi into 19461Stojce Slavkovski committed 12 years ago365d1ee