Don Park
|
e44b0af9b6
|
make updateWindowTitle public, call it after Menu loads data into the Profile
|
2013-10-25 11:36:50 -07:00 |
|
ZappoMan
|
55294e1de7
|
Merge pull request #1103 from ey6es/master
As a temporary measure, restore the full screen mirror as a menu option.
|
2013-10-23 11:59:39 -07:00 |
|
Andrzej Kapolka
|
665551d690
|
Merge branch 'master' of https://github.com/worklist/hifi into ossome
|
2013-10-23 11:26:23 -07:00 |
|
Andrzej Kapolka
|
5334d9021e
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-10-23 11:22:04 -07:00 |
|
Andrzej Kapolka
|
71b4b8fe46
|
Use lowercase h to toggle full screen mirror, capital H for inset.
|
2013-10-23 10:54:39 -07:00 |
|
Andrzej Kapolka
|
adc79be81c
|
Add back the full screen mode as a menu option, temporarily.
|
2013-10-23 10:30:42 -07:00 |
|
ZappoMan
|
5d18b68a2e
|
added support for forceFullFrustum in hideOutOfView() this fixes inconcistancies with voxel hiding showing
|
2013-10-23 10:14:41 -07:00 |
|
Andrzej Kapolka
|
251b80b514
|
Merge branch 'master' of https://github.com/worklist/hifi into ossome
|
2013-10-23 10:03:22 -07:00 |
|
ZappoMan
|
306b23d489
|
make Fast Voxel Pipeline the default behavior
|
2013-10-23 05:58:47 -07:00 |
|
ZappoMan
|
1430a083d1
|
make DontRemoveOutOfView the default behavior
|
2013-10-23 05:44:20 -07:00 |
|
ZappoMan
|
3c8e30c956
|
make HideOutOfView the default behavior
|
2013-10-23 05:38:33 -07:00 |
|
ZappoMan
|
1786049710
|
make use delta frustum in culling the default behavior
|
2013-10-23 05:30:15 -07:00 |
|
ZappoMan
|
370fe3dad9
|
make constant culling the default mode
|
2013-10-23 05:22:29 -07:00 |
|
Andrzej Kapolka
|
247dfd3750
|
Merge branch 'master' of https://github.com/worklist/hifi into ossome
|
2013-10-22 17:27:14 -07:00 |
|
ZappoMan
|
1b302f60f8
|
Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
|
2013-10-21 16:03:53 -07:00 |
|
ZappoMan
|
b8dfc387b4
|
added reset settings for Old vs New voxel culling mode
|
2013-10-21 16:02:10 -07:00 |
|
ZappoMan
|
2979a8e738
|
better working version of hideOutOfView voxel support
|
2013-10-21 15:30:14 -07:00 |
|
ZappoMan
|
be67d6f8aa
|
added some new debug menus
|
2013-10-21 14:41:07 -07:00 |
|
Andrzej Kapolka
|
7e174093e4
|
Factoring the FBX model code out to a shared base class.
|
2013-10-18 17:26:03 -07:00 |
|
Stephen Birarda
|
b6c4599a55
|
cleaup some unecessary defaults in Menu
|
2013-10-18 16:10:03 -07:00 |
|
Stephen Birarda
|
bdfc7fdb64
|
fix for preferences bug on 5.1.1
|
2013-10-18 16:07:05 -07:00 |
|
Andrzej Kapolka
|
778e432cc4
|
Merge branch 'master' of https://github.com/worklist/hifi into ossome
|
2013-10-17 17:33:03 -07:00 |
|
Andrzej Kapolka
|
c8b2ed0213
|
More progress on reading skeletons.
|
2013-10-17 17:30:34 -07:00 |
|
Andrzej Kapolka
|
9ba3c3719f
|
Working on skeleton loading, added support for FBX text format (exported by
Blender).
|
2013-10-17 15:45:57 -07:00 |
|
Stephen Birarda
|
fa146e302d
|
remove 16-bit node IDs and replace with UUIDs
|
2013-10-17 11:49:41 -07:00 |
|
Stephen Birarda
|
6369e9959f
|
change goToUser shortcut to @
|
2013-10-11 15:25:17 -07:00 |
|
stojce
|
355a1f3da3
|
Merge branch 'master' of https://github.com/worklist/hifi into 19435
Conflicts:
interface/src/avatar/Head.cpp
interface/src/avatar/Head.h
|
2013-10-11 22:54:59 +02:00 |
|
Philip Rosedale
|
bf3f507301
|
Merge pull request #1043 from birarda/master
fix domain jumping with goToUser, remove planet environments
|
2013-10-10 17:25:43 -07:00 |
|
ZappoMan
|
fbcf66b232
|
Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
Conflicts:
interface/src/Menu.h
|
2013-10-10 16:37:07 -07:00 |
|
Stephen Birarda
|
6f868a00eb
|
reset environment on domain-server change
|
2013-10-10 16:34:35 -07:00 |
|
Stephen Birarda
|
aa0a97b959
|
use deleteLater to ensure that AvatarVoxelSystem delete is on correct thread
|
2013-10-10 16:23:22 -07:00 |
|
Philip Rosedale
|
43e01ee105
|
Merge pull request #1039 from birarda/data-server
add ability to jump to a user's domain and location
|
2013-10-10 15:37:21 -07:00 |
|
ZappoMan
|
c86bad77c9
|
progress on keep local voxels
|
2013-10-10 15:23:22 -07:00 |
|
Philip Rosedale
|
27a892fa55
|
Removed old head rotation code, menu items, added ability to turn off faceshift head rotation
|
2013-10-09 22:46:34 -07:00 |
|
Stephen Birarda
|
4c148c6f3a
|
ask data-server for domain + position of user from goToUser
|
2013-10-09 16:58:27 -07:00 |
|
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 |
|
Philip Rosedale
|
58d6c4c97a
|
Cleaning up particle code
|
2013-10-09 14:28:00 -07:00 |
|
ZappoMan
|
d939d3aaae
|
Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
|
2013-10-09 14:02:40 -07:00 |
|
ZappoMan
|
c25b03dd58
|
first cut at keeping local voxels
|
2013-10-09 14:02:31 -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 |
|
stojce
|
a795a5b88f
|
#19435 - Remove 'Perlin Face' option from menus and code
|
2013-10-08 18:23:51 +02:00 |
|
ZappoMan
|
f6981feacf
|
added various render mode options, including voxels as points
|
2013-10-07 17:46:22 -07:00 |
|