Code

History

Commits on master to interface/src/Application.cpp1890+
  1. Merging with mastersamcake committed 8 years ago062bfbd
  2. Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-backAtlante45 committed 8 years agobc819c6
  3. fix stupid copy pasteSam Gateau committed 8 years ago9ea6c78
  4. Merge pull request #12269 from sethalves/backtrace-for-rc-63John Conklin II committed 8 years ago215d03c
  5. cherry picking Tony's fix for shader compilation time not taking soo long and adding better feedback from shader compilationsamcake committed 8 years ago2dcedf9
  6. Move backtrace to interfaceAtlante45 committed 8 years agodb08f1d
  7. 8x shader compilation optimization and watchdog disableAnthony Thibault committed 8 years ago1e8a548
  8. Don't show help on android. Hide menu barGabriel Calero committed 8 years agoa5a36b4
  9. Add bottom bar and address dialog (Android)Gabriel Calero committed 8 years ago07a542e
  10. Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-ChangesMiladNazeri committed 8 years ago3585bea
  11. Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmarkDante Ruiz committed 8 years agoa670a0b
  12. unmangle mergesSeth Alves committed 8 years agob730341
  13. fix merge/cherry-pick errorSeth Alves committed 8 years ago19409cc
  14. comment out code that would set annotations after StartHandler is calledSeth Alves committed 8 years agodbe9fd2
  15. backtrace for rc-63Seth Alves committed 8 years agoc550620
  16. backtrace for rc-63Atlante45 committed 8 years ago39f26e3
  17. Introducing the tag in lieu of the vsisiblity maskSam Gateau committed 8 years ago51dac04
  18. Merge branch 'master' of https://github.com/highfidelity/hifi into seth-branchSam Gateau committed 8 years ago23b99f0
  19. Merge branch 'fix/render_config' into androidBrad Davis committed 8 years ago361b767
  20. Fix help screen URLBrad Davis committed 8 years ago867bb99
  21. Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescriptionZappoMan committed 8 years agocb01bd1
  22. Merge pull request #12232 from luiscuenca/showHelpAndrew Meadows committed 8 years agoa0e07a2
  23. merge from upstreamSeth Alves committed 8 years ago1cbc2e3
  24. Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changeshumbletim committed 8 years ago65455e7
  25. Merge branch 'android' into android_newBrad Davis committed 8 years ago5bf2bda
  26. Fix Edit/Asset Browser in HMD modeluiscuenca committed 8 years ago3c12ae8
  27. Fix Interface first launch should show helpluiscuenca committed 8 years ago6d6950d
  28. Merge remote-tracking branch 'upstream/master' into androidBrad Davis committed 8 years ago8ae0b09
  29. Merge pull request #12214 from 1st-BrainStormer/masterJohn Conklin II committed 8 years ago22ee57d
  30. more preferences cleanup, removing some dead code from ScriptEngines/ScriptModelZappoMan committed 8 years ago4ad5d34
  31. de-bounce Midi::USBchanged signal.Bruce Brown committed 8 years agof7caba5
  32. Merge branch 'android' into android_newBrad Davis committed 8 years ago3e78726
  33. Merge remote-tracking branch 'upstream/master' into androidBrad Davis committed 8 years agod53b8b3
  34. Load built-in resources earlierBrad Davis committed 8 years ago686393d
  35. Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1Seth Alves committed 8 years ago9be2c67