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
ericrius1
5546a04f4d
Added flashlight to master script
2015-09-22 13:48:10 -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
135b34d82a
Merge branch 'master' into toybox
2015-09-22 13:32:08 -07:00
ericrius1
42a2125336
Only asking for needed props
2015-09-22 13:29:54 -07:00
ericrius1
a28cf5ce8b
updated grab script
2015-09-22 13:29:16 -07:00
ericrius1
a0bf7b6529
doll animation fixes
2015-09-22 13:20:17 -07:00
ericrius1
6298dcb2fc
attempt fix for doll animation
2015-09-22 13:03:44 -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
ericrius1
d273852bf9
New wand script
2015-09-22 12:56:01 -07:00
James Pollack
561b4ca8e1
Remove update loop refs, remove unload method
2015-09-22 12:52:24 -07:00
ericrius1
a266e8d65a
updated reset script to use new wand script
2015-09-22 12:49:45 -07:00
James Pollack
e5c42c76a2
Remove update loop refs
2015-09-22 12:41:00 -07:00
ericrius1
2557b32e1a
Updated switch model to be fbx
2015-09-22 12:40:09 -07:00
James Pollack
0ad238a508
Enlarge flashlight
2015-09-22 12:39:48 -07:00
Brad Hefta-Gaub
5bb908f081
remove dead code and fix warning
2015-09-22 12:34:47 -07:00
Ken Cooke
db85bbacf4
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-src
2015-09-22 12:10:53 -07:00
David Rowe
fed5e8e573
Don't run Script Editor scripts from the cache
2015-09-22 11:35:34 -07:00
Howard Stearns
c8960e23ec
Merge branch 'master' of https://github.com/highfidelity/hifi into apostrophe
2015-09-22 10:55:26 -07:00
Andrew Meadows
7060befd1c
Merge pull request #5862 from howard-stearns/user-specified-animation-graph
...
user-specified animation graph
2015-09-22 10:48:28 -07:00
Eric Levin
37efb80945
Update BUILD_WIN.md
2015-09-22 10:19:01 -07:00
Ken Cooke
630abda35f
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-src
2015-09-22 10:18:11 -07:00
Philip Rosedale
c09ac51d75
Merge pull request #5871 from ctrlaltdavid/20688
...
DO NOT MERGE - QA for 20688 - Fix 3rd person HMD view
2015-09-22 10:17:28 -07:00
Howard Stearns
7e52d38870
Don't include the root rot, because it seems that this is already accounted for in the head params.
...
Restore the hmd conditional on setting head position. This had been removed when failing to pin it cause lean.
I believe that lean was being caused by coordinate system issues that are now addressed by the above and Andrew's big cleanup.
2015-09-22 10:12:59 -07:00
Howard Stearns
8f1dde69cc
Always keep targets, even when both position and rotation are unset. (Get from underpose.)
...
Filtering these was necessary before when the underpose coordinate was wrong, but now that we have that working, there shouldn't be any need to filter.
2015-09-22 10:10:29 -07:00
ericrius1
b704ebd934
modified dice starting position
2015-09-22 09:55:24 -07:00
ericrius1
98faf3d712
Added light switch sound
2015-09-22 09:53:22 -07:00
Thijs Wenker
f38bb77d0a
less calls to QHash
2015-09-22 18:48:46 +02:00
Howard Stearns
0ccf2346fa
Merge branch 'ik-repairs-003' of https://github.com/AndrewMeadows/hifi into AndrewMeadows-ik-repairs-003
2015-09-22 09:45:22 -07:00
Thijs Wenker
90b89cbb45
Merge branch 'master' of https://github.com/worklist/hifi into 20655
2015-09-22 18:44:25 +02:00
ericrius1
b9db495ebf
Modified handControllerGrab script to trigger entity touch events for non-physical entities
2015-09-22 09:38:06 -07:00
ericrius1
703545bac3
Modified lightSwitch entity to use new incoming grab API
2015-09-22 09:34:54 -07:00
Brad Hefta-Gaub
0072b6d7d0
Merge pull request #5681 from samcake/orange
...
NetworkGeometry and FBXReader refactoring for splliting Material from Mesh
2015-09-22 09:27:11 -07:00
ericrius1
e984afa1dd
Merge branch 'master' into toybox
2015-09-22 08:56:39 -07:00
ericrius1
68bee8228b
abstracted toggle logic to work with mouse click as well
2015-09-22 08:53:46 -07:00
Ken Cooke
b983ba7056
Fix Mac and Linux builds
2015-09-22 08:46:00 -07:00
Ken Cooke
2d1150115f
New low-latency sample rate conversion library
2015-09-22 08:14:08 -07:00
Thijs Wenker
4d26eb5258
- added some comments
...
- replaced repetitious code with loop
- fixed the audioListenerModeChanged signal (forgot connect call)
2015-09-22 16:20:58 +02:00
Thijs Wenker
dfb9034b4e
- delete new AudioListenerMode menu on script ending
...
- style fix (function naming)
2015-09-22 15:45:57 +02:00
Thijs Wenker
81932fe1d7
- added MyAvatar.audioListenerModeChanged signal , for registering changes.
...
- updated the developerMenuItems.js script to include AudioListenerMode menu options under Developer > Audio
2015-09-22 15:38:53 +02:00
Thijs Wenker
617f048883
Added JS interface to change audio listening position / orientation in Interface
...
- MyAvatar.audioListenerMode change using: MyAvatar.FROM_HEAD , MyAvatar.FROM_CAMERA , MyAvatar.CUSTOM
- MyAvatar.customListenPosition and MyAvatar.customListenOrientation are for manual listening positions
2015-09-22 13:40:33 +02:00
samcake
80e5581639
fixing review comments
2015-09-21 22:51:14 -07:00
samcake
4513b64b00
fixing review comments
2015-09-21 22:42:24 -07:00
David Rowe
30dc07b621
Code tidying
2015-09-21 21:22:36 -07:00
