Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 10:16:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
10625 commits 71 branches 56 tags 1.2 GiB
Commit graph

386 commits

Author SHA1 Message Date
Brad Hefta-Gaub
477840904b Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-15 12:09:26 -08:00
Brad Hefta-Gaub
170dbe6e85 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	domain-server/src/DomainServer.cpp
	interface/src/Audio.cpp
	interface/src/DataServerClient.cpp
	interface/src/Oscilloscope.cpp
	interface/src/PairingHandler.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Faceshift.cpp
	interface/src/devices/SerialInterface.cpp
	interface/src/renderer/FBXReader.cpp
	libraries/avatars/src/AvatarData.h
	libraries/octree-server/src/OctreeServer.cpp
	libraries/octree-server/src/OctreeServer.h
	libraries/octree/src/ViewFrustum.cpp
	libraries/shared/src/Logging.cpp
	libraries/shared/src/Node.cpp
	libraries/shared/src/Node.h
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
	libraries/shared/src/PerfStat.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/voxels/src/VoxelTree.cpp
	voxel-edit/src/main.cpp
 2014-01-15 10:20:21 -08:00
Lucas Crisman
73dfc5dd58 Merge branch 'master' of git://github.com/worklist/hifi into 19485 2014-01-15 14:50:59 -03:00
Stephen Birarda
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
Brad Hefta-Gaub
392ff94ebe Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	interface/src/DataServerClient.cpp
	interface/src/avatar/MyAvatar.cpp
	libraries/avatars/src/AvatarData.h
 2014-01-13 15:06:26 -08:00
Brad Hefta-Gaub
b947d1e80c more surgical removal of WebCam with HAVE_LIBVPX 2014-01-13 15:00:15 -08:00
Andrzej Kapolka
7abb7d9ccd Merge branch 'master' of https://github.com/worklist/hifi 2014-01-13 14:03:08 -08:00
Stephen Birarda
42e3bcfe91 allow fade scale to get smaller than minimum avatar scale 2014-01-13 13:52:41 -08:00
Andrzej Kapolka
2d5df38907 Persist the user orientation as well as the position, show up a couple meters 
in front of (and facing) target.  Closes #1367.
 2014-01-13 13:51:51 -08:00
Brad Hefta-Gaub
55babbf7b6 windows type mismatch warning fixes 2014-01-13 00:30:23 -08:00
Lucas Crisman
e1aa74a5df equal sign key as shortcut for Reset Avatar Size 2014-01-09 15:00:55 -03:00
stojce
2814cca9af #19466 - Add avatar scale to preferences panel 2014-01-03 21:02:56 +01:00
Stojce Slavkovski
f583013776 Merge branch 'master' of https://github.com/worklist/hifi into 19463 2014-01-02 23:19:07 +01:00
ZappoMan
a43844447c first cut at 3D TV support 2013-12-28 10:07:33 -08:00
Stojce Slavkovski
ee1eb25dfa replace LogDisplay with File logger 
- added abstract logger interface
 2013-12-22 18:56:53 +01:00
Andrzej Kapolka
f10dccb1b8 Fix for menu shortcuts; just include widget library rather than using awkward 
workaround.
 2013-12-18 17:28:21 -08:00
Stojce Slavkovski
45d926da41 CR fixes 2013-12-18 20:37:45 +01:00
Stojce Slavkovski
4c1226ffd9 Merge branch 'master' of https://github.com/worklist/hifi into 19461 2013-12-18 08:00:55 +01:00
Andrzej Kapolka
6cffce5b31 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-17 16:57:25 -08:00
ZappoMan
ccd6058412 get abstract menu class to work 2013-12-17 13:55:17 -08:00
Andrzej Kapolka
a5c8531aa1 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	interface/src/Application.cpp
 2013-12-17 13:46:44 -08:00
