Dante Ruiz
dc7bb5b083
grip button fix
2016-12-01 10:17:54 -08:00
Chris Collins
19b5e7cd86
Merge pull request #9054 from howard-stearns/third-person-lasers
...
make hand-controller ui work in third person
2016-12-01 10:11:12 -08:00
Chris Collins
c0a0a16ff8
Merge pull request #9127 from huffman/fix/hand-controller-grab-release
...
Fix 'releaseGrab' not being called when using grip buttons
2016-12-01 09:58:36 -08:00
Brad Hefta-Gaub
e0bcbb08ff
Merge pull request #9134 from samcake/blue
...
Fix a bug when using the gpu::Batch::_glUniform*() calls with a bad location
2016-12-01 09:03:56 -08:00
sam
3d29187156
FIx a potential bug when using _glUniform calls with an invalid location
2016-12-01 02:44:04 -08:00
sam
6342762fde
FIx a potential bug when using _glUniform calls with an invalid location
2016-12-01 02:39:52 -08:00
Anthony J. Thibault
e96676fea4
Support for the 3ds Max object offset feature
...
FBXReader now supports the GeometricTranslation, GeometricRotation and GeometricScaling FBX fields.
These offsets are applied directly to the mesh vertices, as they are never animated and the rest of our
rendering and animation system would have difficulty supporting them otherwise.
2016-11-30 18:28:55 -08:00
Ryan Jones
7b0756c745
remove lerp in deference to mix, adjust naming conventions, namespace shader helper functions
2016-11-30 16:37:04 -08:00
Brad Hefta-Gaub
c9545ca920
Merge pull request #9129 from Atlante45/audio-dll
...
Select Audio DLL at runtime
2016-11-30 15:42:21 -08:00
Zach Pomerantz
2c42bb0aa8
time audio mixing frames
2016-11-30 18:18:36 -05:00
Ken Cooke
452f081366
Add support for WAV assets with arbitrary sample rate, not just 48khz. Fast path when already 24khz.
2016-11-30 14:56:11 -08:00
Ryan Huffman
5735dbec2d
Add spawnBow.js
2016-11-30 13:58:56 -08:00
Zach Pomerantz
8a6dcdeb68
mix audio with single node list read lock
2016-11-30 16:37:34 -05:00
Ryan Huffman
58c232529b
Add back manipulation of collidesWith in bow
2016-11-30 13:26:56 -08:00
Ryan Huffman
35bc962654
Remove commented out line in bow.js
2016-11-30 13:26:39 -08:00
samcake
c75513d87d
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-11-30 11:45:50 -08:00
samcake
c3db2704ed
Merge pull request #9126 from jherico/gl_debugging
...
Working on OpenGL debuggability
2016-11-30 10:51:58 -08:00
Ken Cooke
7ad384d731
reformat to meet Coding Standard, more explicit license
2016-11-30 10:44:27 -08:00
Dante Ruiz
1b20cc8bd0
more clean up
2016-11-30 18:28:50 +00:00
Dante Ruiz
104cbbff7e
clean up
2016-11-30 18:26:06 +00:00
Dante Ruiz
34d24b947e
better implementation
2016-11-30 18:03:11 +00:00
Anthony J. Thibault
7f840d3a08
Can use 'xboxLaser' in third person camera
2016-11-30 10:01:11 -08:00
Chris Collins
c2863f3413
Merge pull request #9120 from Polyrhythm/ryan/bind-polyfill
...
add bind polyfill and basic .editorconfig for indentation
2016-11-30 09:52:56 -08:00
Atlante45
db263df03e
Select Audio DLL at runtime
2016-11-29 19:42:59 -08:00
Anthony J. Thibault
78559934a1
Merge branch 'master' into third-person-lasers
2016-11-29 16:38:34 -08:00
Ryan Jones
fe774a8530
adjust whitespace
2016-11-29 15:41:50 -08:00
Ryan Jones
3ccc493871
add helpers for v3 and shaders
2016-11-29 15:40:20 -08:00
Ryan Huffman
aa1e813d72
Fix 'releaseGrab' not being called when using grip buttons
2016-11-29 15:04:14 -08:00
Ken Cooke
812d28dbff
Fix compiler warnings
2016-11-29 14:39:49 -08:00
Ryan Huffman
c990849bf8
Fix hand not being reenabled on unequip with bow
2016-11-29 14:37:09 -08:00
Ryan Huffman
09dd68ae37
Cleanup string in bow to only use 1 entity
2016-11-29 14:36:33 -08:00
Ryan Huffman
c06a3a3a11
Add state constants to bow
2016-11-29 14:36:02 -08:00
Ryan Huffman
25821eb01a
Update paths in bow to be relative
2016-11-29 14:33:59 -08:00
Ken Cooke
68085947a0
replace tabs with spaces
2016-11-29 14:12:41 -08:00
Brad Davis
63b3b7250d
Restore correct pipeline shader slot setup
2016-11-29 14:02:58 -08:00
Brad Davis
a98e49c892
Fix build errors
2016-11-29 14:02:15 -08:00
Brad Davis
3b07e31eab
Working on OpenGL debuggability
2016-11-29 13:15:56 -08:00
Ken Cooke
5d05fd389f
First-order Ambisonic renderer, optimized for AVX2
2016-11-29 12:53:19 -08:00
samcake
56a1d57a94
removing separate vertex format from the gl45backend to test if it avoids the crash
2016-11-29 11:57:50 -08:00
Ryan Jones
01ae2b9452
add errant semicolon
2016-11-29 11:56:11 -08:00
Ryan Jones
251b070db3
add unit test
2016-11-29 11:50:11 -08:00
Zach Pomerantz
b4638105e3
expose audio mixer threads to gui
2016-11-29 13:32:10 -05:00
Dante Ruiz
2d28ae1ffe
fixed context menu showing up in the correct location
2016-11-29 18:15:40 +00:00
Brad Hefta-Gaub
881e0cba11
Merge pull request #9117 from samcake/red
...
Potentially address the crash when no vertex format is specified
2016-11-29 09:23:43 -08:00
Ryan Jones
a59df5b04d
one last indentation fix
2016-11-28 17:19:43 -08:00
Ryan Jones
3961dbcf55
revert changes to dev utils, apply changes to system utils
2016-11-28 17:18:31 -08:00
Ryan Jones
68e86da023
adjust indentation and implement editorconfig at root of repo
2016-11-28 17:10:59 -08:00
Ryan Huffman
53a8a0e45b
Update bow.js
2016-11-28 16:49:43 -08:00
Zach Pomerantz
7a440def87
add AudioMixerSlavePool
2016-11-28 17:59:29 -05:00
Ryan Jones
4be1922df5
add bind polyfill
2016-11-28 14:47:15 -08:00