Code

History

Commits on master to interface/src/Application.cpp1750+
  1. fix placename in title-bar, fix domain-spawning-pointSeth Alves committed 8 years ago82bfd25
  2. Merge branch 'master' of https://github.com/highfidelity/hifi into master-workloadsamcake committed 8 years agod4d5f3a
  3. Fix Window.setFocus() unsetting focus if Interface has focusDavid Rowe committed 8 years ago287ea8e
  4. Merge pull request #12464 from jherico/android_devSam Gateau committed 8 years ago88ecfe7
  5. adding hyperlinkDante Ruiz committed 8 years ago1f4aed3
  6. don't use clipboard when loading serverless domainsSeth Alves committed 8 years ago9ee65ab
  7. Merge branch 'master' of github.com:highfidelity/hifi into serverless-domainsSeth Alves committed 8 years ago2d37458
  8. more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and portSeth Alves committed 8 years ago33065fb
  9. Merge 'master' into 'workload'Andrew Meadows committed 8 years agof9db9e9
  10. Merge pull request #12502 from elisa-lj11/2dimages-updateJohn Conklin II committed 8 years ago1e1836c
  11. Fix the ssbo in GL4.5 and represent the workload proxies of the space and expose the workload engine to the JS apisamcake committed 8 years agod91fb54
  12. Merge hifi/master of into hifi/workloadAndrew Meadows committed 8 years ago3ca21dd
  13. Merge branch 'master' of github.com:highfidelity/hifi into serverless-domainsSeth Alves committed 8 years agoa44ddbb
  14. Merge remote-tracking branch 'upstream/master' into android_devBrad Davis committed 8 years ago136ced9
  15. Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settingsStephen Birarda committed 8 years ago9cc348e
  16. merge from upstreamSeth Alves committed 8 years ago636c271
  17. Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scriptingJohn Conklin II committed 8 years ago48f0cde
  18. Merge branch 'master' of http://github.com/highfidelity/hifi into taaOlivier Prat committed 8 years ago2d71d7d
  19. Merge pull request #12456 from Atlante45/fix/min-spec-crashJohn Conklin II committed 8 years ago25144f0
  20. Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settingsStephen Birarda committed 8 years agoaa7bd20
  21. Merge pull request #24 from druiz17/serverless-domainsSeth Alves committed 8 years ago642e7b7
  22. image has correct orientation and is collisionlessElisa Lupin-Jimenez committed 8 years agob56c78d
  23. actions and serverless status fixesDante Ruiz committed 8 years agoa23c425
  24. Merge remote-tracking branch 'upstream/master' into android_devBrad Davis committed 8 years agob9387f2
  25. Merge branch 'master' of github.com:highfidelity/hifi into serverless-domainsSeth Alves committed 8 years agof08864f
  26. * remove Model_temporary_hack * split gpuhelpers and mesh part * fix objwriter * more work on bufferview helpers * cr cleanuphumbletim committed 8 years agof824edd
  27. Merge pull request #12494 from druiz17/one-menuSeth Alves committed 8 years ago9e156de
  28. Merge pull request #12484 from ZappoMan/relaxDeadlockWatchdogBrad Hefta-Gaub committed 8 years ago3d54f4d
  29. clean up debug prints. put filename in window title-bar when connected to a serverless domainSeth Alves committed 8 years ago5632f9d
  30. Make sure settings timer is runningAtlante45 committed 8 years ago800d15b
  31. save avatar-entities which are created while using a serverless domainSeth Alves committed 8 years ago77febe0
  32. fix merge conflictDante Ruiz committed 8 years ago07b0431
  33. Merge remote-tracking branch 'upstream/master' into android_devBrad Davis committed 8 years ago0550138
  34. remove menu option for booking marking avatar entitiesDante Ruiz committed 8 years agod0ec84b
  35. merge from upstreamSeth Alves committed 8 years ago99893d8