Stojce Slavkovski
57b4148867 Dialog position / toggle 2013-12-17 22:12:24 +01:00
Stojce Slavkovski
3e1c857a2e Merge branch 'master' of https://github.com/worklist/hifi into 19461 2013-12-17 22:11:29 +01:00
Stojce Slavkovski
841d491b2f Merge branch 'master' of https://github.com/worklist/hifi into 19461 2013-12-17 20:44:51 +01:00
ZappoMan
a2f1b3e325 Merge branch 'master' of https://github.com/worklist/hifi into particle_blinky_bug 2013-12-17 11:35:49 -08:00
ZappoMan
74d9c05c44 added particle server details to voxel stats dialog 2013-12-17 11:32:20 -08:00
Philip Rosedale
35e7cfddba Made drumming and slaps into menu choices from ‘Hand Options’ 2013-12-17 11:20:26 -08:00
Stojce Slavkovski
365d1eea10 Merge branch 'master' of https://github.com/worklist/hifi into 19461 
Conflicts:
	interface/src/Menu.h
 2013-12-17 20:15:40 +01:00
Stojce Slavkovski
cc6f7ed4cc display all log data on load 2013-12-17 03:07:57 +01:00
Stojce Slavkovski
5a27ded669 Merge branch 'master' of https://github.com/worklist/hifi into 19461 
Conflicts:
	interface/src/Application.cpp
 2013-12-16 22:57:47 +01:00
Andrzej Kapolka
6888dc4eeb Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-16 13:44:44 -08:00
Stojce Slavkovski
e788d746d4 added dialog for log data 
- importing Inconsolata.otf on application level
- style sheet for dialog
- changed menu behaviour for log data
 2013-12-16 22:43:17 +01:00
ZappoMan
6203e9dc2e Merge branch 'master' of https://github.com/worklist/hifi into particle_voxel_collisions 
Conflicts:
	interface/src/Application.cpp
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/Hand.cpp
 2013-12-16 12:11:33 -08:00
ZappoMan
f8830ed9b1 cleaned up hand target code a bit 2013-12-16 12:04:16 -08:00
ZappoMan
f9b7c23857 correct handleing of app shutdown and scripting enging termination 2013-12-16 11:26:30 -08:00
ZappoMan
524a41468c multiple scripts running at same time, menu interface for scripts 2013-12-16 09:16:51 -08:00
ZappoMan
e2fbb7beb4 first cut at splitting out scripting engine from agent to add to client 2013-12-14 08:14:38 -08:00
Philip Rosedale
1b1fdd3dc4 add menu option for sixense filter 2013-12-13 15:21:32 -08:00
Andrzej Kapolka
5ec9017d3b More metavoxel bits. 2013-12-11 18:00:17 -08:00
Philip Rosedale
4707733563 Removed avatar balls 2013-12-06 16:26:02 -08:00
Andrzej Kapolka
d374716c7d Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 17:09:19 -08:00
Philip Rosedale
3f957bbf5d Rave out! 2013-12-05 16:46:11 -08:00
Andrzej Kapolka
b90c5bdae8 Option to render collision proxies, more general avatar penetration test, fix 
for meshes with only one joint influence.
 2013-12-05 14:00:38 -08:00
ZappoMan
9faef65ccc first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00
ZappoMan
0e501f4439 Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets 
Conflicts:
	interface/src/Menu.cpp
	interface/src/Menu.h
 2013-11-27 15:44:51 -08:00
ZappoMan
2ce9937126 major pass on cleaning up voxel packets to have flags, sequence numbers, and flight time, add compression menu item 2013-11-26 17:27:08 -08:00
Philip Rosedale
f27039853c Merge branch 'master' of https://github.com/worklist/hifi 2013-11-26 11:25:26 -08:00
Philip Rosedale
09ca2a45db Add local audio monitor option, tweak turning with head 2013-11-26 11:25:06 -08:00
Stephen Birarda
ec909a6c13 add a mutex lock and unlock on Menu instance creation 2013-11-26 10:58:02 -06:00
ZappoMan
63a82af449 allow client to set voxels MaxPPS in Preferences 2013-11-25 15:13:31 -08:00
ZappoMan
d13ebf6095 more menu cleanup removing developer options that are now defunct 2013-11-25 14:44:34 -08:00
ZappoMan
de26b950f8 cleanup menu defaults 2013-11-25 14:25:09 -08:00
Andrzej Kapolka
083800dc59 Glow/shrink avatars when killed, send kill message when we move between 
domains, locations, etc.
 2013-11-22 16:23:40 -08:00
