History

Merge branch 'master' of github.com:highfidelity/hifi into feature/quest

danteruiz committed 7 years ago

Commit 95d30e52 parents b8906c3 632d6e857 files · +4509 −4Browse files

Showing the changes to interface/src/Application.cpp (1 of 57 files). Show all

Unified · Split

interface/src/Application.cpp+2−0
@@ -6350,6 +6350,8 @@ void Application::update(float deltaTime) { · 6349 unmodified lines
63506350 _physicsEngine->processTransaction(transaction);
63516351 myAvatar->getCharacterController()->handleProcessedPhysicsTransaction(transaction);
63526352 myAvatar->prepareForPhysicsSimulation();
6353+ _physicsEngine->enableGlobalContactAddedCallback(myAvatar->isFlying());
6354+
63536355 _physicsEngine->forEachDynamic([&](EntityDynamicPointer dynamic) {
63546356 dynamic->prepareForPhysicsSimulation();
63556357 });

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t