Code

History

Commits on master to interface/src/Application.cpp2975+
  1. Merge pull request #9602 from huffman/feat/shortbow-entity-serverRyan Huffman committed 9 years ago5b59939
  2. Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFixDante Ruiz committed 9 years ago19110ec
  3. Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-jsSeth Alves committed 9 years ago34c5d48
  4. Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlaySeth Alves committed 9 years ago1864975
  5. Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-jsSeth Alves committed 9 years agoa2f527b
  6. delete tablet overlays when switching domainsSeth Alves committed 9 years ago36bcaa8
  7. Fixed Wed Entity not leaving Focuskunalgosar committed 9 years agod6c1f1c
  8. Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFixDante Ruiz committed 9 years ago73c337e
  9. some modal clean upDante Ruiz committed 9 years ago835b238
  10. in 2d mode, clicks on tablet don't get used for other thingsSeth Alves committed 9 years ago70060eb
  11. in 2d mode, clicks on tablet don't get used for other thingsSeth Alves committed 9 years agoe43c4c1
  12. merge in tablet-as-overlay codeSeth Alves committed 9 years agoce717d0
  13. steps toward making mouse work on tabletSeth Alves committed 9 years ago37004e4
  14. Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFixDante Ruiz committed 9 years ago93ae93a
  15. add setting to control if tablet is an entity or overlaySeth Alves committed 9 years ago41ef7b8
  16. saving workDante Ruiz committed 9 years ago3ba605b
  17. Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-jsSeth Alves committed 9 years ago84b9382
  18. Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-jsSeth Alves committed 9 years ago1d44606
  19. code reviewSeth Alves committed 9 years ago3b181eb
  20. fixing merge conflictsDante Ruiz committed 9 years agof58a018
  21. merge from upstreamSeth Alves committed 9 years ago43f47c1
  22. Fixed view toggle, Added new NotificationsMenithal committed 9 years agod9f8661
  23. Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuidSeth Alves committed 9 years agoea03f41
  24. Merge pull request #9703 from kunalgosar/logDisplayModeChris Collins committed 9 years agoec07969
  25. Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuidSeth Alves committed 9 years agodef6693
  26. make tablet part IDs available through qAppSeth Alves committed 9 years agod7bb6f1
  27. fixed merge conflictDante Ruiz committed 9 years ago3f8ea4a
  28. Logging display mode changeskunalgosar committed 9 years agob8b5927
  29. saving workDante Ruiz committed 9 years agodedd85d
  30. Merge branch 'overlays-uuid' of github.com:sethalves/hifi into tablet-ui-edit-jsSeth Alves committed 9 years ago4c1f5c1
  31. Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFixDante Ruiz committed 9 years ago80551cf
  32. refreshing with masterDante Ruiz committed 9 years ago3189b44
  33. uuid keys for overlays appears to workSeth Alves committed 9 years ago05c135b
  34. working toward using uuids for overlay IDsSeth Alves committed 9 years agoc1e4131
  35. fixed merge issuesDante Ruiz committed 9 years ago628b97b