Code

History

Commits on master to interface/src/Application.cpp4795+
  1. Fix deadlock when using textoverlay from main threadBradley Austin Davis committed 11 years agoae539af
  2. working on plugin menu manipulationSamGondelman committed 11 years agoe3bc4b3
  3. verify packet versions at ice-serverStephen Birarda committed 11 years ago086e4ef
  4. Turn on/off debug AO from menu itemNiraj Venkat committed 11 years agoe0634de
  5. allow socket owner to specify unfiltered packetsStephen Birarda committed 11 years agoa61c04a
  6. Merge remote-tracking branch 'upstream/master' into margeBradley Austin Davis committed 11 years agofda1cb6
  7. Merge pull request #5371 from Atlante45/smart_pointersBrad Davis committed 11 years ago9016f43
  8. Merge pull request #5374 from ZappoMan/warningFixesBrad Davis committed 11 years ago6d4c7cd
  9. Working on batchBrad Davis committed 11 years ago9fd80d7
  10. Merge remote-tracking branch 'upstream/master' into pluginsBrad Davis committed 11 years ago5744200
  11. Merge remote-tracking branch 'upstream/master' into margeBrad Davis committed 11 years ago5197367
  12. Breaking framebuffer ops out of texture cacheBrad Davis committed 11 years agoc3a2b72
  13. Merge branch 'master' into 20602David Rowe committed 11 years agoac4b64c
  14. removing dead codeSam Gateau committed 11 years ago5bf8596
  15. fixing missing glew initBrad Davis committed 11 years ago94d57a2
  16. cleaning commented code supposedly dead nowSam Gateau committed 11 years ago9d9142c
  17. Merge branch 'master' of https://github.com/highfidelity/hifi into punkSam Gateau committed 11 years ago6a0ca6e
  18. repairs to early return for sendNackPacketsStephen Birarda committed 11 years ago9fb8b55
  19. merge with latest network prSam Gateau committed 11 years agob509088
  20. Merge branch 'master' into 20602David Rowe committed 11 years agoa488a12
  21. merging my changes to remove cruff from application to AUstin;s latestSam Gateau committed 11 years ago59666f6
  22. Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllersAnthony J. Thibault committed 11 years ago80dea68
  23. fix a bunch of warningsZappoMan committed 11 years ago648d0f6
  24. Merge branch 'master' of https://github.com/highfidelity/hifi into avatarNiraj Venkat committed 11 years agoeaf75c0
  25. Merge branch 'master' of https://github.com/highfidelity/hifi into avatarNiraj Venkat committed 11 years ago85c9ee0
  26. Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointersAtlante45 committed 11 years ago8d6ff2d
  27. Removing some dead forward declarationsBrad Davis committed 11 years agoc0859ff
  28. Merge pull request #5359 from birarda/protocolAndrew Meadows committed 11 years ago7578a70
  29. Merge branch 'homer' into pluginsBrad Davis committed 11 years ago9fafc92
  30. Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointersAtlante45 committed 11 years ago59acfc9
  31. Merge branch 'master' into homerBrad Davis committed 11 years ago488a449
  32. Merge branch 'master' into pluginsBrad Davis committed 11 years ago359abd6
  33. resolve conflicts on merge with upstream/masterStephen Birarda committed 11 years ago0177513
  34. something not compiling but just before merge with upstreamSam Gateau committed 11 years ago1a9f6e1
  35. Merge pull request #5366 from jherico/margeBrad Hefta-Gaub committed 11 years agoc41e20b