Andrzej Kapolka
78d9b79805
Another fix for Blender exports. Closes #1762 .
2014-01-30 13:24:30 -08:00
Andrzej Kapolka
181670f5d7
Fixes for parsing FBX text encoding.
2014-01-30 12:53:02 -08:00
Stephen Birarda
84ef757af4
fix avatar count, HandData crash ( closes #1754 )
2014-01-30 09:45:09 -08:00
ZappoMan
c58f44f54a
Merge pull request #1735 from AndrewMeadows/fix-particle-avatar-collisions
...
Fix crash on shutdown caused by duplicate delete on a QObject
2014-01-29 17:54:23 -08:00
Andrzej Kapolka
e99b7ea92c
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
...
Conflicts:
assignment-client/src/metavoxels/MetavoxelServer.cpp
interface/src/MetavoxelSystem.cpp
2014-01-29 13:34:19 -08:00
Andrzej Kapolka
4c70af51e8
Expand data automatically to encompass edits.
2014-01-29 13:30:54 -08:00
Andrew Meadows
82a4b7a4d1
Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions
...
Conflicts:
interface/src/Application.cpp
2014-01-29 13:20:42 -08:00
Stephen Birarda
33edcea5fb
resolve conflicts on merge with upstream master
2014-01-29 12:23:06 -08:00
Andrew Meadows
d757f20d22
Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions
...
Conflicts:
interface/src/Application.cpp
2014-01-29 11:41:39 -08:00
ZappoMan
616cfac293
fix init bug
2014-01-29 11:21:45 -08:00
Andrzej Kapolka
69a727c3e1
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-29 11:14:48 -08:00
Andrew Meadows
43f965c90a
Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions
2014-01-29 09:25:00 -08:00
ZappoMan
b36cc0bcf9
removed old cruft around mousePitch in Head and unified pitch
2014-01-29 02:09:49 -08:00
ZappoMan
98cdc656c4
more scripting support, including adding a Quat helper class that makes JS quat math easier
2014-01-29 00:56:08 -08:00
ZappoMan
434756a40f
removed some dead comments
2014-01-28 20:40:00 -08:00
ZappoMan
bcc7cfb15e
removed some debug
2014-01-28 20:38:47 -08:00
ZappoMan
9d87d58723
Merge branch 'master' of https://github.com/worklist/hifi into more_scripting
...
Conflicts:
libraries/particles/src/ParticlesScriptingInterface.cpp
2014-01-28 20:36:35 -08:00
ZappoMan
305e69def6
really get controller key, mouse, etc scripting working
2014-01-28 19:47:45 -08:00
Andrew Meadows
677341d207
fix for crash bug #1728 .
...
Moving _myAvatr to live in AvatarManager. Application still has a
pointer to it. Unfortunately the order of Application initialization
and destruction matters very much.
2014-01-28 18:04:42 -08:00
Andrzej Kapolka
674bc70223
Offset adjustment.
2014-01-28 15:50:13 -08:00
Andrzej Kapolka
f435f61467
Start the grid position off roughly at our feet.
2014-01-28 15:46:02 -08:00
Andrzej Kapolka
b6a15ea6c5
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-01-28 15:12:32 -08:00
Andrzej Kapolka
e10ab8d546
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-28 15:10:34 -08:00
ZappoMan
5addc35cd8
hacking on controller events
2014-01-28 14:58:08 -08:00
Andrew Meadows
714dbf8493
Moving MY_AVATAR_KEY back into AvatarManager.cpp
2014-01-28 14:37:32 -08:00
Andrew Meadows
f972bfd024
Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions
...
Conflicts:
interface/src/avatar/AvatarManager.cpp
2014-01-28 14:30:59 -08:00
Andrew Meadows
1cc992a7f8
import --> include
2014-01-28 14:18:21 -08:00
Andrew Meadows
167acb8873
Adding avatars back into ParticleCollisionSystem.
...
Had to add Application::_myAvatar to the AvatarManager list so that
particles would properly collide.
2014-01-28 14:16:34 -08:00
Stephen Birarda
423e1598f0
use NodeSet in place of QSet<NodeType_t> where possible
2014-01-28 13:41:39 -08:00
Stephen Birarda
4de270b832
cleanup Node types, closes #1726
2014-01-28 13:38:33 -08:00
Stephen Birarda
cda06d1cb3
replace uint64_t with quint64 for Qt friendlyness
2014-01-28 12:35:42 -08:00
Stephen Birarda
3a706a2759
repair the count of avatars and servers
2014-01-28 12:31:25 -08:00
Stephen Birarda
2aaa9ce3f6
resolve conflicts on merge with upstream master
2014-01-28 12:30:43 -08:00
Stephen Birarda
b009cd8e67
repair more node communication problems after refactor
2014-01-28 12:25:44 -08:00
Andrzej Kapolka
cf05cf6178
Didn't need to disable depth writes after all (for now).
2014-01-28 12:03:41 -08:00
Andrzej Kapolka
3edb81baf4
Check for texture translucency, render translucent mesh parts after opaque
...
ones, without alpha testing, and with back face culling enabled.
2014-01-28 12:01:32 -08:00
ZappoMan
64afd17d14
include particle radius in model scaling
2014-01-28 11:49:11 -08:00
ZappoMan
dc25868403
cleanup
2014-01-28 11:26:55 -08:00
Andrzej Kapolka
30fdb595dd
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-01-28 11:14:21 -08:00
Andrzej Kapolka
d3dc43e853
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-28 11:12:30 -08:00
Stephen Birarda
4103cc1cde
packet header changes and beginning of conversion to QByteArray
2014-01-28 10:36:08 -08:00
Andrew Meadows
ade02c0259
Bug fix: update ALL avatars in the AvatarManager (rather than just one).
...
Reviewed with Birarda and pushed directly to upstream.
2014-01-28 09:32:58 -08:00
ZappoMan
1681dbb57b
Merge branch 'master' of https://github.com/worklist/hifi into particle_meshes
2014-01-28 09:26:54 -08:00
ZappoMan
568d5bc05d
first cut at particle meshes
2014-01-28 09:26:47 -08:00
Andrew Meadows
c4f429dcd0
Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions
2014-01-27 18:05:39 -08:00
Andrew Meadows
2b5675b077
Fix issue #1684 : particles collide against avatars again.
...
This a quick and dirty fix to resurrect particle-avatar collisions.
We rebuild and pass a list of AvatarData* to the
ParticleCollisionManager every call to update().
2014-01-27 18:01:53 -08:00
Andrzej Kapolka
4deb9936ba
Don't add the specular alpha in the model fragment shaders.
2014-01-27 17:44:13 -08:00
Andrzej Kapolka
9a892ea51a
Let's actually close our sessios on exit.
2014-01-27 17:03:35 -08:00
Andrzej Kapolka
1e4bfffdd8
Retain a shared node pointer, use the active socket. Fixed a compile warning.
2014-01-27 16:41:25 -08:00
Andrzej Kapolka
fbcd4cf363
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-27 15:50:45 -08:00
