Code

History

Commits on 94de0c12bc8a8ddbd1e771abfdf0772790d9c00d to interface/src/Application.cpp35+
  1. Merge remote-tracking branch 'upstream/master' into feature/questBrad Davis committed 7 years ago79369a0
  2. Fix typoBrad Davis committed 7 years ago122a246
  3. Fix plugin activationBrad Davis committed 7 years ago518e480
  4. Merge remote-tracking branch 'upstream/master' into wearablesSamGondelman committed 7 years ago6765268
  5. Merge remote-tracking branch 'upstream/master' into feature/questBrad Davis committed 7 years agod60dcb9
  6. Merge pull request #14947 from SamGondelman/overlayClickJohn Conklin II committed 7 years agod7a5c0b
  7. Merge pull request #14935 from SamGondelman/matEntityJohn Conklin II committed 7 years ago1348bae
  8. attachments and wearables cull with avatar parentSamGondelman committed 7 years ago06ac2b2
  9. working on overlay bugsSamGondelman committed 7 years ago71653f9
  10. it's working!SamGondelman committed 7 years ago3df231f
  11. Add per-android-app preprocessor macrosBrad Davis committed 7 years ago4409e59
  12. Merge pull request #14927 from huffman/fix/hide-asset-browserJohn Conklin II committed 7 years agob9356e2
  13. merge with masterSamGondelman committed 7 years agoc92b82e
  14. finish moving materials to renderingSamGondelman committed 7 years ago87ab255
  15. Merge remote-tracking branch 'upstream/master' into feature/questBrad Davis committed 7 years agoa5f84ab
  16. Merge pull request #14905 from SamGondelman/materialMappingSam Gondelman committed 7 years ago9aa99f2
  17. merge with masterSamGondelman committed 7 years ago25b31cf
  18. Merge remote-tracking branch 'upstream/master' into feature/questBrad Davis committed 7 years ago0b171ff
  19. Fix asset browser being hidden in incorrect way on server switchRyan Huffman committed 7 years agoab5c4a9
  20. Merge pull request #14838 from SamGondelman/billboardModeShannon Romano committed 7 years agof267043
  21. Merge pull request #14887 from AndrewMeadows/shape-garbage-collectorShannon Romano committed 7 years ago3b5b077
  22. Merge pull request #14782 from SamGondelman/NOverlaysFinalBradley Austin Davis committed 7 years agod45d870
  23. start moving materials to rendering onlySamGondelman committed 7 years agobed2732
  24. merge with masterSamGondelman committed 7 years ago13ece79
  25. CR and fix deadlockSamGondelman committed 7 years ago3f8bfc5
  26. add some trace contexts for easier debuggingAndrew Meadows committed 7 years agoc79e3e5
  27. use RingBuffer for gradual garbage collectionAndrew Meadows committed 7 years ago8bdac58
  28. Cleanup from masterBrad Davis committed 7 years ago4dd853d
  29. Merge pull request #14883 from amerhifi/feature/questSam Gateau committed 7 years agoa10cf9b
  30. Merge branch 'feature/quest_custom_plugins' into feature/questBrad Davis committed 7 years agoa6f23f4
  31. Merge remote-tracking branch 'upstream/master' into materialMappingSamGondelman committed 7 years ago77a8ddb
  32. fix keyboard focus thingSamGondelman committed 7 years ago96f32a9
  33. 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
  34. move materialcache et al to material-networking librarySamGondelman committed 7 years agof7a487a
  35. Support custom display / input plugin lists and small tweaksBrad Davis committed 7 years agod330180