Code

History

Commits on master to interface/src/main.cpp350+
  1. Merge pull request #265 from ZappoMan/render_voxels_optimizationPhilip Rosedale committed 13 years agocdab62c
  2. fixed partial VBO updatesZappoMan committed 13 years ago33fc9f5
  3. Starting on coloring support.Andrzej Kapolka committed 13 years ago78b37fe
  4. Show the voxels to be added/deleted as wireframe cubes.Andrzej Kapolka committed 13 years agoecd12e0
  5. initial setup to connect to oculus and grab sensorsStephen Birarda committed 13 years ago999ab5c
  6. improved avatar touch codeJeffrey Ventrella committed 13 years agoc2deba6
  7. Merge remote-tracking branch 'upstream/master'Philip Rosedale committed 13 years ago52337a1
  8. add linking of LibOVR to interface CMakeLists.txtStephen Birarda committed 13 years ago613066f
  9. Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimizationZappoMan committed 13 years ago7b22300
  10. fixed a bug in menu clickingJeffrey Ventrella committed 13 years ago3ba9339
  11. Working on adding an "add voxel in front of avatar" command.Andrzej Kapolka committed 13 years agoc411083
  12. Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimizationZappoMan committed 13 years agoc73d4dd
  13. More work on partial VBO updates still not working 100% correctlyZappoMan committed 13 years agof490f3e
  14. Merge remote-tracking branch 'upstream/master'Philip Rosedale committed 13 years agoef1848a
  15. Removed old serial code for Maple ADCPhilip Rosedale committed 13 years agodd33ced
  16. Fixed issue with mouse pressed state, use mouse buttons to add/delete voxels (numbers now switch between modes).Andrzej Kapolka committed 13 years ago145c648
  17. cleaned up avatar slow-down upon nearness; fixed mouse pressed bug;Jeffrey Ventrella committed 13 years ago17c61c8
  18. Tabs -> spaces.Andrzej Kapolka committed 13 years agodcd4209
  19. Return the box face, as well as the distance, from the ray intersection test. Use it to determine which voxel neighbor we create when adding.Andrzej Kapolka committed 13 years ago7ff8b84
  20. Set up the lights after applying the camera transform so that they will be in world, not view, space.Andrzej Kapolka committed 13 years ago4a0657f
  21. Merge branch 'master' of https://github.com/worklist/hifiAndrzej Kapolka committed 13 years ago0cff127
  22. Working on voxel editing.Andrzej Kapolka committed 13 years ago785e55e
  23. Merge remote-tracking branch 'upstream/master'Philip Rosedale committed 13 years agoddc97a6
  24. Added gyro pitch to view, moved onscreen displays around to look nicer.Philip Rosedale committed 13 years ago76c5a74
  25. fixed merge conflictJeffrey Ventrella committed 13 years agofc549b7
  26. Merge remote-tracking branch 'upstream/master'Jeffrey Ventrella committed 13 years agobbd8566
  27. put orientation back in avatar folder (this should be put in a more logical place at some point) - also did some work on avatar rendererJeffrey Ventrella committed 13 years ago7a24c50
  28. Merge pull request #243 from PhilipRosedale/masterZappoMan committed 13 years agobf81587
  29. Added render option for avatars, code cleanup.Philip Rosedale committed 13 years ago5052f4a
  30. Merge remote-tracking branch 'upstream/master'Philip Rosedale committed 13 years agoebf0618
  31. When the stars and the atmosphere are both on, adjust the stars' alpha value based on the distance from the atmosphere.Andrzej Kapolka committed 13 years agocaeccf5
  32. Render the stars, when enabled, before the atmosphere.Andrzej Kapolka committed 13 years ago8a21823
  33. Merge branch 'master' of https://github.com/worklist/hifiAndrzej Kapolka committed 13 years agoc34b6df
  34. Merge remote-tracking branch 'upstream/master'Philip Rosedale committed 13 years agode6627f
  35. Render environment -> render atmosphere.Andrzej Kapolka committed 13 years ago8d4a74c