Code

History

Commits on master to interface/src/Application.cpp1645+
  1. merge 'master' into 'workload'Andrew Meadows committed 8 years ago299f2a9
  2. Merge pull request #12748 from AndrewMeadows/untangle-003John Conklin II committed 8 years ago9e21bab
  3. on first run, send user to serverless tutorial rather than checking for a local sandboxSeth Alves committed 8 years ago4b0d338
  4. Fix crash selecting domain for second time. Stop rendering while Goto activity is startedGabriel Calero committed 8 years ago99d8f82
  5. Create HIFI_FCDEBUG(_ID) variants that require a categorySimon Walton committed 8 years ago692ccfc
  6. Merge remote-tracking branch 'upstream/master' into android_goto_splashGabriel Calero committed 8 years agoddbf441
  7. Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workloadsamcake committed 8 years agofa35d65
  8. Remove uses of addRepeatedMessageRegex() and its implementationSimon Walton committed 8 years ago7d16ca9
  9. Merge pull request #12737 from highfidelity/RC66Clément Brisset committed 8 years ago3d4490f
  10. Go back to GoTo screenGabriel Calero committed 8 years ago2ff1327
  11. merge with upstreamsamcake committed 8 years ago59a081b
  12. slightly simpler EntityMotionState delete logicAndrew Meadows committed 8 years ago73fa6d3
  13. move entityCollisionWithEntity to PhysicalEntitySimulationAndrew Meadows committed 8 years ago6837d04
  14. Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splashGabriel Calero committed 8 years agob123b67
  15. Merge pull request #12742 from jherico/fix/rc66_crashesJohn Conklin II committed 8 years ago5013760
  16. put back the pre serverless-domain behavior for when a json file is dragged-and-dropped into the interface window -- import the json rather than load as a serverless-domainSeth Alves committed 8 years agodcfebde
  17. Merge pull request #12726 from jherico/fix/rc66_crashesJohn Conklin II committed 8 years ago97d9c1b
  18. Merge pull request #12721 from highfidelity/RC66Brad Hefta-Gaub committed 8 years ago16df773
  19. Don't trigger crashes from timers while waiting for some operation on exitBrad Davis committed 8 years agoaacfe92
  20. fix entity importingSeth Alves committed 8 years agobb10195
  21. Detect if Interface is running on an android testing deviceGabriel Calero committed 8 years ago288f69a
  22. Merge remote-tracking branch 'upstream/master' into android_goto_splashGabriel Calero committed 8 years ago8558759
  23. make alternate keys workDante Ruiz committed 8 years agoa14d5c6
  24. Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaordDante Ruiz committed 8 years ago1d17658
  25. reviewSeth Alves committed 8 years ago6c1d713
  26. reviewSeth Alves committed 8 years ago916ed3a
  27. remove unneeded setSessionUUIDSeth Alves committed 8 years ago196f621
  28. rearrange domain-url-changed signalsSeth Alves committed 8 years agoef52ae1
  29. Merge remote-tracking branch 'upstream/master' into android_goto_splashGabriel Calero committed 8 years ago35935ed
  30. Add Goto as splash screen in androidGabriel Calero committed 8 years ago11bfc1c
  31. changing speedDante Ruiz committed 8 years ago9d8770b
  32. Merge branch 'master' of github.com:highfidelity/hifi into serverless-domainsSeth Alves committed 8 years ago4033af9
  33. made requested changesDante Ruiz committed 8 years agocce77e3
  34. Merge pull request #12635 from ctrlaltdavid/21776Ken Cooke committed 8 years agof5f4e2a
  35. Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaordDante Ruiz committed 8 years ago86cd5ff