Code

History

Commits on master to interface/src/Application.cpp1715+
  1. Merge with mastersamcake committed 8 years agoa0db5c6
  2. FB12956 - Audio Meter Toggle Button BrokenAlexander Ivash committed 8 years agob427d6c
  3. Try thisZach Fox committed 8 years agoec6f66e
  4. Fix font loading for MacOS via different font loading methodZach Fox committed 8 years ago747a6b0
  5. FB12956 - Audio Meter Toggle Button BrokenAlexander Ivash committed 8 years ago1fb68ec
  6. Try thisZach Fox committed 8 years ago409f529
  7. Fix font loading for MacOS via different font loading methodZach Fox committed 8 years agod0cc64f
  8. Merge branch 'master' into 21776David Rowe committed 8 years agob1bda28
  9. Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domainsSeth Alves committed 8 years ago7c7f42a
  10. use static QStrings rather than functionsSeth Alves committed 8 years ago4ed0c24
  11. Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domainsSeth Alves committed 8 years agoe70ca25
  12. name emit from AddressManager like an eventSeth Alves committed 8 years ago12eb0e4
  13. fixed syntax for ubuntuElisa Lupin-Jimenez committed 8 years ago2987c90
  14. fixed logic for texture files/non-modelsElisa Lupin-Jimenez committed 8 years ago9ae2da7
  15. hopefully fixed mac/ubuntu buildsElisa Lupin-Jimenez committed 8 years ago2858909
  16. tablet scale and position changesDante Ruiz committed 8 years ago2d448d7
  17. making small changesDante Ruiz committed 8 years agoa705092
  18. zip file drags don't auto add model texturesElisa Lupin-Jimenez committed 8 years agoc6e5f4c
  19. Fixed blocks importer textures being interpreted as image entitiesElisa Lupin-Jimenez committed 8 years ago251e4a3
  20. make this work againSeth Alves committed 8 years ago926be73
  21. minimize diffDante Ruiz committed 8 years ago6fefd13
  22. changing keybaord mappingDante Ruiz committed 8 years agofe363e7
  23. some code-review induced changesSeth Alves committed 8 years ago79aa450
  24. Fix assert on interaction with stats and avatarinputs during UI setupBrad Davis committed 8 years ago6cc3613
  25. Adding more detailed classes and introducing an upfront setupVIew jobsamcake committed 8 years ago4507864
  26. Merge remote-tracking branch 'upstream/master' into androidBrad Davis committed 8 years ago8bfc610
  27. Merge branch 'master' of https://github.com/highfidelity/hifi into master-workloadsamcake committed 8 years ago7d32efb
  28. Merge branch 'master' of github.com:highfidelity/hifi into serverless-domainsSeth Alves committed 8 years agoa6c3bcd
  29. Merge pull request #12546 from druiz17/fix-hyperlinkJohn Conklin II committed 8 years ago3f751bb
  30. gather together the url scheme constants, name them consistentlySeth Alves committed 8 years ago606face
  31. remove unneeded call to clearDomainOctreeDetailsSeth Alves committed 8 years ago7a61119
  32. don't crashSeth Alves committed 8 years ago746769c
  33. more code review responseSeth Alves committed 8 years ago507dfa5
  34. cleanupsSeth Alves committed 8 years agobdd926f
  35. merge from upstreamSeth Alves committed 8 years ago45157a1