Andrzej Kapolka
f38e74c51c Merge branch 'master' of https://github.com/worklist/hifi into shadowplay 2013-11-21 11:18:56 -08:00
Andrzej Kapolka
3cf47f8d5c Merge branch 'master' of https://github.com/worklist/hifi into shadowplay 2013-11-21 11:08:45 -08:00
Andrzej Kapolka
7bc65136c7 Merge branch 'master' of https://github.com/worklist/hifi into sicksense 2013-11-21 11:00:09 -08:00
Andrzej Kapolka
5cc5d9bba8 Progress towards shadow maps. 2013-11-20 16:23:54 -08:00
Andrzej Kapolka
df8fbf8f72 More general, angle-driven form of driving based on lean. 2013-11-19 11:09:02 -08:00
Andrzej Kapolka
5e933b0815 Working on basic Faceshift drive. 2013-11-18 18:06:01 -08:00
ZappoMan
73c1ef9997 fix macos menu placement for About, Preferences, and Quit 2013-11-17 00:01:32 -08:00
Andrzej Kapolka
7249e5293c Added a slider in the preferences to control the amount of Faceshift eye 
deflection.
 2013-11-15 10:17:52 -08:00
ZappoMan
34668e8716 add Paste To Voxel 2013-11-13 23:04:51 -08:00
Philip Rosedale
f3b6e21a6d Voxel click to fly is now an option in the Tools Menu 2013-11-08 14:34:15 -08:00
Andrzej Kapolka
ebe3ef4b22 Toggle for the leap hands. 2013-11-07 17:20:52 -08:00
ZappoMan
64d5ccf91e add menu option for voxel server fade in/out and dont remove local voxels when server shuts down 2013-11-07 14:10:09 -08:00
Stephen Birarda
a4fcff6b19 only send fake event to the OGLWidget 2013-11-06 12:36:52 -08:00
Stephen Birarda
503de083f8 an actual patch for two finger mouselook fail after dialog 2013-11-06 12:27:45 -08:00
Andrzej Kapolka
359083ee9d Sneak in a toggle for chat circling. 2013-11-05 12:30:38 -08:00
Stephen Birarda
60e7c54303 fix some checks for empty inputs 2013-11-05 11:26:53 -08:00
Stephen Birarda
145efbda2d some dialog touchups and visual changes 2013-11-05 11:21:32 -08:00
ZappoMan
a04cd8e95c added menu item to enable extra debugging to help debug hq VS issue 2013-10-31 13:54:10 -07:00
Stephen Birarda
7b9eb55bda fix the dialog mouselook bug 2013-10-31 11:32:19 -07:00
ZappoMan
054f49808f Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 
Conflicts:
	libraries/voxel-server-library/src/VoxelSendThread.cpp
 2013-10-30 16:48:50 -07:00
ZappoMan
0bbbd7efce fix Voxel Server Protocol menu options to work again 2013-10-30 14:00:56 -07:00
ZappoMan
3a6f8ea66b Merge branch 'master' of https://github.com/worklist/hifi into lod_slider 2013-10-30 12:04:52 -07:00
ZappoMan
580102bb38 more work on LOD slider 2013-10-30 11:01:37 -07:00
ZappoMan
fbc3a4d2c1 first cut at user adjustable LOD 2013-10-29 16:16:58 -07:00
Stephen Birarda
f6c265dcf3 remove the ground plane 2013-10-29 15:22:04 -07:00
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
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
LionTurtle
d965789812 Switching nudge to cut/paste implementation. Preliminary. 2013-09-06 11:40:35 -07:00
LionTurtle
59943dc2e8 Merge branch 'nudge' 
Conflicts:
	interface/src/Menu.cpp
	libraries/voxels/src/VoxelTree.h
 2013-09-05 17:58:39 -07:00
