Code

History

Commits on b36a39b2bcda94de87fdc831da884611f8a85eea to interface/src/Menu.cpp945+
  1. Merge branch 'master' of https://github.com/worklist/hifi into 19508stojce committed 12 years ago7169790
  2. styling QSliderstojce committed 12 years ago4e2d3c9
  3. Merge branch 'master' of https://github.com/worklist/hifi into 19508stojce committed 12 years ago6d15fb5
  4. CR fixesstojce committed 12 years ago576b8ac
  5. More dock widget tweaks.Andrzej Kapolka committed 12 years ago5f7e41b
  6. Make chat a dock widget, since that's the behavior it's emulating anyway (and for some reason, the current strategy causes a problem on at least Ryan's and my machine).Andrzej Kapolka committed 12 years agob721533
  7. Merge branch 'master' of https://github.com/worklist/hifi into 19495stojce committed 12 years ago4b182bb
  8. Merge branch 'master' of https://github.com/worklist/hifi into 19495stojce committed 12 years ago72a92a1
  9. New layoutstojce committed 12 years agoa29025a
  10. Merge branch 'master' of https://github.com/highfidelity/hifiAndrzej Kapolka committed 12 years ago95e59d7
  11. Wait until we know that Faceshift didn't connect before we attempt to initialize Visage.Andrzej Kapolka committed 12 years ago9d1278b
  12. Moved the chat from a window to a built-in panel.Dimitar Dobrev committed 12 years ago85a15a2
  13. Visage toggle bits.Andrzej Kapolka committed 12 years agofc32d95
  14. Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploaderAtlante45 committed 12 years ago51585ac
  15. Merge branch 'master' of https://github.com/worklist/hifi into 19508stojce committed 12 years ago939c17d
  16. Hid the chat window rather than close it in order to preserve sent messages.Dimitar Dobrev committed 12 years ago442ca14
  17. Using singleton for location managerstojce committed 12 years agoe231c84
  18. Merge branch 'master' of https://github.com/worklist/hifi into 19495stojce committed 12 years agocd1ec97
  19. Changed the chat window to a popup with a custom closing button.Dimitar Dobrev committed 12 years ago727903b
  20. Merge pull request #2277 from ZappoMan/server_scale_testingAndrewMeadows committed 12 years agobed8617
  21. Merge branch 'master' of https://github.com/worklist/hifi into 19495stojce committed 12 years ago004e8e0
  22. Multiple destinations implementationstojce committed 12 years agofd201c4
  23. Merge pull request #2268 from AndrewMeadows/radiansAndrzej Kapolka committed 12 years agoe249b29
  24. Moved Avatar upload to file MenuAtlante45 committed 12 years ago855f6fc
  25. add LOD to overlay displayZappoMan committed 12 years ago4b60c54
  26. Enabled 'Enter' to open the chat. Deleted the now obsolete ChatEntry.Dimitar Dobrev committed 12 years ago4c26f02
  27. Merge branch 'master' of https://github.com/worklist/hifi into 19495stojce committed 12 years ago7afd6c3
  28. Using new API clientstojce committed 12 years ago95d0128
  29. merge upstream master into "radians" projectAndrew Meadows committed 12 years ago793a760
  30. use radians instead of degrees (almost) everywhereAndrew Meadows committed 12 years agoaa8c2fc
  31. Added a define to ensure the build works without qxmpp.Dimitar Dobrev committed 12 years ago52c8ccb
  32. Moved the connection and configuration of XMPP to the log-in process.Dimitar Dobrev committed 12 years ago8664380
  33. Added a basic version of the chat window.Dimitar Dobrev committed 12 years ago437cadf
  34. remove dead VoxelSceneStats class and clean up Voxel Stats to be OctreeStatsZappoMan committed 12 years ago7fb872c
  35. Merge branch 'master' of https://github.com/worklist/hifi into 19508stojce committed 12 years ago8decf55