History

Merge remote-tracking branch 'upstream/master'

Philip Rosedale committed 13 years ago

Commit be7fb7b2 parents d550b09 e19d4fd3 files · +70 −78Browse files

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

Unified · Split

interface/src/main.cpp+3−0
@@ -1501,6 +1501,9 @@ void idle(void) { · 1500 unmodified lines
1501 {1501 {
1502 Head *avatar = (Head *)agent->getLinkedData();1502 Head *avatar = (Head *)agent->getLinkedData();
1503 avatar->simulate(deltaTime);1503 avatar->simulate(deltaTime);
1504
1505 //not ready yet...
1506 //myAvatar.testForCollision( avatar->getBodyPosition(), avatar->getGirth(), avatar->getHeight(), avatar->getBodyUpDirection() );
1504 }1507 }
1505 }1508 }
1506 1509

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