Philip Rosedale
fa3b109e1d
Merge branch 'master' of https://github.com/worklist/hifi
2014-02-24 16:43:39 -08:00
Stephen Birarda
9dc460bab4
make multiple instances of scripted assignment use diff UUID
2014-02-24 11:56:14 -08:00
Philip Rosedale
907740eb8e
Merge pull request #2047 from ey6es/metavoxels
...
Another metavoxel checkpoint: more work on streaming, editable attributes, changed to use existing session code, work on "spanners" (objects that span multiple octree nodes).
2014-02-23 21:39:44 -08:00
Philip Rosedale
26541e12b6
Merge branch 'master' of https://github.com/worklist/hifi
2014-02-23 21:08:54 -08:00
Andrzej Kapolka
ba327232d5
Fixed another Window signed/unsigned mismatch.
2014-02-23 21:07:00 -08:00
Andrzej Kapolka
5cf6c43414
Fix for Windows build error.
2014-02-23 20:29:54 -08:00
Andrzej Kapolka
8745ca3139
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-02-23 20:13:23 -08:00
ZappoMan
766a922fb3
add work around for voxel add of larger voxel on top of smaller voxels
2014-02-23 19:02:10 -08:00
ZappoMan
24a5cbfbfd
Merge branch 'master' of https://github.com/worklist/hifi into more_edit_js
...
Conflicts:
examples/editVoxels.js
2014-02-23 18:32:53 -08:00
Philip Rosedale
9b463dd8cf
Merge branch 'master' of https://github.com/worklist/hifi
2014-02-23 17:26:23 -08:00
Philip Rosedale
566670fb78
Adding mouse wheel sizing voxel
2014-02-23 17:26:09 -08:00
Philip Rosedale
b0f3ab3ccd
Merge pull request #2057 from ey6es/master
...
I believe this is what was intended for the voxel edit orbit behavior. Yaw the body, pitch the head.
2014-02-23 17:22:07 -08:00
ZappoMan
892cc01dd9
added Voxels.getVoxelAt() to inspect local tree
2014-02-23 13:18:36 -08:00
ZappoMan
f1577d12a0
make changes to local tree in Voxels JS interface
2014-02-23 12:36:38 -08:00
ZappoMan
03d6173c90
add Voxels.getFaceVector() to JS
2014-02-23 11:38:23 -08:00
Andrzej Kapolka
e470b1c41d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
...
Conflicts:
assignment-client/src/metavoxels/MetavoxelServer.cpp
interface/src/MetavoxelSystem.cpp
2014-02-21 18:26:40 -08:00
Andrzej Kapolka
6f8f15018c
Allow setting the combined head orientation, which changes the body yaw and
...
applies the rest to the head. Closes #2050 .
2014-02-21 17:52:20 -08:00
Andrzej Kapolka
ac02609bc2
The basic billboard behavior, closes #1864 .
2014-02-21 15:38:49 -08:00
Andrzej Kapolka
8d01527d93
Merge branch 'master' of https://github.com/highfidelity/hifi into bilbo
2014-02-21 12:16:33 -08:00
Andrzej Kapolka
10ce2cb3f0
Working on sending the billboards over the network.
2014-02-21 11:49:29 -08:00
ZappoMan
a12e1ef18f
Merge pull request #2043 from birarda/metavoxel-fix
...
fixes for extra characters in logging target names
2014-02-21 10:24:29 -08:00
Andrzej Kapolka
495447fc0d
Merge branch 'master' of https://github.com/highfidelity/hifi into bilbo
2014-02-21 10:19:52 -08:00
Andrzej Kapolka
18ea1d6a85
More work on billboards.
2014-02-21 10:16:06 -08:00
Andrzej Kapolka
d8321bd419
Merge pull request #2034 from birarda/master
...
fixes for scripted avatars
2014-02-21 10:14:41 -08:00
matsukaze
e800c80d61
Merge remote-tracking branch 'upstream/master'
2014-02-20 23:32:06 -05:00
matsukaze
943b0b1b15
Removed primitiveIndex
2014-02-20 23:30:29 -05:00
Philip Rosedale
df7ffb35e1
Merge pull request #2045 from josecpujol/19489
...
19489
2014-02-20 19:16:50 -08:00
Andrzej Kapolka
09ad4046f8
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-02-20 17:20:07 -08:00
Andrzej Kapolka
b408e31d91
More work on spanners.
2014-02-20 17:18:15 -08:00
Jose Carlos
354c9bff09
Correct text position for default and non default meshes
...
Bounding box for text background is now text dependent, much nicer now
2014-02-21 00:29:52 +01:00
Philip Rosedale
7010c45b16
Merge pull request #2036 from ZappoMan/js_clipboard
...
Clipboard support in JS and lots of improvements to editVoxels.js
2014-02-20 12:08:56 -08:00
Andrzej Kapolka
09677b06f2
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
...
Conflicts:
assignment-client/src/metavoxels/MetavoxelServer.cpp
2014-02-20 12:05:15 -08:00
Stephen Birarda
cfec1e583e
fix logging target-name extra characters
2014-02-20 12:02:23 -08:00
Stephen Birarda
4022d9f4c4
fix metavoxel interest list, keep node alive with ping
2014-02-20 11:36:16 -08:00
Stephen Birarda
4fbe8acd1e
fix face and skeleton model URL Q_PROPERTY macros
2014-02-20 11:12:53 -08:00
Andrzej Kapolka
4dab2eb694
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-02-20 10:45:19 -08:00
matsukaze
b813438307
Consolidate primitive index with buffer index.
...
Removed the extra space associated with primitive index and use buffer
index for both the VBO and primitive renderers since they are exclusive.
2014-02-20 08:48:40 -05:00
Andrzej Kapolka
f017d0472f
More work on spanners.
2014-02-19 18:17:26 -08:00
Stephen Birarda
ee9f8937e3
fix a silly typo
2014-02-19 18:03:34 -08:00
ZappoMan
91d79f65f2
fix crash on import from JS
2014-02-19 17:57:28 -08:00
ZappoMan
3a8a880a8b
Merge branch 'master' of https://github.com/worklist/hifi into js_clipboard
2014-02-19 17:49:22 -08:00
ZappoMan
f6fba54dda
improved text mapping in keyboard events
2014-02-19 17:49:00 -08:00
Stephen Birarda
4ee416ba96
fixes for scripted avatars, closes #2033
2014-02-19 16:55:24 -08:00
Andrzej Kapolka
25ae81e2de
More work on spanners.
2014-02-19 15:25:21 -08:00
Andrzej Kapolka
a8d0aa6d17
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-02-19 14:57:18 -08:00
Jose Carlos
828508bbf1
merged from master
2014-02-19 23:01:13 +01:00
Andrzej Kapolka
4e7a7892ec
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-02-19 12:06:55 -08:00
ZappoMan
3bec67ecfd
fix right mouse click
2014-02-19 11:42:41 -08:00
Andrzej Kapolka
0138ecb3b2
Layout tweaks.
2014-02-19 11:35:45 -08:00
ZappoMan
ad8a526502
fix right mouse click
2014-02-19 11:33:43 -08:00
