Commit graph

20484 commits

Author SHA1 Message Date
Atlante45
22e7c6d507 Merge branch 'master' of https://github.com/highfidelity/hifi into editModels
Conflicts:
	examples/editModels.js
2015-01-08 18:30:38 -08:00
Philip Rosedale
22a609f014 Merge pull request #4071 from Atlante45/head_rotation_fix
Head rotation fix
2015-01-08 17:24:23 -08:00
Atlante45
1c4903c346 Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix 2015-01-08 16:33:01 -08:00
Brad Hefta-Gaub
0a176b3c9e Merge pull request #4066 from AndrewMeadows/inertia
thread safety for EntitySimulation
2015-01-08 16:05:07 -08:00
Andrew Meadows
f8c512b690 fix deleteEntity() to actually delete result 2015-01-08 12:42:16 -08:00
Brad Hefta-Gaub
0ac8f79d2e Merge pull request #4067 from ctrlaltdavid/inconsistent-dll-linkage
Suppress warnings about inconsistent DLL linkage of lrintf in Windows
2015-01-08 12:06:00 -08:00
Atlante45
e73f8baf93 Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix 2015-01-08 11:54:54 -08:00
Atlante45
6fc3e1cf81 change message size 2015-01-08 11:51:14 -08:00
Atlante45
af9525ed33 Bump AvatarData packet number 2015-01-08 11:49:39 -08:00
Atlante45
4157a3ca40 Remove lean from head rotation 2015-01-08 11:33:14 -08:00
David Rowe
198226450a Suppress warnings about inconsistent DLL linkage of lrintf in Windows
This warning in Windows builds is due to redefinition of lrintf in gverb
library's ladspa-util.h file.
2015-01-08 11:26:32 -08:00
Atlante45
0bae05b924 Remove chat message 2015-01-08 11:25:53 -08:00
Atlante45
b8a3bdb6bd Cleanup headers 2015-01-08 11:25:35 -08:00
Atlante45
a46080cbf2 editModels > hydraGrab 2015-01-08 11:24:02 -08:00
Andrew Meadows
b0b2eb5d38 use exact equality for filtering dimension changes 2015-01-08 11:09:32 -08:00
Andrew Meadows
1d371a9627 merge upstream/master into andrew/inertia 2015-01-08 10:24:05 -08:00
Andrew Meadows
c37c1515ba EntitySimulation is lockable
also DeleteEntityOperator just removes the entities
and EntityTree does the actual delete
(after properly locking its _simulation)
2015-01-08 10:22:25 -08:00
Andrew Meadows
25b9b50468 Merge pull request #4065 from ZappoMan/voxelEctomy
fix some warnings and remove more references to voxels
2015-01-08 08:07:06 -08:00
Philip Rosedale
a04ce68fba Merge pull request #4063 from ZappoMan/restoreLookAt
restore camera lookAt and keepLookingAt features
2015-01-07 16:31:07 -08:00
ZappoMan
cc19c15c17 remove more references to voxels 2015-01-07 16:09:56 -08:00
ZappoMan
91351d7700 fix warnings 2015-01-07 16:09:26 -08:00
Brad Hefta-Gaub
97b2e3dfa4 Merge pull request #4064 from AndrewMeadows/bispinor
use degrees/sec for EntityItem angular velocity
2015-01-07 14:44:51 -08:00
Brad Hefta-Gaub
4ac1b6179c Merge pull request #4062 from cozza13/20258
CR for Job #20258 - Fix the guitar script
2015-01-07 14:16:49 -08:00
Stephen Birarda
d5b0fced76 Merge pull request #4061 from thoys/glew-cmake-fix
fix to add GLEW debug library
2015-01-07 14:06:39 -08:00
Andrew Meadows
d2bd95703a use degrees/sec for EntityItem angular velocity 2015-01-07 14:04:22 -08:00
Thijs Wenker
21d8d55be3 fix indentation 2015-01-07 22:53:44 +01:00
ZappoMan
806e691bbf restore camera lookAt and keepLookingAt features 2015-01-07 13:41:07 -08:00
Chris Collins
d15ae92e1e Guitar fix
Guitar position fix
2015-01-07 13:40:36 -08:00
Brad Hefta-Gaub
23559743d9 Merge pull request #4060 from PhilipRosedale/gun
Added improved gun to /examples
2015-01-07 13:16:09 -08:00
Brad Hefta-Gaub
49508733aa Merge pull request #4053 from cozza13/20254
CR for Job #20254 - Additional Script updates
2015-01-07 13:14:34 -08:00
Philip Rosedale
84b9d51e90 Merge pull request #4059 from AndrewMeadows/bispinor
fix rapid attenuation of angular velocity
2015-01-07 13:12:35 -08:00
Thijs Wenker
2690241eb6 fix to add GLEW debug library 2015-01-07 22:08:01 +01:00
Philip Rosedale
9bf56516e0 Added improved gun to /examples 2015-01-07 13:02:00 -08:00
Chris Collins
3a75a6f920 Minor typo fix
Minor typo fix
2015-01-07 12:57:40 -08:00
Andrew Meadows
af9bafae87 fix typo 2015-01-07 12:48:16 -08:00
Andrew Meadows
1745548665 fix rapid attenuation of angular velocity 2015-01-07 12:42:50 -08:00
Brad Hefta-Gaub
ddea2c4a68 Merge pull request #4058 from huffman/entity-tool-updates
Entity tool updates
2015-01-07 12:42:47 -08:00
Ryan Huffman
b471c1fa71 Update hotkey for audio stats 2015-01-07 12:15:53 -08:00
Ryan Huffman
eafe1ae951 Update position of grid-to-avatar to be at the left foot 2015-01-07 12:15:36 -08:00
Ryan Huffman
fbdc509428 Increase size of url input boxes 2015-01-07 12:15:14 -08:00
Ryan Huffman
92fc08fa70 Update property list window to only show after selection 2015-01-07 12:14:47 -08:00
Brad Hefta-Gaub
8ad21d61c4 Merge pull request #4056 from huffman/audio-buffer-starvation-detection
Audio buffer starvation detection
2015-01-07 11:18:34 -08:00
Chris Collins
53f24954e0 Updates based on PR comments
Commented out Camera.stopLooking and Camera.keepLookingAt . This can be
put back when we merge back the C++ issue.
2015-01-07 11:15:30 -08:00
Ryan Huffman
50fcf4ba8f Remove output buffer starvation log warnings 2015-01-07 11:06:36 -08:00
Ryan Huffman
19639367bf Use usecTimestampNow instead of QDateTime::currentMSecsSinceEpoch 2015-01-07 11:04:09 -08:00
Brad Hefta-Gaub
476887b7ef Merge pull request #4055 from huffman/fix-overlays
Update setting drawOnHUD and update to write lock for editOverlay
2015-01-07 10:56:18 -08:00
Andrew Meadows
d3d80a0b1b Merge pull request #4049 from ZappoMan/gpuStreamizing
Work on removing immediate mode OpenGL from application
2015-01-07 10:55:15 -08:00
Andrew Meadows
559ec41bfe Merge pull request #4051 from Atlante45/master
Restored addReverb default arg
2015-01-07 10:25:26 -08:00
Ryan Huffman
40f277b630 Fix use of dependency manager 2015-01-07 10:20:49 -08:00
Brad Hefta-Gaub
a055275469 Merge pull request #4057 from birarda/lasagna-not-spaghetti
remove the faceplus find module
2015-01-07 10:03:14 -08:00