Commit graph

26009 commits

Author SHA1 Message Date
Sam Gateau
0e72197a37
Merge pull request #12179 from Zvork/specular
Fixed error in Specular shader which gave low key specular highlights
2018-01-17 10:51:25 -08:00
Seth Alves
69a33428c0
Merge pull request #12078 from druiz17/soft-entities
Soft Entities
2018-01-17 08:02:37 -08:00
Sam Gateau
d4571bd86a
Merge pull request #12181 from humbletim/rename-model-graphics
Rename libraries/model -> libraries/graphics
2018-01-16 18:12:25 -08:00
NissimHadar
9a382ebb86
Merge pull request #12177 from NissimHadar/defaultAmbientFix
Set ambient mode to inherit if no URLs have been entered.
2018-01-16 14:40:08 -08:00
MiladNazeri
d356f4faf9
Merge pull request #12143 from ctrlaltdavid/21679
location API JSDoc
2018-01-16 12:32:25 -08:00
Clément Brisset
858221d4db
Merge pull request #12118 from Atlante45/fix/avatar-mixer-crash
Fix concurrent access crash in avatar mixer
2018-01-16 11:07:59 -08:00
David Rowe
f836a5f2b6 Fix typo 2018-01-17 08:06:04 +13:00
Sam Gondelman
3879626205
Merge pull request #12176 from SamGondelman/rendering
Fix animation crash, make last frame inclusive
2018-01-16 10:05:48 -08:00
humbletim
b91d536dd0 rename model:: -> graphics:: 2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Seth Alves
b17913366a
Merge pull request #12178 from ctrlaltdavid/21694
Support FBX files that have nodes with non-XYZ rotation order
2018-01-16 07:50:11 -08:00
Olivier Prat
6686b328c7 Fixed error in Specular shader which gave low key specular highlights 2018-01-16 10:47:46 +01:00
David Rowe
02179e3efd Doc review 2018-01-16 17:14:30 +13:00
David Rowe
f319fa70cb Merge branch 'master' into 21679 2018-01-16 16:22:34 +13:00
Nissim Hadar
f2d272b6fe Merge branch 'master' of https://github.com/highfidelity/hifi into defaultAmbientFix 2018-01-15 17:56:19 -08:00
Nissim Hadar
daa6409936 Improved comments. 2018-01-15 17:33:48 -08:00
David Rowe
67218a697b Support FBX files that have nodes with non-XYZ rotation order 2018-01-16 14:01:20 +13:00
Nissim Hadar
a1415e28ff If there is neither a skybox URL nor an ambient light uRL, then set the ambient mode to inherit. 2018-01-15 15:11:10 -08:00
SamGondelman
f1253e3c6c fix crash on last frame = first frame, make last frame inclusive 2018-01-15 15:01:17 -08:00
Ryan Huffman
9b7520ddba
Merge pull request #12173 from sethalves/atp-get-mapping
expose GetMappingRequest to js
2018-01-15 13:42:19 -08:00
Sam Gateau
2f5d2bef49
Merge pull request #12028 from Zvork/roughness_metal
Lighting model update for better specular
2018-01-15 10:51:18 -08:00
Seth Alves
76048f3c30 error handling 2018-01-15 10:48:12 -08:00
Dante Ruiz
645f608814 fixing merge conflict 2018-01-15 10:45:51 -08:00
Dante Ruiz
c76fdd1f5f adding scale 2018-01-15 10:43:26 -08:00
Seth Alves
3e7d303661 export atp GetMappingRequest to js 2018-01-15 09:56:46 -08:00
Anthony Thibault
0a54241fe3
Merge pull request #12092 from hyperlogic/feature/dual-quat
Fix tootsie roll wrists and shoulders with dual quaternion skinning
2018-01-12 16:30:03 -08:00
Dante Ruiz
283b9a8003 fix softEntity edge cases 2018-01-12 15:31:54 -08:00
Brad Hefta-Gaub
68de7f864e
Merge pull request #12162 from kencooke/audio-stereo-mic
Support for stereo audio input/mic
2018-01-12 13:29:28 -08:00
NissimHadar
e580a19677
Merge pull request #12147 from NissimHadar/noBackgroundModeFix
Dealing with legacy domains.
2018-01-12 12:42:11 -08:00
Dante Ruiz
5b82c7bc41 fix merge conflict 2018-01-12 11:00:19 -08:00
Anthony J. Thibault
088f227df2 Pass model offset from avatar skeletonModel to attached entity 2018-01-12 10:26:02 -08:00
Anthony J. Thibault
bfd18e3696 unused variable warning fix 2018-01-12 09:07:50 -08:00
Nissim Hadar
50a030b68b Corrected copy of ambient URL. 2018-01-12 00:22:06 -08:00
Nissim Hadar
a1f25bf49c Moved variable setting to outside of loop.
Added copy of ambient URL.
2018-01-11 19:35:13 -08:00
Ken Cooke
dfc8c86571 Fix bug when calling switchOutputToAudioDevice() with the active device.
Pass QAudioDeviceInfo by value to avoid getting clobbered.
2018-01-11 18:22:34 -08:00
Ken Cooke
db6e70cb24 Fix bug when calling switchInputToAudioDevice() with the active device.
Pass QAudioDeviceInfo by value to avoid getting clobbered.
2018-01-11 18:14:16 -08:00
Anthony J. Thibault
983e1fe075 warning fixes: removed unused variable. 2018-01-11 17:57:58 -08:00
Anthony J. Thibault
4e4ac6c54d Merge branch 'master' into bug-fix/elbow-glitch-fix 2018-01-11 17:57:41 -08:00
Anthony J. Thibault
7753b8a0b5 Merge branch 'master' into feature/dual-quat 2018-01-11 17:31:29 -08:00
Dante Ruiz
96a97b5938 added model transform override 2018-01-11 16:41:45 -08:00
Nissim Hadar
86cfeac95c Moved variable setting to outside of loop. 2018-01-11 16:39:44 -08:00
Ken Cooke
7c5085bd24 Handle stereo changes while active, by restarting the codec on both ends 2018-01-11 16:10:50 -08:00
Anthony J. Thibault
467a7eaf2d Fix for elbow glitches
The pole vector constraint calculation within the IK system would sometimes compute the incorrect rotations.
This would be visible as an instantaneous snap of the elbow joint as the bicep was curled.

