Code

History

Commits on master to interface/src/Application.cpp700+
  1. Merge pull request #14905 from SamGondelman/materialMappingSam Gondelman committed 7 years ago9aa99f2
  2. Standalone Tags - checkpointRoxanne Skelly committed 7 years agobe98fb1
  3. merge with masterSamGondelman committed 7 years ago25b31cf
  4. Merge remote-tracking branch 'upstream/master' into feature/questBrad Davis committed 7 years ago0b171ff
  5. Fix asset browser being hidden in incorrect way on server switchRyan Huffman committed 7 years agoab5c4a9
  6. Merge pull request #14838 from SamGondelman/billboardModeShannon Romano committed 7 years agof267043
  7. Merge pull request #14887 from AndrewMeadows/shape-garbage-collectorShannon Romano committed 7 years ago3b5b077
  8. Merge pull request #14782 from SamGondelman/NOverlaysFinalBradley Austin Davis committed 7 years agod45d870
  9. start moving materials to rendering onlySamGondelman committed 7 years agobed2732
  10. merge with masterSamGondelman committed 7 years ago13ece79
  11. CR and fix deadlockSamGondelman committed 7 years ago3f8bfc5
  12. add some trace contexts for easier debuggingAndrew Meadows committed 7 years agoc79e3e5
  13. use RingBuffer for gradual garbage collectionAndrew Meadows committed 7 years ago8bdac58
  14. Cleanup from masterBrad Davis committed 7 years ago4dd853d
  15. Merge pull request #14883 from amerhifi/feature/questSam Gateau committed 7 years agoa10cf9b
  16. Merge branch 'feature/quest_custom_plugins' into feature/questBrad Davis committed 7 years agoa6f23f4
  17. Merge remote-tracking branch 'upstream/master' into materialMappingSamGondelman committed 7 years ago77a8ddb
  18. fix keyboard focus thingSamGondelman committed 7 years ago96f32a9
  19. moved asset loading to the permissions screen, added the onNotifyAppLoaded signal connect function as well as binding to the qtread with the ui thread.amerhifi committed 7 years agoe8a35c6
  20. move materialcache et al to material-networking librarySamGondelman committed 7 years agof7a487a
  21. Support custom display / input plugin lists and small tweaksBrad Davis committed 7 years agod330180
  22. Merge branch 'master' of github.com:highfidelity/hifi into feature/questdanteruiz committed 7 years ago95d30e5
  23. Merge remote-tracking branch 'upstream/master' into NOverlaysFinalSamGondelman committed 7 years agoe74ff18
  24. Merge remote-tracking branch 'upstream/master' into NOverlaysFinalSamGondelman committed 7 years ago25ca52d
  25. fix double lasersSamGondelman committed 7 years agoa665664
  26. Merge pull request #14795 from AndrewMeadows/myAvatar-vs-backfacing-triangles-2Shannon Romano committed 7 years ago6fd480e
  27. Merge remote-tracking branch 'upstream/master' into feature/questBrad Davis committed 7 years ago8b70f17
  28. Merge pull request #14775 from roxanneskelly/QmlMarketplaceShannon Romano committed 7 years ago61459d5
  29. Merge remote-tracking branch 'upstream/master' into feature/questBrad Davis committed 7 years ago91e18f5
  30. Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplaceRoxanne Skelly committed 7 years agod3bc536
  31. QmlMarketplace - disable HTML for questRoxanne Skelly committed 7 years ago2b40260
  32. Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplaceRoxanne Skelly committed 7 years ago78aa178
  33. fix keyboard focus and image overlaysSamGondelman committed 7 years ago934abb3
  34. fix keyboard focusSamGondelman committed 7 years ago31cf623
  35. fix getEntityObject and tablet highlighting (Overlays.findOverlays)SamGondelman committed 7 years ago4b406bf