samcake
7f8450f77b
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-09-23 10:30:51 -07:00
David Rowe
eb01ba9812
Merge branch 'master' into 20681
2015-09-23 09:42:56 -07:00
Howard Stearns
401f83135a
Merge branch 'master' of https://github.com/highfidelity/hifi into apostrophe
2015-09-23 09:15:21 -07:00
Brad Hefta-Gaub
ec9bf0791b
Merge pull request #5875 from ctrlaltdavid/20689
...
Don't run Script Editor scripts from the cache
2015-09-23 08:52:30 -07:00
Andrew Meadows
feeead0e0a
Merge pull request #5879 from ZappoMan/fixWarning
...
fix a bunch of warnings
2015-09-23 08:24:21 -07:00
Ken Cooke
c4bc5233b1
In AudioClient, replace all SOXR with AudioSRC. Used for input-to-network, network-to-output, and loopback resampling.
2015-09-22 23:10:03 -07:00
Ken Cooke
4b9c2ed6b6
In AudioInjector, replace SOXR with AudioSRC.
...
Used for pitch shifting in playSound(). Setup time (once per sound) is drastically improved.
2015-09-22 23:08:05 -07:00
Brad Hefta-Gaub
387c4fbd92
fix bad oglplus pragma warnings
2015-09-22 21:52:16 -07:00
Brad Hefta-Gaub
17a3fd159a
apparently unix doesn't like the generic type version of sqrt()
2015-09-22 21:43:09 -07:00
Brad Hefta-Gaub
02e1de3ba3
more warnings fixes
2015-09-22 21:35:13 -07:00
Brad Hefta-Gaub
cd9aad4f41
more warnings fixes
2015-09-22 21:28:45 -07:00
Brad Hefta-Gaub
9436d2922f
more warnings fixes
2015-09-22 21:18:04 -07:00
Brad Hefta-Gaub
5b00783f18
more warnings fixes
2015-09-22 20:54:36 -07:00
Brad Hefta-Gaub
8d8035a418
Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarning
...
Conflicts:
libraries/render-utils/src/Model.cpp
libraries/render-utils/src/Model.h
2015-09-22 20:54:25 -07:00
Brad Hefta-Gaub
3fe4de4511
Merge pull request #5751 from imgntn/bubblewand_hotfix_2
...
Bubble Wand
2015-09-22 20:35:58 -07:00
Brad Hefta-Gaub
52842cb287
more warnings fixes
2015-09-22 20:34:40 -07:00
Anthony J. Thibault
9ce43a57f1
Better head IK when in an HMD.
...
Because the current IK system doesn't quite handle what we need
for the head and neck IK, we do it procedurally in the rig, and
manually set both neck and head IK targets.
2015-09-22 19:58:21 -07:00
Anthony J. Thibault
d04f4d4b2b
Added shared DebugDraw singleton.
2015-09-22 19:57:23 -07:00
Anthony J. Thibault
d53295655f
Fixes for empty poses
...
This can happen when an animation is evaluated before it is finished loading.
2015-09-22 19:54:51 -07:00
Howard Stearns
a9460b9b41
Merge pull request #5881 from AndrewMeadows/ik-repairs-004
...
remove underpose attenuation from IK relaxation step
2015-09-22 19:45:40 -07:00
James Pollack
ac6047848a
Merge remote-tracking branch 'upstream/master'
2015-09-22 18:30:38 -07:00
James Pollack
fa1d5be310
Reduce volume, JSLint, Coding standards
2015-09-22 18:20:23 -07:00
James Pollack
3e3d7a8bfa
JS Linting and Coding Standards
2015-09-22 18:12:51 -07:00
Brad Hefta-Gaub
e99ad75a28
more warnings fixes
2015-09-22 18:01:39 -07:00
Brad Hefta-Gaub
6f7e13b3c1
more warning fixes
2015-09-22 17:26:45 -07:00
Brad Hefta-Gaub
7536fed09a
more warning fixes
2015-09-22 17:22:09 -07:00
Andrew Meadows
d25ba8946e
fix animation attenuation from IK relaxation step
2015-09-22 17:20:26 -07:00
Andrew Meadows
2edffaf91a
remove unused variables
2015-09-22 17:20:13 -07:00
Andrew Meadows
11fee94459
remove warning about signed/unsigned comparison
2015-09-22 17:19:47 -07:00
Philip Rosedale
474dc3920c
Merge pull request #5878 from ctrlaltdavid/20690
...
DO NOT MERGE - QA for 20690 - Don't look straight ahead in fullscreen mirror
2015-09-22 16:52:52 -07:00
Brad Hefta-Gaub
61d2e59b77
Revert "fix a bunch of warnings on windows"
...
This reverts commit 6347706f59
2015-09-22 16:42:00 -07:00
Brad Hefta-Gaub
efda121619
fix a bunch of warnings on windows
2015-09-22 16:40:17 -07:00
Brad Hefta-Gaub
6347706f59
fix a bunch of warnings on windows
2015-09-22 16:37:54 -07:00
David Rowe
eda12fd3af
Don't look straight ahead in fullscreen mirror
2015-09-22 16:15:54 -07:00
Brad Davis
deaa4a747b
Batch side implementation of multi-draw indirect
2015-09-22 15:56:58 -07:00
Ken Cooke
0ad01ca935
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-src
2015-09-22 15:33:13 -07:00
Howard Stearns
7bd395a4d4
Merge branch 'master' of https://github.com/highfidelity/hifi into apostrophe
2015-09-22 15:06:43 -07:00
Brad Hefta-Gaub
17b2bf1c33
Merge pull request #5864 from birarda/master
...
make sure server/mixers are first in FIFO
2015-09-22 14:57:49 -07:00
Brad Hefta-Gaub
5bcce50b98
Merge pull request #5846 from bob-long/master
...
Display the face blend coefficients and update the value in real time.
2015-09-22 14:56:56 -07:00
Andrew Meadows
3af1329be2
Merge pull request #5825 from thoys/20655
...
CR for Job #20655 - Add ability to close one script from another script
2015-09-22 14:52:39 -07:00
Andrew Meadows
084ba8abc0
Merge pull request #5874 from howard-stearns/AndrewMeadows-ik-repairs-003
...
cleanup IK implementation plusplus
2015-09-22 14:51:41 -07:00
James Pollack
1e09c2501c
This updates the flashlight to have sounds when it turns on and off
2015-09-22 14:21:14 -07:00
James Pollack
31f05903b5
Merge remote-tracking branch 'upstream/master'
2015-09-22 13:54:49 -07:00
Seth Alves
e7999fa7f5
Merge pull request #5876 from ZappoMan/fixWarning
...
remove dead code and fix warning
2015-09-22 13:33:17 -07:00
ericrius1
42a2125336
Only asking for needed props
2015-09-22 13:29:54 -07:00
James Pollack
3fd4822813
Merge remote-tracking branch 'upstream/master'
2015-09-22 13:02:03 -07:00
Eric Levin
00e0523872
Merge pull request #5851 from imgntn/flashlight_updates_1
...
Flashlight updates
2015-09-22 13:01:26 -07:00
James Pollack
561b4ca8e1
Remove update loop refs, remove unload method
2015-09-22 12:52:24 -07:00
James Pollack
e5c42c76a2
Remove update loop refs
2015-09-22 12:41:00 -07:00
James Pollack
0ad238a508
Enlarge flashlight
2015-09-22 12:39:48 -07:00
