ericrius1
fa42334430
added userData manipulations to grab script
2015-09-03 11:30:44 -07:00
Seth Alves
07b241c778
code review
2015-09-03 11:05:44 -07:00
Andrew Meadows
cd1dac50ad
Merge pull request #5687 from howard-stearns/delete-collision-sounds-after-use
...
Delete collision sounds (and their threads) after use.
2015-09-03 09:59:02 -07:00
Seth Alves
bb96ad1346
Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again
2015-09-03 09:38:58 -07:00
Brad Davis
70ffe10057
Use a constant log file and rollover accumulated logs to a new file based on startup, time or size
2015-09-02 21:56:58 -07:00
Brad Hefta-Gaub
25673831c2
Merge pull request #5689 from jherico/lisa
...
Adding 'web3d' overlay type
2015-09-02 21:31:38 -07:00
Brad Hefta-Gaub
01b6bbe40f
Merge pull request #5697 from jherico/maggie
...
Fix oculus crash on switching display plugin to something else
2015-09-02 21:23:38 -07:00
Anthony J. Thibault
30264e9c3d
Added animation debug draw items to menu.
...
* Debug Draw Bind Pose - used to display the current avatar's bind pose
* Debug Draw Animation - used to display the current avatar's AnimGraph animation.
Currently does not work with old animation so it's only valid when Enable Anim Graph is true.
* Draw Mesh - used to hide or display the avatar mesh.
2015-09-02 21:04:29 -07:00
Anthony J. Thibault
471400e595
Fix for jerky behavior when positionDelta is zero.
...
This can occur with vsync disabled. Possibly due to two avatar updates occurring
within a single physics time-step.
2015-09-02 19:59:05 -07:00
Brad Hefta-Gaub
e6f43d3dd7
Merge pull request #5702 from ericrius1/newGrab
...
update hydra grab to grab near and far objects, and removed grabbing…
2015-09-02 18:43:41 -07:00
Brad Davis
2901155a7b
Fix Oculus mirroring to window
2015-09-02 18:28:44 -07:00
Brad Davis
1f83d04423
Fix oculus crash on switching display plugin to something else
2015-09-02 18:28:43 -07:00
Brad Davis
b6ef2e314f
Adding 'web3d' overlay type
2015-09-02 18:25:49 -07:00
Brad Hefta-Gaub
0b12812ea4
Merge pull request #5705 from jherico/apu
...
OmniTool first pass
2015-09-02 18:16:03 -07:00
Brad Davis
5717b77837
Updating magballs to omnitool
2015-09-02 18:14:21 -07:00
Brad Davis
ea415071b4
OmniTool first pass
2015-09-02 18:14:13 -07:00
Brad Hefta-Gaub
b199e9e593
Merge pull request #5703 from jherico/marge
...
Support HTML colors in overlays
2015-09-02 17:58:44 -07:00
Anthony J. Thibault
de31b92fd5
Merge branch 'master' into ajt/new-anim-system
2015-09-02 17:53:56 -07:00
Anthony J. Thibault
46b3a7fd23
Improved default avatar.json state machine.
...
Now triggers 7 states.
Idle, WalkFwd, WalkBwd, StrafeLeft, StrafeRight, TurnLeft & TurnRight.
As well as variable speed walking to match current velocity.
2015-09-02 17:28:06 -07:00
ericrius1
d303c7e119
only add actions to physical objects
2015-09-02 16:45:50 -07:00
Seth Alves
f20ce12091
Merge branch 'test-5685' of github.com:sethalves/hifi into polyvox-again
2015-09-02 16:30:55 -07:00
Seth Alves
f1bb7fb67f
Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again
2015-09-02 16:30:48 -07:00
Seth Alves
2fe6e9c317
use AABox's ray intersection code rather than the goofed-up version that was here
2015-09-02 16:30:11 -07:00
Eric Levin
d55c92780c
Merge pull request #5704 from AndrewMeadows/erbium
...
fix for Controller.getSpatialControlNormal()
2015-09-02 16:30:01 -07:00
Seth Alves
2e880e9aab
change how pick-ray direction is calculated
2015-09-02 16:29:15 -07:00
Howard Stearns
389e752b6e
Merge pull request #5695 from AndrewMeadows/dysprosium
...
avoid bad joints when computing avatar bounding capsule
2015-09-02 15:58:42 -07:00
Brad Davis
849249d7fe
Fixing colors
...
Conflicts:
examples/toys/magBalls/handController.js
2015-09-02 15:56:38 -07:00
Brad Davis
54b7a063e2
Support HTML colors in overlays
2015-09-02 15:56:37 -07:00
Andrew Meadows
c61bc190de
fix finger and palm-normal directions for JS
2015-09-02 14:16:02 -07:00
Raffi Bedikian
2d95d1c236
Fix various whitespace issues
2015-09-02 13:49:21 -07:00
Anthony J. Thibault
99586f259c
Renamed bindTransformIsValid to bindTransformFoundInCluster
2015-09-02 13:44:34 -07:00
Anthony J. Thibault
91fbbf7d4e
Updated copyright boiler plate.
2015-09-02 13:35:26 -07:00
Anthony J. Thibault
df26f18222
Fix for compilation errors on linux
2015-09-02 13:29:29 -07:00
Andrew Meadows
817c4147d6
Merge pull request #5683 from nivardus/qt5.5-domainserver-qdatastream
...
QT 5.5 - NodeConnectionData QDataStream #include
2015-09-02 13:08:48 -07:00
Brad Davis
ea86c324ff
Merge pull request #5701 from AndrewMeadows/einsteinium
...
fix sixense and vive rotation readings for palms
2015-09-02 12:20:18 -07:00
Anthony J. Thibault
fea030b9a0
Compile and warning fixes for MacOSX.
2015-09-02 12:18:17 -07:00
Andrew Meadows
992bd5c9d2
fix sixense and vive rotation readings for palms
2015-09-02 11:37:36 -07:00
Andrew Meadows
eb78b39bea
fix typo that broke build and remove warning
2015-09-02 11:31:05 -07:00
ericrius1
1e6198cf59
update dhydra grab to grab near and far objects, and removed grabbing logic from toybox.js
2015-09-02 11:29:37 -07:00
Anthony J. Thibault
1ae22268ac
Added comment to AnimStateMachine header.
2015-09-02 11:04:52 -07:00
Seth Alves
3e11852845
Merge pull request #5685 from howard-stearns/standing-hmd-animations
...
Standing hmd animations
2015-09-02 10:57:45 -07:00
Seth Alves
849477ac12
Merge branch 'standing-hmd-animations' of github.com:howard-stearns/hifi into test-5685
2015-09-02 10:52:30 -07:00
Anthony J. Thibault
4a749a0403
Updated MyAvatar to use animGraph from gist instead of local host.
2015-09-02 10:41:04 -07:00
Anthony J. Thibault
d13a188dde
Compile fixes and added test case to verify onDone and onLoop triggers
2015-09-02 10:31:45 -07:00
Anthony J. Thibault
d151474446
Merge branch 'master' into ajt/new-anim-system
2015-09-02 10:00:36 -07:00
Seth Alves
16ee5199e8
change how polyvox neighbors are notified of updates
2015-09-02 09:30:32 -07:00
Seth Alves
f54d924f4a
make sure intersected entity is in the list of possible polyvoxes to adjust
2015-09-02 09:29:51 -07:00
Raffi Bedikian
9318661bc3
Add algorithm comments to FXAA shader
2015-09-01 23:54:48 -07:00
Seth Alves
3963035599
Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again
2015-09-01 21:08:23 -07:00
Andrew Meadows
b7d892cfcd
Merge pull request #5691 from ctrlaltdavid/display-names-in-front
...
Only render display names if in front of camera
2015-09-01 19:59:06 -07:00
