Stephen Birarda
|
d66137e314
|
add a Go To User option to the menu
|
2013-10-09 15:36:33 -07:00 |
|
Stephen Birarda
|
f7a0dd514e
|
load NodeList and Profile settings with menu settings load
|
2013-10-09 15:23:07 -07:00 |
|
Stephen Birarda
|
d3b95d19a1
|
send the user's last domain and position to data-server
|
2013-10-09 15:09:57 -07:00 |
|
Stephen Birarda
|
9112efaa36
|
move username change to Login, add lastPosition and lastDomain
|
2013-10-09 13:00:05 -07:00 |
|
Stephen Birarda
|
233c1599bd
|
leverage existing URL update rate for interim face model update solution
|
2013-10-08 14:25:53 -07:00 |
|
Stephen Birarda
|
b17e12460c
|
shift get/set of face model URL to Profile class
|
2013-10-08 13:52:04 -07:00 |
|
Stephen Birarda
|
f5912f07a8
|
make sure username is not empty before requesting faceMesh
|
2013-10-08 12:45:18 -07:00 |
|
Stephen Birarda
|
d843285db7
|
save profile to settings, fix UUID storage
|
2013-10-08 12:40:09 -07:00 |
|
Stephen Birarda
|
85edb93710
|
add a Profile class to hold user data from data-server
|
2013-10-08 12:13:45 -07:00 |
|
Stephen Birarda
|
892614470e
|
Merge branch 'master' of github.com:worklist/hifi into nameserver
|
2013-10-08 11:19:32 -07:00 |
|
ZappoMan
|
f6981feacf
|
added various render mode options, including voxels as points
|
2013-10-07 17:46:22 -07:00 |
|
Stephen Birarda
|
26d5e2cfec
|
clear the face model URL if the username is changed in preferences
|
2013-10-07 17:24:07 -07:00 |
|
Stephen Birarda
|
b33843fddc
|
ask for a mesh if username is present on login or is changed
|
2013-10-07 13:52:46 -07:00 |
|
Stephen Birarda
|
f36fd47ef7
|
store username and not UUID for MyAvatar
|
2013-10-07 12:17:47 -07:00 |
|
Stephen Birarda
|
98f435ccc2
|
link mesh URL and UUID in prefs to data server client
|
2013-10-07 12:03:04 -07:00 |
|
ZappoMan
|
5f6fb3a3ae
|
added some timing debugging
|
2013-10-05 00:55:34 -07:00 |
|
Philip Rosedale
|
cebd8e5f4b
|
Merge pull request #997 from birarda/assignment
file of static assignments for DS
|
2013-10-01 13:47:10 -07:00 |
|
ZappoMan
|
793a14e25a
|
first cut at new faster voxel pipeline
|
2013-10-01 10:37:14 -07:00 |
|
Stephen Birarda
|
bb32da12f1
|
complete removal of fervor and C++11 array
|
2013-09-30 10:30:18 -07:00 |
|
ZappoMan
|
b6fe8befdc
|
removed old normal support from voxel system only using global normals
|
2013-09-30 09:29:04 -07:00 |
|
Philip Rosedale
|
1189ac2216
|
Merge pull request #989 from ZappoMan/voxel_geo_shader
add support for global normals for voxels
|
2013-09-27 15:10:53 -07:00 |
|
ZappoMan
|
8cffa8d872
|
add support for global normals for voxels
|
2013-09-27 15:04:44 -07:00 |
|
ZappoMan
|
fb85add6b4
|
Merge pull request #986 from PhilipRosedale/master
Faceshift rotates body, slow near others for easier positioning
|
2013-09-27 07:01:00 -07:00 |
|
Freddy
|
6b0f9314ba
|
Faceshift drives body rotation, remove gyro-driven rotation
|
2013-09-26 23:52:44 -07:00 |
|
ZappoMan
|
2487a55be9
|
add support for use of Byte normals
|
2013-09-26 19:04:19 -07:00 |
|
Philip Rosedale
|
0fbabe9891
|
Merge pull request #984 from ZappoMan/voxel_geo_shader
Voxel Geometry Shader Experiment
|
2013-09-26 17:22:55 -07:00 |
|
ZappoMan
|
3f8e55da28
|
style cleanup
|
2013-09-26 16:46:34 -07:00 |
|
ZappoMan
|
fd0cc3b417
|
style fixes
|
2013-09-26 16:33:37 -07:00 |
|
ZappoMan
|
7845340279
|
menu cleanup, support for on the fly switching of maxVoxels and useVoxelShader
|
2013-09-26 16:26:49 -07:00 |
|
Andrzej Kapolka
|
91999dfe1f
|
Pupil dilation.
|
2013-09-26 15:48:11 -07:00 |
|
ZappoMan
|
552d9fadd8
|
rearranged menus, some hacking on voxel shader
|
2013-09-26 14:51:57 -07:00 |
|
Andrzej Kapolka
|
0fa2eca02d
|
Remove option to use Faceshift rig (using the "macaw" model has much the same
result, and it lets other people see it).
|
2013-09-23 10:43:20 -07:00 |
|
Andrzej Kapolka
|
9d28aaefae
|
Merge branch 'master' of https://github.com/worklist/hifi into blendface
|
2013-09-19 18:00:46 -07:00 |
|
Andrzej Kapolka
|
94d6f00f65
|
Parenting the info view to the menu is preventing the menu from showing up on
Linux. Let's try not doing that.
|
2013-09-19 17:47:50 -07:00 |
|
Andrzej Kapolka
|
5c841616dc
|
Merge branch 'master' of https://github.com/worklist/hifi into blendface
|
2013-09-19 16:37:26 -07:00 |
|
Andrzej Kapolka
|
a04ced633e
|
Include the face model URL in the same packet as the avatar voxel URL.
|
2013-09-19 16:35:25 -07:00 |
|
Andrzej Kapolka
|
1bd8ea947a
|
Merge branch 'master' of https://github.com/worklist/hifi into blendface
|
2013-09-18 17:14:58 -07:00 |
|
Stephen Birarda
|
bbbdc4f88c
|
fixes for InfoView ownership and display
|
2013-09-18 16:42:51 -07:00 |
|
Stephen Birarda
|
9fa695b71c
|
allow setting of custom port via domainHostname setting
|
2013-09-18 13:50:14 -07:00 |
|
Stephen Birarda
|
ab85c4109d
|
use QHostInfo and QHostAddress for DS changes in NodeList
|
2013-09-18 13:29:53 -07:00 |
|
Andrzej Kapolka
|
6be03ac3df
|
Working on downloading the faces.
|
2013-09-18 10:10:24 -07:00 |
|
Andrzej Kapolka
|
f9426cbecc
|
Working on reading and rendering the rig from Faceshift.
|
2013-09-16 15:49:40 -07:00 |
|
atlante45
|
ac0ee6c7d6
|
another merge commit
|
2013-09-14 14:41:03 -07:00 |
|
ZappoMan
|
2d545c8adb
|
Merge pull request #924 from stojce/19418
Code Review for Job #19418
|
2013-09-14 14:00:09 -07:00 |
|
LionTurtle
|
86d1666d6a
|
Add ifdef for OS X to show delete hotkey in edit menu
|
2013-09-13 13:49:19 -07:00 |
|
LionTurtle
|
0251349221
|
Change nudge UI to be more consistent with classic editing UI.
Add menu option for Delete and fix delete for VoxelSelectMode.
|
2013-09-13 13:41:26 -07:00 |
|
stojce
|
921e88ea5d
|
Merge branch 'master' of https://github.com/worklist/hifi into 19418
Merge branch 'master'
|
2013-09-12 21:11:30 +02:00 |
|
stojce
|
eefe08e733
|
non OS X menu
added help + about menu for non OS X
|
2013-09-12 19:39:34 +02:00 |
|
stojce
|
330b1cdaf1
|
About menu
added About menu - OS X version only
|
2013-09-11 22:08:07 +02:00 |
|
Andrzej Kapolka
|
feecb4fa25
|
Fix for eyelids, change Faceshift menu option to indicate that it applies
specifically to TCP connection.
|
2013-09-11 10:44:38 -07:00 |
|