Philip Rosedale
6b128466a9
Merge pull request #2094 from birarda/authentication
...
reset nodelist if domain-server stops talking to you, closes #2092
2014-02-25 14:10:24 -08:00
Philip Rosedale
dd93eff26e
Merge pull request #2096 from birarda/scripted-billboard
...
add option for fake bot billboard from URL
2014-02-25 14:07:39 -08:00
Stephen Birarda
ee70c93a3e
have scripted avatars send billboard, if they have one
2014-02-25 13:42:07 -08:00
Stephen Birarda
f2a70bf275
add support for billboard setting from URL
2014-02-25 13:38:20 -08:00
Philip Rosedale
70c1f8290e
assume RAW audio if not processed as WAV
2014-02-25 13:21:02 -08:00
Stephen Birarda
ce3d6d2fca
reset nodelist if domain-server stops talking to you, closes #2092
2014-02-25 13:07:39 -08:00
Stephen Birarda
1163cfd07e
if the domain-server provides no auth, assume default
2014-02-25 10:58:32 -08:00
Stephen Birarda
b09ed1dff1
present a login window on app start
2014-02-25 10:53:13 -08:00
Philip Rosedale
e637e48598
Merge pull request #2076 from birarda/authentication
...
groundwork for secure node communication via data-server
2014-02-25 10:07:55 -08:00
Stephen Birarda
45429fa1e1
fix default node auth URL
2014-02-25 09:38:22 -08:00
ZappoMan
09fc58763f
Merge pull request #2054 from gaitat/19499
...
Worklist Job #19499
2014-02-24 19:10:31 -08:00
Philip Rosedale
fa3b109e1d
Merge branch 'master' of https://github.com/worklist/hifi
2014-02-24 16:43:39 -08:00
Stephen Birarda
6d56ab3a30
use toDouble instead of toInt for Qt 5.1 compatibility
2014-02-24 15:27:12 -08:00
Stephen Birarda
672c6a9ed1
fix complaint for incomplete type QStringList
2014-02-24 15:23:47 -08:00
Stephen Birarda
c1b45d7eaa
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
2014-02-24 15:18:21 -08:00
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
9dc460bab4
make multiple instances of scripted assignment use diff UUID
2014-02-24 11:56:14 -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
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
gaitat
a1e773eb2d
Worklist Job #19499
...
Kick of the build
2014-02-23 11:24:45 -05:00
gaitat
edd99f93de
Worklist Job #19499 Mac compile fix
...
third time's the charm
2014-02-21 21:48:44 -05: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
gaitat
e2b20d2475
Worklist Job #19499 Mac compile fix
2014-02-21 21:13:31 -05: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
gaitat
e331dc529d
Worklist Job #19499
...
Add WAV file support to Javascript
2014-02-21 19:26:19 -05: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