LionTurtle
868ef8bec6 Add VoxelNudgeMode and preliminary UI grid for nudging. 2013-09-05 17:42:25 -07:00
LionTurtle
6e37bc3644 Nudge code working for nudge that is greater than or equal to leaf size. 2013-09-05 11:06:12 -07:00
Andrzej Kapolka
1532b5d91a Apply eye offset position based on Faceshift/webcam. 2013-09-04 17:33:57 -07:00
Andrzej Kapolka
834b671f5a Merge branch 'master' of https://github.com/worklist/hifi into shifty 2013-09-04 15:32:15 -07:00
atlante45
5da525fc3e memory wastes and code cleaning PR comments 2013-09-04 15:12:24 -07:00
atlante45
1781abe937 Added Menu instance deletion in Application destructor. 2013-09-04 10:40:42 -07:00
atlante45
b03482ead5 Some more memory leaks and codes formatting 2013-09-03 17:16:06 -07:00
Andrzej Kapolka
213a8fcd63 Working on Faceshift integration. 2013-09-03 11:52:32 -07:00
Andrzej Kapolka
614f7cd28b Merge branch 'master' of https://github.com/worklist/hifi into led 2013-08-27 13:12:54 -07:00
Andrzej Kapolka
4ca8a10296 Starting on LED tracking. 2013-08-26 14:36:19 -07:00
ZappoMan
0df11124b3 tweak to how activateWindow() is called after dialog boxes 2013-08-26 14:24:42 -07:00
ZappoMan
943e1f9110 added Go To Domain, Go To Location, and tweaks to TREE_SCALE settings 2013-08-26 14:06:23 -07:00
Stephen Birarda
818355dc1a implementing @problem's proposed changes to menus 2013-08-23 15:18:06 -07:00
Andrzej Kapolka
6dbaedd921 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
 2013-08-21 15:46:14 -07:00
atlante45
bae0f7fa1b New paste behaviour 2013-08-21 13:21:15 -07:00
Andrzej Kapolka
f39050ae28 Enable lookat vectors by default and make them glow. 2013-08-21 11:37:57 -07:00
atlante45
3eb5ace715 merge + few efficiency ameliorations to importDialog 2013-08-20 18:04:25 -07:00
Andrzej Kapolka
1d74860877 Need to #ifdef this out to avoid linking against nonexistent quazip on Linux. 2013-08-20 10:51:55 -07:00
Stephen Birarda
d0ab8317c4 Merge pull request #865 from ey6es/ssao 
Basic screen space ambient occlusion effect.  Defaults to off, because at the moment it slows things down substantially.
 2013-08-20 10:37:01 -07:00
Stephen Birarda
71edaa2472 replace appcast url with highfidelity s3 bucket link 2013-08-20 09:55:48 -07:00
Stephen Birarda
329253d8e4 move update checking later in init, add menu option 2013-08-19 17:17:26 -07:00
Stephen Birarda
65a63fb73e move checkForUpdates to menu to have option in menu 2013-08-19 16:16:27 -07:00
atlante45
24531fdd10 Dialogbox for import fully functionnal 2013-08-19 15:54:51 -07:00
Andrzej Kapolka
dec4a4c422 Added toggle for ambient occlusion (defaults to off). 2013-08-19 11:45:43 -07:00
Andrzej Kapolka
fe2484ba68 Added back the glow mode cycle command that got removed in the menu reshuffle. 2013-08-19 11:01:57 -07:00
Stephen Birarda
5b02125d5f remove an extra g 2013-08-15 16:10:34 -07:00
Stephen Birarda
4a13f3b75a move swatch reset to Menu 2013-08-15 15:52:47 -07:00
Stephen Birarda
0667190d00 hook settings options in menu 2013-08-15 15:40:17 -07:00
Stephen Birarda
e18be2cb36 hook audio listening modes and complete cleanup for debug 2013-08-15 15:37:09 -07:00
Stephen Birarda
154c6b4f32 fix disabling of occlusion culling from menu 2013-08-15 15:32:44 -07:00
Stephen Birarda
b288cc43a2 fix disabling of delta sending and low res while moving 2013-08-15 15:29:05 -07:00