Commit graph

49339 commits

Author SHA1 Message Date
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
David Rowe
a75d0b3fe8 Merge branch 'master' into 21089 2016-11-30 14:50:51 +13: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
Zach Pomerantz
e6dfc5204d expose mutex in LimitedNodeList 2016-11-28 17:13:21 -05:00
Zach Pomerantz
41ef105456 clean up AudioMixerSlave 2016-11-28 17:07:24 -05:00
Zach Pomerantz
bf137cd589 break AudioMixer slave/stats into own files 2016-11-28 16:50:47 -05:00
Zach Pomerantz
2e619b230d add AudioMixerStats 2016-11-28 16:50:42 -05:00
Zach Pomerantz
192f4791d5 move mixing into AudioMixerSlave 2016-11-28 16:50:26 -05:00
Zach Pomerantz
891084e9db modularize audio mixing code 2016-11-28 16:48:53 -05:00
Zach Pomerantz
028ac5264f consolidate AudioMixer slots 2016-11-28 16:26:53 -05:00
Howard Stearns
030f0d7103 Merge pull request #9114 from howard-stearns/bubble-state
bubble state
2016-11-28 12:16:39 -08:00
Ryan Huffman
dcd52215d1 Add original version of bow 2016-11-28 12:07:14 -08:00
samcake
803a399bb6 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-11-28 11:58:17 -08:00
Brad Hefta-Gaub
6f0377eda0 Merge pull request #9113 from hyperlogic/feature/neuron-prefs
Added preferences for the Perception Neuron plugin.
2016-11-28 08:58:00 -08:00
David Kelly
1b26d51292 Merge pull request #9110 from howard-stearns/capture-original-location-in-snapshots
Capture original location in snapshots
2016-11-28 08:55:47 -08:00
Zach Pomerantz
0170379d3c rm unused vars 2016-11-27 18:09:05 -05:00
Zach Pomerantz
6f7162132e add release/debug/gprof/valgrind to gitignore 2016-11-27 18:03:02 -05:00
samcake
54543935be Merge pull request #8560 from samcake/hdr
Introducing Clustered Lighting and improve Lighting performances
2016-11-23 17:34:40 -08:00
samcake
1974ded050 Potentially address the crash when no vertex format is specified 2016-11-23 16:37:06 -08:00
Brad Hefta-Gaub
9f689b1b69 Merge pull request #9116 from highfidelity/stable
Merge Hotfix back into master.
2016-11-23 15:30:29 -08:00
howard-stearns
bf0f56c138 null guard 2016-11-23 15:27:24 -08:00
howard-stearns
9e45b0ca28 Merge branch 'master' of https://github.com/highfidelity/hifi into capture-original-location-in-snapshots 2016-11-23 15:12:45 -08:00
samcake
d806b088a9 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-23 15:05:52 -08:00