Code

History

Commits on master to interface/src/Application.cpp5145+
  1. Merge branch 'master' into ovr6Brad Davis committed 11 years ago6147844
  2. quiet compiler, fix some whitespaceSeth Alves committed 11 years ago983ae5b
  3. Merge branch 'master' into render_cursorBrad Davis committed 11 years agoc360dde
  4. dead code removal machineZappoMan committed 11 years ago8fa31ec
  5. Conflict fixingLeonardo Murillo committed 11 years agobd16072
  6. Merge branch 'master' of https://github.com/highfidelity/hifi into team-teachingZappoMan committed 11 years ago24c8e7d
  7. Merge branch 'master' of https://github.com/highfidelity/hifi into team-teachingZappoMan committed 11 years ago5d6112d
  8. Always use GL rendered cursorBrad Davis committed 11 years agob353421
  9. add a sound once first AM packet receivedStephen Birarda committed 11 years ago666830c
  10. Merge branch 'master' of github.com:highfidelity/hifi into auto-updaterLeonardo Murillo committed 11 years ago83b7054
  11. Working on OVR SDK 0.6Brad Davis committed 11 years ago5faa53d
  12. Gettting th ehighlight on transparent to workSam Gateau committed 11 years agode61f4e
  13. Working on SDK 0.6Bradley Austin Davis committed 11 years ago5a52a38
  14. Working on 0.6Brad Davis committed 11 years agode268c4
  15. Moving windows to SDK 0.6Brad Davis committed 11 years agof614268
  16. SyncingLeonardo Murillo committed 11 years ago68b419d
  17. Merge branch 'master' of github.com:highfidelity/hifi into auto-updaterLeonardo Murillo committed 11 years ago2236ccf
  18. Merge remote-tracking branch 'upstream/master' into pluginsBrad Davis committed 11 years agoaac527f
  19. Merge branch 'master' of https://github.com/highfidelity/hifiNiraj Venkat committed 11 years ago827d8bd
  20. Fixing title bar update on teleportNiraj Venkat committed 11 years agoa3f19e9
  21. Merge branch 'master' of https://github.com/highfidelity/hifi into team-teachingZappoMan committed 11 years ago7ebe64b
  22. merge from upstreamSeth Alves committed 11 years ago4e10c28
  23. Fix the skybox jiggle in the HMDBrad Davis committed 11 years ago16f55c7
  24. Merge branch 'master' of https://github.com/highfidelity/hifi into team-teachingZappoMan committed 11 years ago807cc3d
  25. Merge branch 'master' of github.com:highfidelity/hifi into auto-updaterLeonardo Murillo committed 11 years ago01236e0
  26. Working on display pluginsBrad Davis committed 11 years ago1b7efe9
  27. Merging the day after the flight back to france, getting all the fixesSam Gateau committed 11 years ago3a93409
  28. Merge branch 'master' of github.com:highfidelity/hifi into actionsSeth Alves committed 11 years ago9a67f35
  29. added sanitization for invalid line points data. Fixed bug where occasionally wrong view frustum would be sent to script"Eric Levin committed 11 years ago5e15c14
  30. Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lodAtlante45 committed 11 years ago94ba84a
  31. Merge branch 'master' of https://github.com/highfidelity/hifi into team-teachingZappoMan committed 11 years agod2deef9
  32. Merge branch 'fix_world_box' of github.com:Atlante45/hifi into lodAtlante45 committed 11 years ago41be3fe
  33. Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lodAtlante45 committed 11 years ago96be60c
  34. Fix wrong enum usedAtlante45 committed 11 years ago54b0a03
  35. Fix world box messing up everythingAtlante45 committed 11 years ago6dc3bf9