Seth Alves
af1640ac4e
adjust avatar-energy code to avoid editing local tree and then not telling the entity-server about it
2016-02-17 14:36:18 -08:00
Seth Alves
784dc2b538
Merge pull request #7124 from samcake/red
...
Fixing the disappearing avatars maybe ?
2016-02-17 12:05:04 -08:00
Brad Hefta-Gaub
38430d8d2c
Merge pull request #7112 from howard-stearns/snap-turn-preference
...
Snap turn preference
2016-02-17 09:19:38 -08:00
Brad Hefta-Gaub
d5c349abec
Merge pull request #7114 from samcake/hdr
...
Adding Ambient lighting to transparent surfaces
2016-02-17 09:08:38 -08:00
Andrew Meadows
07df96b6b3
Merge pull request #7125 from hyperlogic/tony/ik-bugfix
...
AnimInverseKinematics: fix for extra twist in lowerSpine joints.
2016-02-17 08:56:16 -08:00
James B. Pollack
f2445e81e0
Merge pull request #7110 from ericrius1/particlesInEdit2
...
Particles in edit
2016-02-16 18:33:01 -08:00
Howard Stearns
6d70584b5a
Change name and use only when in HMD.
2016-02-16 18:09:56 -08:00
Anthony J. Thibault
2d1304e070
AnimInverseKinematics: use glm::clamp for clarity.
2016-02-16 18:00:45 -08:00
ericrius1
ce2d76d3f3
made export settings a text area
2016-02-16 17:57:09 -08:00
Anthony J. Thibault
b5a72225db
AnimInverseKinematics: renamed variable for extra style points
2016-02-16 17:42:51 -08:00
Anthony J. Thibault
df21fffa4a
AnimInverseKinematics: fix for extra twist in lowerSpine joints.
...
* When computing tipPosition, for the next iteration of the CCD,
use the leverArm before it's projected onto the lowerSpine twist axis.
* fix for acos() that was going outside of valid domain. (-1.0, 1.0)
2016-02-16 17:31:39 -08:00
samcake
640bf81339
Forcing an update from teh avatar manager to the avatar renderItems when beeing updated
2016-02-16 17:19:31 -08:00
ericrius1
c43500f38a
added textures field to particle explorer
2016-02-16 15:36:03 -08:00
ericrius1
023fd0607d
added alpha start
2016-02-16 15:29:42 -08:00
ericrius1
d9d0e78dc5
button close
2016-02-16 15:21:18 -08:00
Chris Collins
05b9d88f08
Merge pull request #7108 from imgntn/moreprecision
...
More precision for edit.js
2016-02-16 15:03:10 -08:00
ericrius1
bf21bc2d48
reworked exporting properties
2016-02-16 14:06:02 -08:00
Andrew Meadows
80aee563fc
Merge pull request #7119 from sethalves/fix-linux-local-scriptnames
...
filenames on Linux are case-sensitive
2016-02-16 13:27:14 -08:00
ericrius1
ad43e4ff6d
Fixed multiple particle tabs appearing
2016-02-16 12:56:34 -08:00
samcake
a5b72bcbba
Merge pull request #7121 from AndrewMeadows/drawstatus-false
...
init debug octree rendering to be false
2016-02-16 12:15:29 -08:00
Andrew Meadows
fd8073f6b5
init drawstatus to false
2016-02-16 12:11:19 -08:00
ericrius1
46907f446b
Listening for page loaded event instead of set timeout === less lag
2016-02-16 11:42:01 -08:00
ericrius1
46679b29f7
particle tab deleted when particle system deleted
2016-02-16 11:11:58 -08:00
Andrew Meadows
f932999b2c
Merge pull request #7113 from zzmp/rm/draw-on-hud
...
Remove drawOnHUD property from 3d overlays
2016-02-16 09:44:05 -08:00
Andrew Meadows
7dbb42c339
Merge pull request #7109 from zzmp/fix/edit-image-color
...
Remove image color in edit.js
2016-02-16 09:27:06 -08:00
Andrew Meadows
492c026f78
Merge pull request #7102 from zzmp/fix/model-tex-revert
...
Revert model texs when unset
2016-02-16 09:25:40 -08:00
Chris Collins
ad6b563130
Merge pull request #7116 from samcake/red
...
Fixing the rendering of the avatar skeleton
2016-02-16 09:22:20 -08:00
Andrew Meadows
3160776d65
Merge pull request #7089 from zzmp/fix/overlay-property-scene-updates
...
Update the scene on overlay3d updates
2016-02-16 09:21:57 -08:00
Seth Alves
164d5d9c7e
try, try again
2016-02-16 01:13:37 -08:00
Seth Alves
f2c9bbc32d
filenames on Linux are case-sensitive
2016-02-16 00:39:54 -08:00
samcake
29bacd23df
Fixing the rendering of the avatar skeleton
2016-02-15 18:56:46 -08:00
samcake
4c82e0b2b1
Removing dead comment
2016-02-15 17:44:40 -08:00
samcake
a740f4a6de
Removing unecessary code
2016-02-15 17:41:20 -08:00
samcake
b9d14b74ee
Adding the GLobalKeyLighting to transparents, the ambient lighting
2016-02-15 17:27:28 -08:00
Anthony Thibault
6eda7aac6a
Merge pull request #7106 from AndrewMeadows/tighter-capsule
...
tighter bounding capsule for avatars
2016-02-15 17:16:43 -08:00
Zach Pomerantz
0d29f59e39
Remove drawOnHUD from 3d overlays
2016-02-15 14:04:02 -08:00
Zach Pomerantz
8c01d5f82b
Remove camera tool's 3d hud overlays
2016-02-15 14:03:57 -08:00
Zach Pomerantz
fe6314c388
Merge branch 'fix/overlay-property-scene-updates' of github.com:zzmp/hifi into wip
2016-02-15 14:03:41 -08:00
Chris Collins
bf52d30216
Merge pull request #7107 from ericrius1/spraypaintFix
...
Fix for spraypaint orientation
2016-02-15 13:45:12 -08:00
howard-stearns
4150d318d3
"Leave it on by default" (and change name of route variable to SnapTurn).
2016-02-15 13:39:53 -08:00
samcake
0639b2ace0
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-02-15 13:27:55 -08:00
samcake
e149daa49b
Cleaning the Light.slh
2016-02-15 13:27:28 -08:00
howard-stearns
20406a5a14
Remove comfortMode menu item, but add a Settings for snapTurn within MyAvatar.
2016-02-15 13:26:40 -08:00
Zach Pomerantz
8feace62b7
Conform text3d initializers to coding standard
2016-02-15 13:05:19 -08:00
Zach Pomerantz
5d1aedf707
Update scene items on overlay3d edits
2016-02-15 13:05:19 -08:00
Zach Pomerantz
01309ffd5f
Add resort for scene item keys
2016-02-15 13:02:29 -08:00
Zach Pomerantz
452b6f4e59
Fix opacity check for Overlay ItemKey
2016-02-15 13:02:29 -08:00
Zach Pomerantz
f2b716f90a
Alias text3d's backgroundAlpha to alpha
...
getAlpha(), across 3d overlays, refers to the behavior
of the overlay as a whole. This conforms text3d, and
adds a new property, textAlpha, to replace the old
alpha semantic.
2016-02-15 13:02:29 -08:00
ericrius1
f98941e80f
switching between particle entities
2016-02-15 12:52:05 -08:00
Brad Hefta-Gaub
4faeea7c3f
Merge pull request #7056 from samcake/red
...
Render Scene Octree : A Minute of Arc
2016-02-15 12:49:38 -08:00
