Code

History

Commits on master to interface/src/main.cpp490+
  1. improved collisions between avatarsJeffrey Ventrella committed 13 years ago5c3bd5f
  2. Merge remote-tracking branch 'upstream/master'Jeffrey Ventrella committed 13 years ago308b9dc
  3. made a different prototype for camera shifting into first-personJeffrey Ventrella committed 13 years agoadccd62
  4. Merge remote-tracking branch 'upstream/master'Philip Rosedale committed 13 years ago16ea53f
  5. Merge pull request #158 from ey6es/masterPhilip Rosedale committed 13 years agoebc5d66
  6. Added toggle for nonblocking networking; default to threaded for now, since we're seeing lower frame rates.Andrzej Kapolka committed 13 years agoc26becf
  7. Merge remote-tracking branch 'upstream/master'Philip Rosedale committed 13 years ago99957f3
  8. Merge pull request #155 from Ventrella/masterPhilip Rosedale committed 13 years ago69cf6e3
  9. Merge remote-tracking branch 'upstream/master'Philip Rosedale committed 13 years ago996a879
  10. Merge branch 'master' of git://github.com/worklist/hifi into 19165tosh committed 13 years agodbfef9d
  11. How'd those tabs get in there?Andrzej Kapolka committed 13 years ago21f1669
  12. moved handControllerJeffrey Ventrella committed 13 years agoe9592f9
  13. Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_workZappoMan committed 13 years ago88039e6
  14. merge with upstream master and resolve conflictsJeffrey Ventrella committed 13 years agodc11055
  15. Removed field and Cloud classesPhilip Rosedale committed 13 years ago824abca
  16. Removed renderPitchRate, renderYawRate, startYaw from main.cpp, they are not doing anything.Philip Rosedale committed 13 years ago2e518f8
  17. Merge branch 'master' of https://github.com/worklist/hifiAndrzej Kapolka committed 13 years ago0932a8b
  18. Rather than creating a thread to read datagrams, just set the socket to nonblocking mode and check it before simulating. This addresses one aspect of the lack of synchronization on AgentList, but there are other issues...Andrzej Kapolka committed 13 years agob9fdba2
  19. merge with upstream masterJeffrey Ventrella committed 13 years agofe2e180
  20. Style tweaks: preface privates with underscore, capitalize enum members.Andrzej Kapolka committed 13 years ago46041b2
  21. Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work Fixed conflict in interface/src/main.cppZappoMan committed 13 years ago17694b3
  22. Added HandControl class and also Avatar Touch classJeffrey Ventrella committed 13 years agoce1ceb8
  23. Merge branch 'master' of https://github.com/worklist/hifiPhilip Rosedale committed 13 years agocac9e33
  24. adjusts main.cpp (oscilloscope does not render when disabled and does no longer need an external check)tosh committed 13 years ago95f2b43
  25. First commit with initial Balls class for avatar sphere cloudPhilip Rosedale committed 13 years ago1a5f499
  26. Merge branch 'master' of https://github.com/worklist/hifiAndrzej Kapolka committed 13 years agoc6af08d
  27. Added the basic key press/message composition display.Andrzej Kapolka committed 13 years ago1713beb
  28. Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_workZappoMan committed 13 years ago899068e
  29. fix for extraneous typedefs and reference to AgentListIterator as friendStephen Birarda committed 13 years agoccbbf31
  30. resolve conflicts on merge with upstream masterStephen Birarda committed 13 years agod2714e9
  31. Merge remote-tracking branch 'upstream/master' into agentlist-arrayStephen Birarda committed 13 years agoe6d278e
  32. working on camera view shifting from first person to third personJeffrey Ventrella committed 13 years ago86e72a9
  33. AgentList type squishes across projectStephen Birarda committed 13 years agoedc908b
  34. type squish in main.cppStephen Birarda committed 13 years agoda6bbac
  35. put iterator statements on one line in main.cppStephen Birarda committed 13 years ago2bda700