James Pollack
9736dee2d7
Merge branch 'grabAPI' of https://github.com/ericrius1/hifi into ericrius1-grabAPI
2015-09-23 13:12:45 -07:00
James Pollack
dab520c67b
Merge remote-tracking branch 'upstream/master'
2015-09-23 10:54:03 -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
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
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
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
efda121619
fix a bunch of warnings on windows
2015-09-22 16:40:17 -07:00
David Rowe
eda12fd3af
Don't look straight ahead in fullscreen mirror
2015-09-22 16:15:54 -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
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
Brad Hefta-Gaub
5bb908f081
remove dead code and fix warning
2015-09-22 12:34:47 -07:00
David Rowe
fed5e8e573
Don't run Script Editor scripts from the cache
2015-09-22 11:35:34 -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
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
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
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
samcake
80e5581639
fixing review comments
2015-09-21 22:51:14 -07:00
