Commit graph

16706 commits

Author SHA1 Message Date
Andrzej Kapolka
9caa4d3a08 Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-15 12:19:30 -07:00
Andrzej Kapolka
919112fe7c Starting to work on handling translucent meshes with deferred lighting. 2014-09-15 12:18:59 -07:00
Andrzej Kapolka
4475759461 Revert the normal-based ambient occlusion; I wasn't crazy about the look of
it.  Will perhaps revisit later.
2014-09-15 11:52:44 -07:00
Clément Brisset
198b14310f Merge pull request #3416 from ZappoMan/fixGlitches
normalize all quats before packing
2014-09-15 09:40:07 -07:00
ZappoMan
fd9f64cb44 normalize all quats before packing 2014-09-15 08:46:28 -07:00
Philip Rosedale
a70e27f442 Merge pull request #3411 from ZappoMan/fixWarnings
fix warnings and removed some asserts
2014-09-14 20:28:39 -07:00
Philip Rosedale
06b6ceee66 Merge pull request #3412 from ZappoMan/fixStretchedAttachments
fix bug with attachments being stretched
2014-09-14 20:26:56 -07:00
Stephen Birarda
57534ff0bb Merge pull request #3414 from birarda/master
fix for domain-server passing back stack manager config
2014-09-14 09:56:25 -07:00
Stephen Birarda
c98b69f24f don't comment value return, rename domain settings file 2014-09-14 09:52:10 -07:00
Stephen Birarda
d6dca84694 add back commenting out of blind values return 2014-09-14 09:46:01 -07:00
Stephen Birarda
4d80417e3c don't rename the config file to settings so existing nodes work 2014-09-14 09:45:02 -07:00
Stephen Birarda
cb7a6a7af5 don't blindly return all values if a type is not passed 2014-09-14 09:43:55 -07:00
ZappoMan
c32d5db75c fix bug with attachments being stretched 2014-09-13 15:32:21 -07:00
ZappoMan
ac27c36c3d one more shot at these warnings 2014-09-13 09:40:44 -07:00
ZappoMan
d92d2d57a0 one more shot at these warnings 2014-09-13 09:28:28 -07:00
ZappoMan
95a63cf131 fix windows warning and change QByteArray initializer to match documented prototype 2014-09-13 09:14:52 -07:00
ZappoMan
04772f6e5d fix more signed/unsigned warnings 2014-09-13 09:09:18 -07:00
ZappoMan
9c34aed36d fix type signed/unsigned warning 2014-09-13 09:02:48 -07:00
ZappoMan
d6ebbd8633 fixed use of uninitialized variable warning 2014-09-13 09:01:27 -07:00
ZappoMan
a95e5487fc fix type signed/unsigned warning 2014-09-13 09:00:47 -07:00
ZappoMan
a6178a137f fix windows warnings 2014-09-13 09:00:18 -07:00
ZappoMan
4ae3360f83 fix warning 2014-09-13 08:50:52 -07:00
ZappoMan
be8994f3a3 attempt to fix warning 2014-09-13 08:47:18 -07:00
ZappoMan
e76ffb2ecb fixed another warning 2014-09-13 08:44:13 -07:00
ZappoMan
64479b067e fix more warnings, replace assert with debug message 2014-09-13 08:21:23 -07:00
ZappoMan
51b66bdee3 fixed warnings and converted several asserts to debug messages 2014-09-13 08:14:31 -07:00
ZappoMan
d10bd6857d add use of missingSet in release build to silence warning 2014-09-13 08:02:38 -07:00
ZappoMan
c5e02c4ec5 removed unused lastAttemptedSubTree 2014-09-13 07:58:49 -07:00
ZappoMan
973479d1ac fix warning in ByteCountCoded<> 2014-09-13 07:57:45 -07:00
Brad Hefta-Gaub
ec23a7a868 Merge pull request #3410 from chansensturm/audio-noise
Head Penumbra filter gain smoothing
2014-09-13 07:47:30 -07:00
Craig Hansen-Sturm
09370840d5 coding standard 2014-09-13 00:35:02 -07:00
Andrzej Kapolka
af546e6b05 Fix for shadows in rear view mirror. 2014-09-12 19:18:31 -07:00
Andrzej Kapolka
48adbdfbd2 Shadow fix. 2014-09-12 19:05:49 -07:00
Brad Hefta-Gaub
6bc4275809 Merge pull request #3409 from AndrewMeadows/inertia
fix build for no XMPP
2014-09-12 18:57:20 -07:00
Andrzej Kapolka
e36ff0d238 Fix deferred lighting for rear view mirror. 2014-09-12 18:56:07 -07:00
Andrzej Kapolka
f8772135b1 Color fix. 2014-09-12 18:35:56 -07:00
Craig Hansen-Sturm
2c7d15c01b disable input gain/mute 2014-09-12 18:32:28 -07:00
Craig Hansen-Sturm
2f8ef6b4fb new head penumbra gain calculations 2014-09-12 18:31:33 -07:00
Andrzej Kapolka
24b193b5dc Alpha testing bits. 2014-09-12 18:11:46 -07:00
Andrew Meadows
b94b737f26 fix build for no XMPP 2014-09-12 17:56:25 -07:00
Andrzej Kapolka
42c8701b26 Don't use gl_Color for skin. 2014-09-12 17:36:58 -07:00
Andrzej Kapolka
72f38900bb Fix for blending on models. 2014-09-12 17:31:03 -07:00
Andrzej Kapolka
982ab75b61 Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-12 17:09:25 -07:00
Andrzej Kapolka
53933fc9c6 Working on deferred lighting for models. 2014-09-12 17:09:07 -07:00
AndrewMeadows
27b8d7076b Merge pull request #3408 from ey6es/master
Slight fix for Blender fix.
2014-09-12 16:00:53 -07:00
Andrzej Kapolka
3d48a5b872 Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-12 15:39:52 -07:00
Andrzej Kapolka
7f31b4563c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-12 15:35:46 -07:00
Brad Hefta-Gaub
e69e90b5b4 Merge pull request #3405 from thoys/20017
Code Review for Job #20017
2014-09-12 15:34:50 -07:00
Andrzej Kapolka
97813a2f72 Make sure we note that the blender finished even if the geometry changed. 2014-09-12 15:34:49 -07:00
Brad Hefta-Gaub
66ce6b7c3c Merge pull request #3407 from ey6es/master
Only allow one "blender" to run at a time for each model.
2014-09-12 15:34:39 -07:00