History

making requested changes and fixing compile issue for jenkins

Dante Ruiz committed 8 years ago

Commit c97d6461 parent b665dbe6 files · +7 −22Browse files

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

Unified · Split

interface/src/Application.cpp+0−4
@@ -3479,8 +3479,6 @@ void Application::setIsInterstitialMode(bool interstitialMode) { · 3478 unmodified lines
3479 3479
3480 DependencyManager::get<AudioClient>()->setAudioPaused(_interstitialMode);3480 DependencyManager::get<AudioClient>()->setAudioPaused(_interstitialMode);
3481 DependencyManager::get<AvatarManager>()->setMyAvatarDataPacketsPaused(_interstitialMode);3481 DependencyManager::get<AvatarManager>()->setMyAvatarDataPacketsPaused(_interstitialMode);
3482
3483 emit interstitialModeChanged(_interstitialMode);
3484 }3482 }
3485}3483}
3486 3484
@@ -5323,7 +5321,6 @@ void Application::resetPhysicsReadyInformation() { · 1836 unmodified lines
5323 _fullSceneCounterAtLastPhysicsCheck = 0;5321 _fullSceneCounterAtLastPhysicsCheck = 0;
5324 _nearbyEntitiesCountAtLastPhysicsCheck = 0;5322 _nearbyEntitiesCountAtLastPhysicsCheck = 0;
5325 _nearbyEntitiesStabilityCount = 0;5323 _nearbyEntitiesStabilityCount = 0;
5326 _nearbyEntitiesReadyCount = 0;
5327 _physicsEnabled = false;5324 _physicsEnabled = false;
5328 _octreeProcessor.startEntitySequence();5325 _octreeProcessor.startEntitySequence();
5329}5326}
@@ -6592,7 +6589,6 @@ bool Application::nearbyEntitiesAreReadyForPhysics() { · 1262 unmodified lines
6592 readyNearbyEntities++;6589 readyNearbyEntities++;
6593 }6590 }
6594 }6591 }
6595 _nearbyEntitiesReadyCount = readyNearbyEntities;
6596 return result;6592 return result;
6597 }6593 }
6598 return false;6594 return false;

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