Seth Alves
fe0a656d54
Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints
2015-12-30 12:45:32 -08:00
Seth Alves
4e312dd8f8
undo temporary hack
2015-12-30 12:45:19 -08:00
Eric Levin
9276c78368
Merge pull request #6741 from PhilipRosedale/master
...
Improved hand controller grab and mouse movement
2015-12-30 11:10:37 -08:00
Andrew Meadows
a5c19c04e5
Merge pull request #6672 from ctrlaltdavid/fix-nodelist-shutdown
...
Don't send a domain-server check in when shutting down
2015-12-30 08:43:19 -08:00
Andrew Meadows
b83987331b
Merge pull request #6725 from huffman/fix-avatar-get-myavatar
...
Fix crash when getting MyAvatar.sessionUUID from AvatarManager
2015-12-30 08:41:52 -08:00
Brad Davis
76eba89f7d
Merge pull request #6745 from hyperlogic/tony/neuron-plugin
...
Support for Perception Neuron
2015-12-30 11:39:32 -05:00
Andrew Meadows
ec27c75332
Merge pull request #6660 from hyperlogic/tony/anim-expressions
...
AnimExpression: boolean expression parser and evaluator
2015-12-30 08:36:44 -08:00
Brad Davis
65862bfd02
Merge pull request #6747 from hyperlogic/tony/glmhelpers-tests
...
Added tests for GLMHelpers::safeEulerAngles.
2015-12-30 11:35:17 -05:00
Philip Rosedale
118f919c8b
fix merge conflicts
2015-12-30 00:42:14 -08:00
Philip Rosedale
e995b29712
can target without grabbing
2015-12-30 00:36:11 -08:00
Philip Rosedale
6d857296f9
show search sphere instead of beams, start at center of view
2015-12-29 23:37:10 -08:00
Philip Rosedale
54edd94dd2
Merge pull request #6743 from zzmp/fix/skymap-tex-load
...
Guard against unloaded skymap tex
2015-12-29 21:34:48 -08:00
Philip Rosedale
a44a64d9c0
Merge pull request #6748 from ericrius1/gunFix
...
Fixing issue with muzzle flash and hit sparks being out of sync for pi…
2015-12-29 21:31:40 -08:00
James B. Pollack
5caa6cbdbf
Update pistol.js
...
leading zeroes
2015-12-29 18:38:57 -08:00
ericrius1
4cc94b44ba
muzzle is in sync
2015-12-29 18:30:07 -08:00
ericrius1
1a84b5c0f0
Fixing issue with muzzle flash and hit point being out of sync for pistol
2015-12-29 18:13:34 -08:00
Eric Levin
f71a4807f7
Merge pull request #6667 from imgntn/light_mod
...
Entity Sliders for Changing Spotlight Properties
2015-12-29 10:58:47 -08:00
Zach Pomerantz
12fa223004
Render SKY_DOME when SKY_MAP tex is loading
2015-12-29 10:58:23 -08:00
Anthony J. Thibault
5d596bcbc4
Added tests for GLMHelpers::safeEulerAngles.
...
To verify that converting to and from quats and eulers will use the same angle order.
Also I fixed some naming inconsistencies in GeometryUtilTests.
2015-12-29 10:07:38 -08:00
Anthony J. Thibault
e10cecd310
Build fix for linux #2 ?
2015-12-29 09:23:03 -08:00
Anthony J. Thibault
c35995b8e3
Build fix for linux?
2015-12-29 08:51:44 -08:00
Anthony J. Thibault
7e514d2f4d
Mac build fix
2015-12-28 18:42:03 -08:00
Anthony J. Thibault
4661152aa7
NeuronAvatar.js: Now aligns the head with the HMD if active
2015-12-28 17:57:24 -08:00
Eric Levin
034b28e1b3
Merge pull request #6742 from zzmp/fix/empty-poly-line
...
Guard against empty polyline index out of range
2015-12-28 17:30:27 -08:00
James B. Pollack
2ec712a5db
disable near grabbing on sliders
2015-12-28 15:27:17 -08:00
James B. Pollack
c266a093e0
clear sliders at cleanup
2015-12-28 15:17:00 -08:00
James B. Pollack
9f342ba8ce
readme
2015-12-28 15:14:59 -08:00
James B. Pollack
5786789a66
cleanup cleanup
2015-12-28 15:12:29 -08:00
Zach Pomerantz
bea18e91aa
Guard against empty polyline index out of range
2015-12-28 15:09:49 -08:00
Philip Rosedale
36beea17fa
Improved hand controller reticle movement
2015-12-28 14:59:43 -08:00
James B. Pollack
f0a12e0251
switch
2015-12-28 14:50:35 -08:00
James B. Pollack
d4fd59edc0
send blacklist messages
2015-12-28 13:49:00 -08:00
Eric Levin
890b39f04b
Merge pull request #6740 from imgntn/blacklist_grab
...
Add Raypick Blacklisting to handControllerGrab.js
2015-12-28 13:39:23 -08:00
James B. Pollack
7d7d0d4c07
mege
2015-12-28 13:21:00 -08:00
James B. Pollack
8eeae5ddf0
Merge pull request #6736 from ericrius1/handGrabCalcs
...
Hand grab calcs
2015-12-28 10:49:55 -08:00
James B. Pollack
e237f957a6
Merge branch 'master' into blacklist_grab
2015-12-28 10:24:27 -08:00
James B. Pollack
4b50a030e0
Update masterReset.js
2015-12-28 10:23:08 -08:00
James B. Pollack
4f80753d7b
Update masterReset.js
2015-12-28 10:22:34 -08:00
James B. Pollack
679070ff6e
Update hiddenEntityReset.js
2015-12-28 10:22:02 -08:00
James B. Pollack
c4d7b7b9bb
Update utils.js
2015-12-28 10:21:23 -08:00
James B. Pollack
a133dfa8dd
Merge pull request #6738 from ericrius1/rayBlacklist
...
Ray-pick blacklisting
2015-12-28 10:19:52 -08:00
Anthony Thibault
1f834a9c01
neruonAvatar.js: attempt to adjust hips for HMD mode.
...
It attempts to adjust the hips so that the avatar's head is at the same location & orientation as the HMD
in world space, however it's fighting with the internal c++ code that also attempts to adjust the hips as well.
2015-12-27 16:29:30 -08:00
James B. Pollack
0e30393c81
make sure theres something on the blacklist
2015-12-27 12:47:56 -08:00
James B. Pollack
546e908633
protect blacklisting to my id
2015-12-27 12:46:40 -08:00
James B. Pollack
28c53822b1
add raypick blacklisting to hand grab script
2015-12-27 12:37:33 -08:00
Brad Davis
8e2a79ba4c
Merge pull request #6735 from ZappoMan/headPoseReticle
...
add a test script for HMD.getHUDLookAtPositionXX()
2015-12-27 13:19:18 -05:00
Anthony Thibault
27e80913d6
NeuronPlugin: register for combination mode
...
This will tell us, if user is using arms, upper-body or full body configurations.
2015-12-26 12:13:29 -08:00
Anthony Thibault
fd3eed3d41
NeruonPlugin: translation support
...
Warn if translations are not present.
2015-12-26 11:50:54 -08:00
Anthony Thibault
878fe80040
Merge branch 'master' into tony/neuron-plugin
2015-12-25 10:24:55 -08:00
Anthony Thibault
84260192fb
Set up controller poses to match hifi standard skeleton
...
Neuron plugin in fills in the gap (thumb1) with identity.
Updated neuronAvatar script to work with new controller pose names.
2015-12-25 09:57:50 -08:00
