Code

History

Commits on master to interface/src/Application.cpp1855+
  1. Merge pull request #12272 from elisa-lj11/2d-imagesElisa Lupin-Jimenez committed 8 years agoa61021f
  2. Lots of progressZach Fox committed 8 years ago95e9eb8
  3. Merge pull request #11537 from jherico/threaded_qmlSam Gateau committed 8 years ago714e3f4
  4. Merge pull request #12343 from NissimHadar/saveSnapshotWithNameJohn Conklin II committed 8 years ago3377aac
  5. warnings, load material from URL, shapeID -> parentMaterialIDSamGondelman committed 8 years ago9e8aa18
  6. Merge branch 'master' into remove-deprecated-itemsDavid Rowe committed 8 years ago033b85a
  7. Merge remote-tracking branch 'gcalero/android_ui_bottombar3' into androidBrad Davis committed 8 years ago1f2760c
  8. Merge remote-tracking branch 'upstream/master' into decalsSamGondelman committed 8 years ago5337377
  9. Android - Avatar selection window accessible from the bottom bar. Only hardcoded avatars, no marketplace.Cristian Luis Duarte committed 8 years agobb4f57f
  10. Don't show help on android. Hide menu barGabriel Calero committed 8 years ago917cbd7
  11. Add bottom bar and address dialog (Android)Gabriel Calero committed 8 years ago0f07d0b
  12. wip live material swapping on model entities, model overlays, avatars, and albedo swap on shape entitiesSamGondelman committed 8 years ago84cd0e1
  13. Fixing merge errorsBradley Austin Davis committed 8 years ago7102cf4
  14. Merge remote-tracking branch 'upstream/master' into threaded_qmlBradley Austin Davis committed 8 years ago023ee35
  15. Merge pull request #12370 from jherico/fix/deadlock_shadersBrad Hefta-Gaub committed 8 years agoa6c8172
  16. Prevent deadlock crashes when building shaders at startupBradley Austin Davis committed 8 years ago7eecc47
  17. Fix for deadlock triggering while loading QML engineBradley Austin Davis committed 8 years ago725eb14
  18. Prevent deadlock crashes when building shaders at startupBradley Austin Davis committed 8 years ago8748e98
  19. Fix for deadlock triggering while loading QML engineBradley Austin Davis committed 8 years ago77741c2
  20. Migrating QML rendering off the main threadBrad Davis committed 9 years ago7d5502e
  21. Added option to select snapshot filename in scripts.NissimHadar committed 8 years agocf87052
  22. Merge pull request #12195 from birarda/bug/connection-refusedStephen Birarda committed 8 years ago7613218
  23. Remove unused Overlays property, borderSize, and associated codeDavid Rowe committed 8 years ago0c0734a
  24. Remove Window.customPrompt() from JavaScript APIDavid Rowe committed 8 years agod842e53
  25. Merge pull request #12294 from samcake/pastelJohn Conklin II committed 8 years agoc8bb26a
  26. reverted to S3 for model URLElisa Lupin-Jimenez committed 8 years agoe2bf8ad
  27. reset count on conn refusal, soft reset DH in Interface on limit reachedStephen Birarda committed 8 years agoeb9d100
  28. reset silent check in packet check on domain connection resetStephen Birarda committed 8 years agoe16a385
  29. Disable LOD adjustment on androidBrad Davis committed 8 years agoe3e45e1
  30. snapshot referenced locally, won't work on OSElisa Lupin-Jimenez committed 8 years agof71d9e4
  31. drag and drop worksElisa Lupin-Jimenez committed 8 years ago62437dc
  32. images auto-add to asset server, started asset browser add linkElisa Lupin-Jimenez committed 8 years ago2ff47fa
  33. BufferView <-> QVariant/QScriptValue conversionhumbletim committed 8 years ago06afaa7
  34. Move a define to resume watchdog a bit furtherSam Gateau committed 8 years agoa650c5b
  35. merge from upstreamSeth Alves committed 8 years ago64a46bf