Code

History

Commits on master to interface/src/Menu.cpp1260+
  1. Merge branch 'master' of https://github.com/highfidelity/hifiAndrzej Kapolka committed 12 years ago39135d3
  2. Added tools to adjust avatar LOD to LOD tools dialog. Closes #2624.Andrzej Kapolka committed 12 years agofe7a359
  3. merge upstream/master -> andrew/inertiaAndrew Meadows committed 12 years ago5ac7be8
  4. Merge pull request #2650 from thoys/chatwindow-docking-featurePhilip Rosedale committed 12 years ago8ccc0a2
  5. save settings when any checkable menu item changesAndrew Meadows committed 12 years agoaf158a3
  6. save settings for change in: identity, positionAndrew Meadows committed 12 years agoa436b59
  7. Fixed docking of ChatWindow Temporary Pin Icon, replace with a nice looking one pleaseThijs Wenker committed 12 years agof0463a5
  8. Merge branch 'master' of https://github.com/worklist/hifi into 19508Stojce Slavkovski committed 12 years ago112c894
  9. fix crash: don't access null actionAndrew Meadows committed 12 years agoac9ead3
  10. Merge branch 'master' of https://github.com/worklist/hifi into 19508Stojce Slavkovski committed 12 years ago459fed5
  11. Update chat menu to properly position itself when openingRyan Huffman committed 12 years ago2d481dd
  12. Remove chat window opening animationRyan Huffman committed 12 years ago5099a0e
  13. Merge pull request #2636 from ey6es/faceplusPhilip Rosedale committed 12 years agode6b556
  14. remove the audio scopeStephen Birarda committed 12 years agocf47418
  15. resolve conflicts on merge with upstream masterStephen Birarda committed 12 years ago1c861fb
  16. Merge branch 'master' of https://github.com/highfidelity/hifi into faceplusAndrzej Kapolka committed 12 years agof707719
  17. More progress on Faceplus integration.Andrzej Kapolka committed 12 years ago55e0035
  18. run regex header replacement on all cpp filesStephen Birarda committed 12 years ago684c6b5
  19. Merge branch 'master' of https://github.com/worklist/hifi into 19508stojce committed 12 years agocc2f03f
  20. Merge branch 'master' of https://github.com/highfidelity/hifi into authenticationStephen Birarda committed 12 years ago6681754
  21. Merge pull request #2614 from Atlante45/undo_redo_systemBrad Hefta-Gaub committed 12 years ago8e097be
  22. More work on Undo/RedoAtlante45 committed 12 years agod213cd7
  23. resolve conflicts on merge with upstream masterStephen Birarda committed 12 years agoefcf506
  24. Frameless dialog position/size fixesstojce committed 12 years agoba5a092
  25. Merge branch 'master' of https://github.com/worklist/hifi into 19508stojce committed 12 years agob45f61e
  26. lots of knobs and dialsZappoMan committed 12 years ago593fc6c
  27. Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxelsAndrzej Kapolka committed 12 years ago1c82254
  28. Merge branch 'master' of https://github.com/highfidelity/hifi into undo_redo_systemAtlante45 committed 12 years agoa0e70d0
  29. Increase the rate at which we increase detail and put a limit on the LOD multiplier so that it never takes more than about five seconds to return to default detail. Also, since there seems to be a weird issue where OS X throttles the frame rate to 30 fps (independent of our own throttling), use that as the lower adjustment range.Andrzej Kapolka committed 12 years ago3a125db
  30. Merge branch 'master' of https://github.com/worklist/hifi into 19508stojce committed 12 years ago8dc6ca7
  31. Working on model rendering modes.Andrzej Kapolka committed 12 years agoa0c7e4d
  32. add reflection stats to stats display, add pre-delay, add toggle for separate ears, add surface randomnessZappoMan committed 12 years agoc35d6bd
  33. latest pass, improved distance calulations, added menu item to remove original sourceZappoMan committed 12 years ago98f0fe8
  34. Added undo/redo support to the clientAtlante45 committed 12 years agod3ce2c7
  35. add first cut at simple low pass filterZappoMan committed 12 years ago06adaa0