Seth Alves
|
be1332532f
|
disable debugging prints
|
2016-08-29 03:39:52 -07:00 |
|
Seth Alves
|
5daf334a0e
|
avoid extra grab-point spheres when resetting scripts
|
2016-08-27 20:42:03 -07:00 |
|
Seth Alves
|
d69e712bef
|
keep near-grab radius small but still allow large equip hotspots
|
2016-08-27 20:23:19 -07:00 |
|
Seth Alves
|
2a5d686a76
|
don't show grab-point sphere when near grabbing or equipping
|
2016-08-27 20:11:16 -07:00 |
|
Seth Alves
|
3355097bd0
|
handle another type of abandoned grab
|
2016-08-27 19:46:15 -07:00 |
|
Seth Alves
|
7dad303ce7
|
don't leave stray blue search sphere when near-grabbing
|
2016-08-27 19:25:05 -07:00 |
|
Seth Alves
|
765cd72e0e
|
fix code that prints relative offsets of an equipped entity after it's been adjusted by the other hand
|
2016-08-27 19:13:32 -07:00 |
|
Seth Alves
|
cfca32e0b4
|
fix code that notices and fixes an abandoned grab
|
2016-08-27 16:00:27 -07:00 |
|
Seth Alves
|
e4b2b7158f
|
hotspots with large radius work correctly, again
|
2016-08-27 09:30:26 -07:00 |
|
Seth Alves
|
76b72e32f0
|
Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers
|
2016-08-27 09:06:45 -07:00 |
|
James B. Pollack
|
44d102d723
|
Merge pull request #8529 from imgntn/edit_fix
Fix some edit.js bugs
|
2016-08-26 15:43:14 -07:00 |
|
Brad Hefta-Gaub
|
3d6691f3d1
|
Merge pull request #8527 from zzmp/fix/skybox-default-color
fix skybox default
|
2016-08-26 15:14:44 -07:00 |
|
Seth Alves
|
9394a25a1c
|
remove some anti-jitter code that was doing more harm than good
|
2016-08-26 12:47:19 -07:00 |
|
Brad Hefta-Gaub
|
ecb43a9589
|
Merge pull request #8523 from ZappoMan/fixAgentAvatarAudio
include the codec name in the agent avatar audio stream
|
2016-08-26 12:42:20 -07:00 |
|
James B. Pollack
|
53a2281918
|
better
|
2016-08-26 11:57:15 -07:00 |
|
James B. Pollack
|
f6bd04780d
|
add a print to catch errors
|
2016-08-26 11:56:40 -07:00 |
|
Brad Hefta-Gaub
|
6e26916b65
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fixAgentAvatarAudio
|
2016-08-26 10:57:27 -07:00 |
|
James B. Pollack
|
4c63ad1ac8
|
code cleanup
|
2016-08-26 10:19:31 -07:00 |
|
Seth Alves
|
9884426ad8
|
replace debugging aborts with asserts
|
2016-08-26 06:13:33 -07:00 |
|
Seth Alves
|
acb04a0bc9
|
don't add children of controller joints until we know our avatar ID
|
2016-08-25 19:09:10 -07:00 |
|
Seth Alves
|
174a95a005
|
do some hokey pokey to avoid jitter of held entities while walking
|
2016-08-25 18:49:47 -07:00 |
|
Zach Pomerantz
|
996346980d
|
clear the skybox between scenes
|
2016-08-25 18:08:22 -07:00 |
|
Zach Pomerantz
|
5e82093e69
|
set skybox clear color to empty color
|
2016-08-25 18:08:03 -07:00 |
|
Seth Alves
|
3b278adba3
|
Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers
|
2016-08-25 17:28:18 -07:00 |
|
Brad Hefta-Gaub
|
9801ff075a
|
Merge pull request #8433 from samcake/hdr
Fix Screen Space ambient occlusion which was broken since a while
|
2016-08-25 16:57:24 -07:00 |
|
Brad Hefta-Gaub
|
10c465f591
|
Merge pull request #8525 from hyperlogic/bug-fix/web-entity-rendering
Improved web entity rendering
|
2016-08-25 16:49:00 -07:00 |
|
Seth Alves
|
dfae5b64bd
|
attempt to avoid jitter of held entity while walking
|
2016-08-25 16:42:40 -07:00 |
|
samcake
|
8cc65ea965
|
Adrressing review issues
|
2016-08-25 16:31:42 -07:00 |
|
James B. Pollack
|
ee190db5eb
|
some comments
|
2016-08-25 16:27:58 -07:00 |
|
James B. Pollack
|
9be073cc12
|
handle some more cases
|
2016-08-25 16:03:12 -07:00 |
|
Seth Alves
|
232917fcf8
|
when processing AvatarActionHold for another's avatar, use their hand-controller joint information
|
2016-08-25 16:02:58 -07:00 |
|
samcake
|
09a70740a8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-08-25 15:21:41 -07:00 |
|
Seth Alves
|
7c5b8cb75d
|
send faux joints to the avatar-mixer
|
2016-08-25 15:21:29 -07:00 |
|
Brad Hefta-Gaub
|
ac291a398d
|
Merge pull request #8329 from AndrewMeadows/render-collision-geometry
Render collision geometry
|
2016-08-25 15:15:28 -07:00 |
|
Andrew Meadows
|
2c8ab9b2b8
|
Merge pull request #8497 from hyperlogic/feature/improve-ik-quality
Raised max iterations for IK to 16 from 4
|
2016-08-25 15:06:11 -07:00 |
|
Seth Alves
|
948b4b7a15
|
in search, consider distance from grab-point rather than from avatar-hand when selecting the closest entity
|
2016-08-25 13:46:52 -07:00 |
|
Seth Alves
|
0783629cde
|
grab-point sphere is a child of controller joint, so it doesn't jitter
|
2016-08-25 13:31:07 -07:00 |
|
Zach Pomerantz
|
24162f0f3d
|
set skybox default color to empty color
|
2016-08-25 12:37:23 -07:00 |
|
samcake
|
9669234f9c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-08-25 12:36:01 -07:00 |
|
Anthony J. Thibault
|
e82f6a90af
|
Improved web entity rendering
* fading now works properly
* web browsers are now fully opaque.
|
2016-08-25 11:04:23 -07:00 |
|
Seth Alves
|
39f52b3682
|
start on faux avatar joint that represent hand controllers
|
2016-08-25 10:58:23 -07:00 |
|
Seth Alves
|
7b1db2c8a9
|
Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers
|
2016-08-25 10:41:53 -07:00 |
|
Seth Alves
|
3750488b8d
|
Merge branch 'grab-point-sphere' of github.com:sethalves/hifi into joints-for-controllers
|
2016-08-25 10:41:41 -07:00 |
|
Anthony Thibault
|
8d5a896ccf
|
Merge pull request #8524 from AndrewMeadows/fix-default-scripts
fix typo
|
2016-08-25 10:28:27 -07:00 |
|
Andrew Meadows
|
da387a958a
|
fix typo
|
2016-08-25 10:26:05 -07:00 |
|
Brad Hefta-Gaub
|
376756d413
|
include the codec name in the agent avatar audio stream
|
2016-08-25 09:58:36 -07:00 |
|
Seth Alves
|
cab30651d0
|
cleanups
|
2016-08-25 09:47:14 -07:00 |
|
Brad Hefta-Gaub
|
b5adf1cf4c
|
Merge pull request #8515 from AndrewMeadows/include-default-scripts
include default scripts instead of loading them
|
2016-08-25 09:41:32 -07:00 |
|
Andrew Meadows
|
a0911d2b9d
|
add local scope wrappers to new default scripts
|
2016-08-25 09:04:06 -07:00 |
|
Andrew Meadows
|
fefe5e30ec
|
don't use globals and remove double definitions
|
2016-08-25 08:57:06 -07:00 |
|