Code

History

Commits on master to interface/src/Menu.cpp1680+
  1. Merge branch 'master' of https://github.com/worklist/hifi into blendfaceAndrzej Kapolka committed 13 years ago9d28aae
  2. Parenting the info view to the menu is preventing the menu from showing up on Linux. Let's try not doing that.Andrzej Kapolka committed 13 years ago94d6f00
  3. Merge branch 'master' of https://github.com/worklist/hifi into blendfaceAndrzej Kapolka committed 13 years ago5c84161
  4. Include the face model URL in the same packet as the avatar voxel URL.Andrzej Kapolka committed 13 years agoa04ced6
  5. Merge branch 'master' of https://github.com/worklist/hifi into blendfaceAndrzej Kapolka committed 13 years ago1bd8ea9
  6. fixes for InfoView ownership and displayStephen Birarda committed 13 years agobbbdc4f
  7. allow setting of custom port via domainHostname settingStephen Birarda committed 13 years ago9fa695b
  8. use QHostInfo and QHostAddress for DS changes in NodeListStephen Birarda committed 13 years agoab85c41
  9. Working on downloading the faces.Andrzej Kapolka committed 13 years ago6be03ac
  10. Working on reading and rendering the rig from Faceshift.Andrzej Kapolka committed 13 years agof9426cb
  11. another merge commitatlante45 committed 13 years agoac0ee6c
  12. Merge pull request #924 from stojce/19418ZappoMan committed 13 years ago2d545c8
  13. Add ifdef for OS X to show delete hotkey in edit menuLionTurtle committed 13 years ago86d1666
  14. Change nudge UI to be more consistent with classic editing UI. Add menu option for Delete and fix delete for VoxelSelectMode.LionTurtle committed 13 years ago0251349
  15. Merge branch 'master' of https://github.com/worklist/hifi into 19418 Merge branch 'master'stojce committed 13 years ago921e88e
  16. non OS X menustojce committed 13 years agoeefe08e
  17. About menustojce committed 13 years ago330b1cd
  18. Fix for eyelids, change Faceshift menu option to indicate that it applies specifically to TCP connection.Andrzej Kapolka committed 13 years agofeecb4f
  19. Switching nudge to cut/paste implementation. Preliminary.LionTurtle committed 13 years agod965789
  20. Merge branch 'nudge'LionTurtle committed 13 years ago59943dc
  21. Add VoxelNudgeMode and preliminary UI grid for nudging.LionTurtle committed 13 years ago868ef8b
  22. Nudge code working for nudge that is greater than or equal to leaf size.LionTurtle committed 13 years ago6e37bc3
  23. Apply eye offset position based on Faceshift/webcam.Andrzej Kapolka committed 13 years ago1532b5d
  24. Merge branch 'master' of https://github.com/worklist/hifi into shiftyAndrzej Kapolka committed 13 years ago834b671
  25. memory wastes and code cleaning PR commentsatlante45 committed 13 years ago5da525f
  26. Added Menu instance deletion in Application destructor.atlante45 committed 13 years ago1781abe
  27. Some more memory leaks and codes formattingatlante45 committed 13 years agob03482e
  28. Working on Faceshift integration.Andrzej Kapolka committed 13 years ago213a8fc
  29. Merge branch 'master' of https://github.com/worklist/hifi into ledAndrzej Kapolka committed 13 years ago614f7cd
  30. Starting on LED tracking.Andrzej Kapolka committed 13 years ago4ca8a10
  31. tweak to how activateWindow() is called after dialog boxesZappoMan committed 13 years ago0df1112
  32. added Go To Domain, Go To Location, and tweaks to TREE_SCALE settingsZappoMan committed 13 years ago943e1f9
  33. implementing @problem's proposed changes to menusStephen Birarda committed 13 years ago818355d
  34. Merge branch 'master' of https://github.com/worklist/hifiAndrzej Kapolka committed 13 years ago6dbaedd
  35. New paste behaviouratlante45 committed 13 years agobae0f7f