Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 10:17:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve conflicts on merge with upstream master

Browse source
This commit is contained in:
Stephen Birarda 2013-04-16 12:02:33 -07:00
parent 1dd21a450e
commit 53108b01ef
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/main.cpp
View file

@ -354,8 +354,8 @@ void reset_sensors()
// //
myAvatar.setRenderYaw(startYaw); myAvatar.setRenderYaw(startYaw);
yaw = renderYawRate = 0; renderYawRate = 0;
pitch = renderPitch = renderPitchRate = 0; renderPitchRate = 0;
myAvatar.setBodyPosition(start_location); myAvatar.setBodyPosition(start_location);
headMouseX = WIDTH/2; headMouseX = WIDTH/2;
headMouseY = HEIGHT/2; headMouseY = HEIGHT/2;