Anthony Thibault
|
6d65f1e3b6
|
Merge pull request #6491 from howard-stearns/fix-missing-own-avatar
Restore rendering of one's own avatar.
|
2015-11-25 15:46:50 -08:00 |
|
Andrew Meadows
|
527408c7c1
|
Merge pull request #6292 from huffman/physics-continuous-collision-detection
Physics continuous collision detection
|
2015-11-25 15:45:18 -08:00 |
|
Howard Stearns
|
6c7099a5f7
|
Coordinate with other uses of setVisibleInScene.
|
2015-11-25 15:18:32 -08:00 |
|
Anthony J. Thibault
|
5072339a22
|
Warning fix
|
2015-11-25 14:04:01 -08:00 |
|
Anthony J. Thibault
|
23def8d173
|
Merge branch 'master' into tony/remove-joint-states
|
2015-11-25 13:55:23 -08:00 |
|
Anthony J. Thibault
|
c0d108e6f6
|
Better avatar bounding shape debug rendering.
|
2015-11-25 13:51:08 -08:00 |
|
howard-stearns
|
546f09c0b1
|
Restore rendering of one's own avatar.
|
2015-11-25 13:30:54 -08:00 |
|
Anthony J. Thibault
|
2a9adafc09
|
Bumped avatar packet version number
|
2015-11-25 12:13:40 -08:00 |
|
Anthony J. Thibault
|
97a2eb62d4
|
Fix for incorrect avatar bounds after changing avatars
|
2015-11-25 12:06:50 -08:00 |
|
Clément Brisset
|
5ff482071e
|
Merge pull request #6465 from ericrius1/polyLineFix
moved logic to build vertex buffer to renderable polyline class, recalculati…
|
2015-11-25 11:02:02 -08:00 |
|
Anthony J. Thibault
|
868cf83b48
|
Fix for attachments and MyAvatar::getDefaultEyePosition()
|
2015-11-25 10:07:29 -08:00 |
|
Andrew Meadows
|
bc20b72645
|
Merge pull request #6453 from howard-stearns/avatar-render-controller2
Survive Flash Mobs Without Making Everyone Sick
|
2015-11-25 09:52:28 -08:00 |
|
Anthony Thibault
|
527199bc69
|
Merge pull request #1 from AndrewMeadows/fix-avatar-capsule
compute bounding capsule of avatars
|
2015-11-25 09:39:18 -08:00 |
|
Andrew Meadows
|
2cc1dfe819
|
getRootAbsoluteBindPoseByChildName() is deprecated
|
2015-11-24 20:39:26 -08:00 |
|
Andrew Meadows
|
3ae082f09c
|
compute bounding capsule of avatars
|
2015-11-24 20:28:39 -08:00 |
|
Brad Hefta-Gaub
|
a647b9ea40
|
Merge pull request #6485 from AlessandroSigna/groupRecording
Group recording - added prompt
|
2015-11-24 20:00:36 -08:00 |
|
Brad Hefta-Gaub
|
e807aaf718
|
Merge pull request #6486 from hyperlogic/tony/hand-ik-fix
Fixes hand IK for some avatars
|
2015-11-24 20:00:12 -08:00 |
|
Anthony J. Thibault
|
386dad7aff
|
Fixes hand IK for some avatars
Specifically:
https://hifi-content.s3.amazonaws.com/ozan/dev/avatars/hifi_team/ryan/_test/ryan.fst
https://hifi-content.s3.amazonaws.com/ozan/dev/avatars/hifi_team/brad/brad.fst
https://s3.amazonaws.com/hifi-public/tony/blackmery/blackmery.fst
These avatars have "Hips" joints that are NOT the root of the skeleton.
This would cause the getRootAbsoluteBindPoseByChildName() to return (0,0,0).
Causing the IK targets to be lower then they should have.
|
2015-11-24 18:57:35 -08:00 |
|
AlessandroSigna
|
cb0b5b5d02
|
added prompt
|
2015-11-24 18:31:41 -08:00 |
|
Zach Pomerantz
|
f4ba2eb4c4
|
Update BUILD_OSX for CMake env vars.
- openssl requires OPENSSL_ROOT_DIR to be set.
- qt5 QT_CMAKE_PREFIX_PATH was outdated.
|
2015-11-24 20:25:17 -06:00 |
|
Brad Hefta-Gaub
|
811fa8da39
|
Merge pull request #6481 from imgntn/controllermethod
Update Some Scripts to Use New Method of Getting Trigger Value
|
2015-11-24 17:45:30 -08:00 |
|
Anthony J. Thibault
|
76034d62d5
|
Eye tracking fixes
|
2015-11-24 16:57:26 -08:00 |
|
ericrius1
|
125c32b8fc
|
tweak
|
2015-11-24 16:18:09 -08:00 |
|
ericrius1
|
c720c97e70
|
tweak
|
2015-11-24 16:14:26 -08:00 |
|
ericrius1
|
3a9dcf56df
|
tweak
|
2015-11-24 16:11:07 -08:00 |
|
ericrius1
|
224dea45e2
|
tweaked gun position in hand
|
2015-11-24 16:06:09 -08:00 |
|
James B. Pollack
|
914805ef41
|
added
|
2015-11-24 15:31:14 -08:00 |
|
James B. Pollack
|
a10d00f34d
|
add bow to master reset
|
2015-11-24 15:25:15 -08:00 |
|
Anthony J. Thibault
|
f120e10ff4
|
Merge branch 'master' into tony/remove-joint-states
|
2015-11-24 15:00:05 -08:00 |
|
Howard Stearns
|
b12bc96fb7
|
Merge pull request #6482 from hyperlogic/tony/avatar-eye-tracking-fix
Fix for avatar eye tracking
|
2015-11-24 14:38:28 -08:00 |
|
Anthony J. Thibault
|
e07e1c5c92
|
Fix for avatar eye tracking
When computing a full eye to world matrix, the translations need to be the geometry coordinate frame, not scaled into meters.
|
2015-11-24 14:01:01 -08:00 |
|
James B. Pollack
|
23f10659b0
|
update to new trigger method
|
2015-11-24 14:00:23 -08:00 |
|
James B. Pollack
|
be7d52a773
|
protect beam disabler from others
|
2015-11-24 13:35:53 -08:00 |
|
James B. Pollack
|
50c1786e9b
|
trigger changes and message debugging
|
2015-11-24 12:46:01 -08:00 |
|
James B. Pollack
|
2add609387
|
use new thingo
|
2015-11-24 12:12:01 -08:00 |
|
Philip Rosedale
|
dde01b2071
|
Merge pull request #6476 from AndrewMeadows/arrow
fix for objects suffering from very small updates to physics properties
|
2015-11-24 11:22:25 -08:00 |
|
Brad Hefta-Gaub
|
fd7a704753
|
Merge pull request #6471 from birarda/url-cmp
fix unnecessary model URL updating thanks to URL encoding
|
2015-11-24 10:56:21 -08:00 |
|
James B. Pollack
|
52edc3b701
|
cleanup beamdisabler
|
2015-11-24 10:43:33 -08:00 |
|
James B. Pollack
|
13e1042bfa
|
use messages instead of hidden entities to disable beams
|
2015-11-24 10:37:08 -08:00 |
|
James B. Pollack
|
fd26427390
|
add pullback / pushfwd
|
2015-11-24 10:23:29 -08:00 |
|
Andrew Meadows
|
e26081e981
|
always update physics properties when they change
and move activation check logic to MotionState
|
2015-11-24 10:20:19 -08:00 |
|
Andrew Meadows
|
5135c9dded
|
whitespace cleanup
|
2015-11-24 10:20:19 -08:00 |
|
Brad Hefta-Gaub
|
d32e500464
|
Merge pull request #6462 from jherico/rec5
Blendshapes and attachments in recordings, plus other minor fixes.
|
2015-11-24 10:01:17 -08:00 |
|
Stephen Birarda
|
5a7b0dd1ad
|
put the parsed model URL in ModelEntityItem
|
2015-11-24 11:46:51 -06:00 |
|
Stephen Birarda
|
0d6b919448
|
cleanup printing of updated model URL
|
2015-11-24 11:22:30 -06:00 |
|
Stephen Birarda
|
0e19e50047
|
cleaner handling for QString/QUrl conversion/comparison
|
2015-11-24 11:17:46 -06:00 |
|
Stephen Birarda
|
7f7d05fc42
|
fix double initialization of AssetClient in Agent
|
2015-11-24 10:46:35 -06:00 |
|
Stephen Birarda
|
ab7cbc0b76
|
Merge branch 'master' of https://github.com/highfidelity/hifi into injector-hybrid
|
2015-11-24 10:45:00 -06:00 |
|
Stephen Birarda
|
762709748d
|
Merge pull request #6473 from ZappoMan/waitForScriptThreads
change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete
|
2015-11-24 10:39:22 -06:00 |
|
Clément Brisset
|
28435b6d43
|
Merge pull request #6478 from samcake/controllers
Let the AssertClient JS interface use global vars
|
2015-11-23 22:43:07 -08:00 |
|