Code

History

Commits on master to interface/src/main.cpp420+
  1. a few small formatting and glitch fixesJeffrey Ventrella committed 13 years ago5c7fd0f
  2. Merge branch 'master' of github.com:worklist/hifi into invensenseStephen Birarda committed 13 years ago928beac
  3. Merge remote-tracking branch 'upstream/master'Jeffrey Ventrella committed 13 years ago707d513
  4. fixed a physics bug in avatar body spring (forgot to use deltaTime) - and adjusted various physics constants accordingly.Jeffrey Ventrella committed 13 years agocb8e68f
  5. some cleanup in interface mainStephen Birarda committed 13 years ago66e2771
  6. Merge branch 'master' of https://github.com/worklist/hifiAndrzej Kapolka committed 13 years agoc1a3478
  7. resolve conflicts on merge with upstream masterStephen Birarda committed 13 years ago24c1ea5
  8. added avatar shadowJeffrey Ventrella committed 13 years ago85ad560
  9. couple of extra line deletions in main.cppStephen Birarda committed 13 years ago31e9c18
  10. some deletion cleanup in main.cppStephen Birarda committed 13 years agoda93b59
  11. store avatar position and yaw in file to restore on relaunchStephen Birarda committed 13 years ago1a8564f
  12. Compile fix, need to use integer GL uniform.Andrzej Kapolka committed 13 years ago8923057
  13. Merge pull request #187 from ey6es/masterZappoMan committed 13 years ago8e7dd4b
  14. Merge remote-tracking branch 'upstream/master' into pairingStephen Birarda committed 13 years ago5f26d44
  15. couple of line deletionsStephen Birarda committed 13 years agobd6f0d9
  16. Fix for fullscreen mode switching: when we reshape, we need to resize the render texture (if it exists).Andrzej Kapolka committed 13 years ago9dfc6c6
  17. Merge branch 'master' of https://github.com/worklist/hifiAndrzej Kapolka committed 13 years ago346f213
  18. Merge pull request #186 from ZappoMan/render_voxels_optimizationPhilip Rosedale committed 13 years agof05451b
  19. Rather than a command line parameter, provide a menu option for switching to/from fullscreen mode.Andrzej Kapolka committed 13 years ago08350a5
  20. Fixes per merge (Ventrella)Philip Rosedale committed 13 years ago1fbc139
  21. Merge branch 'master' of https://github.com/worklist/hifiAndrzej Kapolka committed 13 years ago43b5e94
  22. various changes to help debug render pipeline - fixing some cases where TREE_SCALE was not using constant in prep for making TREE_SCALE larger - added createLine() to VoxelTree - added axis lines made of voxels to scene - added corner points made of voxels to sceneZappoMan committed 13 years agoa4f2dc2
  23. Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimizationZappoMan committed 13 years ago2b11cad
  24. Ground plane moved to 0->10 and lines are exactly 1 meterPhilip Rosedale committed 13 years ago9716ea9
  25. Fixes per code review.Philip Rosedale committed 13 years ago581365f
  26. (1) added avatar tilting while walking; (2) added avatar renderer; (3) tweaked body proportions; (4)Jeffrey Ventrella committed 13 years agoc46fc5a
  27. Need to disable blending when we render the distorted screen quad.Andrzej Kapolka committed 13 years ago8e2c43e
  28. Use the right type here; Xcode complains about it.Andrzej Kapolka committed 13 years agoccded56
  29. Restored constant value added another reference to the SDK docs.Andrzej Kapolka committed 13 years ago762c635
  30. Final bits for Oculus support. Works!Andrzej Kapolka committed 13 years ago5de15dd
  31. adjusted proportions of avatar skeleton to make it closer to average humanJeffrey Ventrella committed 13 years ago673936e
  32. added render pipeline warnings menu itemZappoMan committed 13 years ago8f0dd1f
  33. Merge branch 'master' of https://github.com/worklist/hifiAndrzej Kapolka committed 13 years agob0bbca2
  34. More work on Oculus integration; added some notes to explain the source of the magic numbers.Andrzej Kapolka committed 13 years ago94f1e03
  35. Merge remote-tracking branch 'upstream/master' into invensenseStephen Birarda committed 13 years agod2ca0d4