When applying pole vector constraints, there needs to be two methods of determining the current orientation of the elbow joint.
One for when the arm/elbow joint is bent, and one for when the arm/elbow is straight.
Previously, the way we would switch between these two solutions could cause a large rotation delta to accur between very small angles.
Now we use the more accurate method (1) more often, and we smoothly blend between the solutions as the joint gets straighter.
2018-01-11 15:40:53 -08:00
Nissim Hadar
311e95e0d0 Corrected default values - for reading legacy content. 2018-01-11 14:57:22 -08:00
Nissim Hadar
4bd09fd9af Corrected default values - for reading legacy content. 2018-01-11 14:53:58 -08:00
Nissim Hadar
d1cd2d9c96 Merge branch 'master' of https://github.com/highfidelity/hifi into noBackgroundModeFix 2018-01-11 14:52:19 -08:00
Sam Gateau
4663f8eb2a
Merge pull request #12136 from SamGondelman/texture
Keep requesting render update until textures load
2018-01-11 14:09:21 -08:00
Sam Gateau
09f5f0746b
Merge pull request #12141 from SamGondelman/uniformBuffer
Fix particle uniform buffer issue
2018-01-11 14:05:36 -08:00
Nissim Hadar
d225f803d0 Corrected default values. 2018-01-11 12:28:44 -08:00
Seth Alves
568c27d6e0
Merge pull request #12039 from luiscuenca/currentAPI
Fix and improve currentAPI.js
2018-01-10 17:55:08 -08:00