Code

History

Commits on master to interface/src/Application.cpp5565+
  1. Merge remote-tracking branch 'upstream/master' into oculus_old_rendererBradley Austin Davis committed 11 years agoa7eebfd
  2. Add the needed global variable exported to enable the nvidia gpu on optimus platform (laptops with intel integrated) also log the opengl version and gpu and driver usedSam Gateau committed 11 years agob4d11e2
  3. Fix typoDavid Rowe committed 11 years ago154dacf
  4. Merge branch 'master' into oculus_old_rendererBradley Austin Davis committed 11 years ago56b5ad2
  5. Merge pull request #4528 from ZappoMan/avatarUIPhilip Rosedale committed 11 years ago5325478
  6. Merge pull request #4535 from ZappoMan/scriptCachingPhilip Rosedale committed 11 years agoce05d31
  7. fix typosZappoMan committed 11 years ago3475bfb
  8. Merge branch 'master' into oculus_old_rendererBradley Austin Davis committed 11 years ago5e5bdec
  9. remove character from PhysicsEngine on shutdownAndrew Meadows committed 11 years ago9b13f18
  10. first cut at script cachingZappoMan committed 11 years ago36657c9
  11. merge from upstreamSeth Alves committed 11 years ago186cb1e
  12. Merge pull request #4521 from ctrlaltdavid/20416Philip Rosedale committed 11 years ago099a2b5
  13. if installing a body, and you have no head, make your head the default headZappoMan committed 11 years ago3bda65f
  14. Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUIZappoMan committed 11 years ago80df8ca
  15. Add add/remove friends menu itemDavid Rowe committed 11 years agobe69c0b
  16. first cut at predicting FST type for set avatarZappoMan committed 11 years ago002fba8
  17. Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisionsSeth Alves committed 11 years agofd69a54
  18. enable avatar collisions by defaultAndrew Meadows committed 11 years agobe5fdbf
  19. Merge branch 'master' into 20416David Rowe committed 11 years ago90c1da2
  20. set up a way to request ResourceCache downloads from a non-networking thread.Seth Alves committed 11 years ago7da87d6
  21. menu and display tweaksZappoMan committed 11 years ago6cff99f
  22. Merge pull request #4491 from huffman/export-jsonBrad Hefta-Gaub committed 11 years ago918154e
  23. merge upstream/master into andrew/inertiaAndrew Meadows committed 11 years agob87360f
  24. PhysicsEngine doesn't need AvatarDataAndrew Meadows committed 11 years ago44eca08
  25. Merge pull request #4498 from ZappoMan/LODUITweaksPhilip Rosedale committed 11 years agofe61387
  26. move LOD FPS settings to PreferencesZappoMan committed 11 years ago619428c
  27. send immediate location update when domain changesStephen Birarda committed 11 years ago1a6865b
  28. Add SVO_JSON_EXTENSION to accepted extensionsRyan Huffman committed 11 years ago2fc0ef8
  29. tweaks to the LOD Tools UIZappoMan committed 11 years agofa122a2
  30. Update export entities to export as JSONRyan Huffman committed 11 years ago61dc31f
  31. Display notification if domain connection refusedDavid Rowe committed 11 years agocb6abfb
  32. Merge branch 'master' into oculus_old_rendererBradley Austin Davis committed 11 years ago1d56266
  33. Merge branch 'master' of https://github.com/highfidelity/hifi into dragDropLinkAvatarsZappoMan committed 11 years ago5f82521
  34. oopsZappoMan committed 11 years ago2413296
  35. remove unneeded debugZappoMan committed 11 years ago26670f9