Stephen Birarda
f20808b47f
remove option to drive from transmitter
2014-02-24 15:11:02 -08:00
Stephen Birarda
050d223b3a
add domain connection reset to NodeList reset
2014-02-24 13:33:52 -08:00
Stephen Birarda
27c779666b
add auth to assignment-client, fix refresh of static assignments
2014-02-24 13:29:32 -08:00
Stephen Birarda
9771e1bb12
resolve conflicts on merge with upstream master
2014-02-24 12:06:10 -08:00
Stephen Birarda
a8493ecaa2
cleanup login/logout in menu, logout only when in
2014-02-24 11:11:36 -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
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
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
Stephen Birarda
6165ca658a
add a logout option to the menu
2014-02-21 17:13:22 -08:00
Stephen Birarda
0686539734
default to quieter HTTP request debugging
2014-02-21 17:07:14 -08:00
Stephen Birarda
52a21d4dfd
hook to request user's location from data-server
2014-02-21 16:55:20 -08:00
Stephen Birarda
6df317e8e6
update user's domain in data-server after connection to new one
2014-02-21 16:22:17 -08:00
Andrzej Kapolka
ac02609bc2
The basic billboard behavior, closes #1864 .
2014-02-21 15:38:49 -08:00
Stephen Birarda
340248ac43
resolve conflicts on merge with upstream master
2014-02-21 15:16:15 -08:00
Stephen Birarda
a49893689e
store username in local settings so it doesn't need to be reloaded
2014-02-21 15:05:57 -08:00
Stephen Birarda
76e6c9342f
parse username returned from data-server
2014-02-21 14:41:43 -08:00
Stephen Birarda
9d2d9c5071
fix cross-thread calls to AccountManager, domain switch flow
2014-02-21 13:45:39 -08:00
Stephen Birarda
d56bafc9a5
default to no auth for domain-server, fix no auth flow
2014-02-21 13:16:24 -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
Stephen Birarda
c728463410
use connection secret to verify domain-server packets
2014-02-20 17:57:58 -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
Stephen Birarda
9cb8cbff2c
fix noAuth flow for domain-server
2014-02-20 16:47:00 -08:00
Stephen Birarda
a6c1e3e87f
tweaks to domain-server authentication flow
2014-02-20 16:31:50 -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
Stephen Birarda
ee90c25a41
add helpers for json responses from AccountManager
2014-02-20 14:22:08 -08:00
Stephen Birarda
2408d909ba
resolve conflicts on merge with upstream master
2014-02-20 12:12:29 -08: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
3bace43aae
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
2014-02-20 12:08:47 -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
