Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 19:38:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
9827 commits 76 branches 59 tags 1.2 GiB
Commit graph

9827 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
6591a4b7fa correctly shutdown slider 2014-02-24 09:36:18 -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
dad97cd52e removed accidental code 2014-02-23 18:54:15 -08:00
ZappoMan
5b8d6ea314 removed unneeded code 2014-02-23 18:52:15 -08:00
ZappoMan
43f63781fc removed files we don't need 2014-02-23 18:35:39 -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
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
Philip Rosedale
1abf0926d3 Merge pull request #2051 from ey6es/bilbo 
Simple avatar billboards distributed through avatar mixer.
 2014-02-23 17:20:00 -08:00
ZappoMan
892cc01dd9 added Voxels.getVoxelAt() to inspect local tree 2014-02-23 13:18:36 -08:00
ZappoMan
a8b34ae756 removed some debug settings 2014-02-23 12:58:20 -08:00
ZappoMan
78de562f41 added clipboard support to editVoxels.js 2014-02-23 12:52:41 -08:00
ZappoMan
f1577d12a0 make changes to local tree in Voxels JS interface 2014-02-23 12:36:38 -08:00
ZappoMan
9831fb5797 fix calculateVoxelFromIntersection() in editVoxels.js to work same as C++ code for voxel sizes larger than intersecting voxel 2014-02-23 12:09:53 -08:00
ZappoMan
03d6173c90 add Voxels.getFaceVector() to JS 2014-02-23 11:38:23 -08:00
Andrzej Kapolka
6cbf0f407a Merge branch 'master' of https://github.com/highfidelity/hifi into bilbo 2014-02-21 18:24:56 -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
ZappoMan
224f42c366 Merge pull request #2052 from Atlante45/clipboard_overlay 
Clipboard overlay
 2014-02-21 16:21:51 -08:00
Atlante45
6fb2d57e40 Add clipboardOverlay example to OverlaysExample 2014-02-21 16:04:15 -08:00
Atlante45
e66ec6b702 Final fix for clipboard preview 2014-02-21 15:47:40 -08:00
Andrzej Kapolka
ac02609bc2 The basic billboard behavior, closes #1864. 2014-02-21 15:38:49 -08:00
Atlante45
e8c9dc50d0 Hack to get preview working 2014-02-21 15:23:28 -08:00
Atlante45
fc7692417f Fix is3D not set to true 2014-02-21 15:15:16 -08:00
Atlante45
8c4022d2f8 Merge branch 'master' of https://github.com/highfidelity/hifi into clipboard_overlay 2014-02-21 12:17:57 -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
4e28a8c312 Merge branch 'master' of https://github.com/worklist/hifi into more_edit_js 2014-02-21 10:48:00 -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
ZappoMan
9ee5621796 Merge pull request #2040 from Atlante45/fix_import 
Fix import
 2014-02-21 10:24:04 -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
ZappoMan
df5c33b31e Merge pull request #1987 from matsukaze/master 
Worklist Job #19486
 2014-02-21 10:03:13 -08:00
Andrzej Kapolka
0d0e9565ff Merge branch 'master' of https://github.com/highfidelity/hifi into bilbo 2014-02-21 09:27:16 -08:00
ZappoMan
8dac269c3c added selectable tools to the tool palette 2014-02-21 00:27:40 -08:00
ZappoMan
fb06512e67 improve z fighting adjust for preview voxels and highlights 2014-02-20 23:47:46 -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
Andrzej Kapolka
6b90a3994d Working on avatar billboards. 2014-02-20 19:22:59 -08:00
Philip Rosedale
df7ffb35e1 Merge pull request #2045 from josecpujol/19489 
19489
 2014-02-20 19:16:50 -08:00
ZappoMan
7026436dee first cut at touch support for orbit and pan, skeleton support for pan 2014-02-20 17:32:59 -08:00
Atlante45
d06f526bf4 Merge branch 'master' of https://github.com/highfidelity/hifi into clipboard_overlay 2014-02-20 16:57:31 -08:00
Atlante45
989a76fe6e Hooked up Clipboard preview 2014-02-20 16:56:40 -08:00
Jose Carlos
10c9b902b9 Removed duplicated calculation of bounding rect for display name 2014-02-21 00:37:29 +01: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
Stephen Birarda
cfec1e583e fix logging target-name extra characters 2014-02-20 12:02:23 -08:00
Philip Rosedale
55a1734a3e Merge pull request #2042 from birarda/metavoxel-fix 
metavoxel interest list and kill/add fixes
 2014-02-20 11:49:30 -08:00
Jose Carlos
fa490acb8d Changed the display name background alpha to 0.2 (was 0.95) 2014-02-20 20:45:32 +01:00
Stephen Birarda
4022d9f4c4 fix metavoxel interest list, keep node alive with ping 2014-02-20 11:36:16 -08:00
Stephen Birarda
2626d7db8c add a bot example script 2014-02-20 11:14:50 -08:00