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
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
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
David Rowe
0f85c28098
Fix HMD 3rd person view
2015-09-21 21:08:13 -07:00
Howard Stearns
71b7f9ee38
Apostrophe key resets animation state.
2015-09-21 19:14:24 -07:00
BOB LONG
a23a90bf5f
Code simplification
...
Simplify the code a bit as suggested:
1) Use unsigned int instead of signed int, so we can avoid checking the
negative case
2) Merge two lines into a single line so we can inline the
implementation
Correct the js sample file header.
testing done:
- Build locally
- Pass -1 as index from js and the code still can correctly handle the
input.
2015-09-21 19:11:13 -07:00
samcake
91b9940fe9
Merging and a fix for the diffuse map floating around
2015-09-21 18:09:25 -07:00
Andrew Meadows
3869887610
splitting AnimNode implementation into two files
2015-09-21 17:53:59 -07:00
samcake
910038cf82
Merging
2015-09-21 17:47:23 -07:00
James B. Pollack
bf22d5a942
dont delete wand at cleanup from createWand.js
2015-09-21 17:43:05 -07:00
James B. Pollack
f8d743aff0
Update to use new grab methods, only specifically request properties that we are actually using
2015-09-21 17:38:49 -07:00
James B. Pollack
92152b250a
Merge remote-tracking branch 'highfidelity/master' into bubblewand_hotfix_2
2015-09-21 17:37:23 -07:00
Andrew Meadows
e6776ef5eb
split AnimIK::evaluate() into sub-functions
...
also IK targets now in model-frame instead of root-frame
2015-09-21 17:29:39 -07:00
Brad Davis
7b5cbbf758
Merge pull request #5868 from ctrlaltdavid/20687
...
Fix HMD fullscreen mirror view
2015-09-21 17:07:31 -07:00
James B. Pollack
e6de20b2df
Merge remote-tracking branch 'highfidelity/master'
2015-09-21 17:01:58 -07:00
James B. Pollack
81358b7f14
wand changes
2015-09-21 17:01:31 -07:00
samcake
21f53f1bbd
debugging the lighting issue on the craps table
2015-09-21 16:57:55 -07:00
Brad Hefta-Gaub
ea141aae92
Merge pull request #5865 from jherico/bart
...
Instancing work, second pass
2015-09-21 16:51:08 -07:00
Brad Davis
483884196c
Merge pull request #5866 from ZappoMan/mergeQuadsAndTriangles
...
merge model part quads and triangles together to reduce the number of draw calls
2015-09-21 16:48:29 -07:00
James B. Pollack
2cb875e40d
Merge remote-tracking branch 'highfidelity/master' into bubblewand_hotfix_2
2015-09-21 16:45:37 -07:00
James B. Pollack
cd6ad306ac
start transitioning to new grab methods
2015-09-21 16:45:23 -07:00
Brad Davis
8f3c2af55e
Merge pull request #5863 from ZappoMan/fixParticleEffect
...
fix a couple of properties
2015-09-21 16:43:12 -07:00
Bradley Austin Davis
0401672c82
Fixing lighting again
2015-09-21 16:24:55 -07:00
James B. Pollack
d79c1bec95
remove query string
2015-09-21 16:13:24 -07:00
samcake
dfe17e5708
Fix issues from review
2015-09-21 16:12:17 -07:00
James B. Pollack
fd67a2b86f
Add on/off by pressure; add point bulb to end of flashlight
2015-09-21 16:10:08 -07:00
Bradley Austin Davis
b3aeaba5f4
CR feedback
2015-09-21 15:44:47 -07:00
samcake
a485d3d6de
Fixing the rendering of ProceduralSkybox
2015-09-21 15:21:48 -07:00
Howard Stearns
4dd95be8c4
Forgot to actually persist.
2015-09-21 15:06:11 -07:00
Bradley Austin Davis
84cea1ffd4
More CR comments
2015-09-21 14:33:32 -07:00
Philip Rosedale
26e5f1ca48
Merge pull request #5842 from SeijiEmery/platform-js
...
Platform.js
2015-09-21 14:28:34 -07:00
samcake
fa9b0930d2
Bring back the procedural skybox
2015-09-21 14:25:32 -07:00
David Rowe
46524632fe
Fix eyeball directions in fullscreen HMD view
2015-09-21 14:18:33 -07:00
Bradley Austin Davis
0c0af812c2
CR comments
2015-09-21 14:16:56 -07:00
Philip Rosedale
cd84848fd4
Merge pull request #5867 from sethalves/fix-grab
...
keep object from rotating during local grab
2015-09-21 14:11:59 -07:00
