Code

History

Commits on master to interface/src/Application.cpp2835+
  1. Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1Seth Alves committed 9 years agod17d124
  2. Merge pull request #10121 from birarda/bug/recording-cacheThijs Wenker committed 9 years ago6f58e91
  3. Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0Seth Alves committed 9 years ago0dab94f
  4. Clearer function namesZach Fox committed 9 years ago75f1168
  5. Checkpoint!Zach Fox committed 9 years agoe296383
  6. rename base action classes to dynamics, start on constraintsSeth Alves committed 9 years ago74c0a70
  7. Merge pull request #10187 from zfox23/fix/getAvatar_FixZach Fox committed 9 years ago6569de6
  8. Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bissamcake committed 9 years ago79bcf95
  9. Merge pull request #10146 from AndrewMeadows/avoid-invisible-avatars-002Seth Alves committed 9 years agobf16309
  10. return ScriptAvatarData raw pointer from getAvatarStephen Birarda committed 9 years ago84a5807
  11. add ScriptAvatar for std::shared_ptr<Avatar> passing to scriptsStephen Birarda committed 9 years ago42a406e
  12. Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bissamcake committed 9 years ago16e6f09
  13. Trying to improve the Job/Task classes and testing it with the ZoneRendererSam Cake committed 9 years agob65448b
  14. Merge pull request #10153 from druiz17/goto-fixChris Collins committed 9 years ago8e12f62
  15. Merge pull request #9938 from kunalgosar/jsRenderBugSeth Alves committed 9 years ago03065ee
  16. delete in proper order on shutdownAndrew Meadows committed 9 years ago92495d9
  17. remove extra linesTriplelexx committed 9 years ago27a404d
  18. change display plugin to deactivate when window minimizedTriplelexx committed 9 years ago279997d
  19. toggle goto in tabletDante Ruiz committed 9 years ago52fd446
  20. change paintGL to return if window is minimizedTriplelexx committed 9 years ago1b2887d
  21. Avoid unexpected changessamcake committed 9 years ago1a9005e
  22. Renaming the PendingCHanges class to Transactionsamcake committed 9 years ago6122155
  23. dont assume no query tagskunalgosar committed 9 years ago8749428
  24. fix typo and namespaceKunal Gosar committed 9 years agoe5c075f
  25. dont redirect people from webentitykunalgosar committed 9 years ago8e4229b
  26. add url tag to web entitieskunalgosar committed 9 years ago9d0667c
  27. added file type filter and interceptorkunalgosar committed 9 years agoa0f0879
  28. cleanup Agent recording handling, make loadRecording asyncStephen Birarda committed 9 years agoc7a28a5
  29. Merge branch 'master' into 21224Lexx committed 9 years agoaf95741
  30. resolve merge conflictTriplelexx committed 9 years agob4b5d4f
  31. fix crash when pressing "Bookmark Avatar" buttonTriplelexx committed 9 years ago01b13d7
  32. Merge pull request #10102 from vladest/tablet-ui-gotoSeth Alves committed 9 years agofbf2014
  33. Merge pull request #10080 from ZappoMan/footActionsAndrew Meadows committed 9 years ago66ff551
  34. merge from upstreamSeth Alves committed 9 years ago43e1cec
  35. Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView2.0Dante Ruiz committed 9 years agob10f491