Stephen Birarda
|
9771e1bb12
|
resolve conflicts on merge with upstream master
|
2014-02-24 12:06:10 -08:00 |
|
Andrzej Kapolka
|
e40fe85c36
|
Updating the camera mode every frame screws with the scripts, so revert to
updating it when the menu changes.
|
2014-02-24 11:42:47 -08:00 |
|
Andrzej Kapolka
|
8efc4d52ba
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-02-24 11:34:12 -08:00 |
|
Andrzej Kapolka
|
d80b52dc9f
|
Fixes for camera mode transitions, seeing inside head.
|
2014-02-24 11:33:52 -08:00 |
|
Stephen Birarda
|
a8493ecaa2
|
cleanup login/logout in menu, logout only when in
|
2014-02-24 11:11:36 -08:00 |
|
ZappoMan
|
6ea2c81e68
|
fix reload of scripts
|
2014-02-24 10:10:00 -08:00 |
|
Andrzej Kapolka
|
8745ca3139
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-02-23 20:13:23 -08:00 |
|
Andrzej Kapolka
|
f5fece5eb5
|
Fix for Xcode warnings.
|
2014-02-23 20:11:46 -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 |
|
Andrzej Kapolka
|
7bb3ea66ac
|
And another one.
|
2014-02-21 18:32:29 -08:00 |
|
Andrzej Kapolka
|
68fea8de1e
|
More merge fixes.
|
2014-02-21 18:32:05 -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
|
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 |
|
Stephen Birarda
|
6165ca658a
|
add a logout option to the menu
|
2014-02-21 17:13:22 -08:00 |
|
Stephen Birarda
|
37ba6219e6
|
hook up go to for HTTP data-server
|
2014-02-21 17:04:03 -08:00 |
|
Stephen Birarda
|
52a21d4dfd
|
hook to request user's location from data-server
|
2014-02-21 16:55:20 -08:00 |
|
Stephen Birarda
|
625299e6e6
|
update location information in data-server from MyAvatar
|
2014-02-21 16:36:07 -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 |
|
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 |
|
Stephen Birarda
|
340248ac43
|
resolve conflicts on merge with upstream master
|
2014-02-21 15:16:15 -08:00 |
|
Atlante45
|
fc7692417f
|
Fix is3D not set to true
|
2014-02-21 15:15:16 -08:00 |
|
Stephen Birarda
|
14e128bca0
|
remove the Profile file that isn't being used
|
2014-02-21 15:11:16 -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 |
|
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
|
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 |
|
Andrzej Kapolka
|
0d0e9565ff
|
Merge branch 'master' of https://github.com/highfidelity/hifi into bilbo
|
2014-02-21 09:27:16 -08:00 |
|
matsukaze
|
e800c80d61
|
Merge remote-tracking branch 'upstream/master'
|
2014-02-20 23:32:06 -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 |
|
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 |
|
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 |
|
Stephen Birarda
|
2408d909ba
|
resolve conflicts on merge with upstream master
|
2014-02-20 12:12:29 -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 |
|
Jose Carlos
|
fa490acb8d
|
Changed the display name background alpha to 0.2 (was 0.95)
|
2014-02-20 20:45:32 +01:00 |
|
Andrzej Kapolka
|
4dab2eb694
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-02-20 10:45:19 -08:00 |
|
Atlante45
|
904ce7bf1c
|
Repositionned nivigation buttons in ImportDialog
|
2014-02-20 10:38:08 -08:00 |
|
Atlante45
|
9238ef13e6
|
Changed Import button size
|
2014-02-20 10:37:31 -08:00 |
|