Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-27 22:36:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
13390 commits 71 branches 56 tags 1.2 GiB
Commit graph

354 commits

Author SHA1 Message Date
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
ZappoMan
3f8e55da28 style cleanup 2013-09-26 16:46:34 -07:00
ZappoMan
7845340279 menu cleanup, support for on the fly switching of maxVoxels and useVoxelShader 2013-09-26 16:26:49 -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
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
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
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
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
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
atlante45
688bc17954 Fixed avatar related files memory wastes 2013-09-03 13:37:25 -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
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
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
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
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
4a13f3b75a move swatch reset to Menu 2013-08-15 15:52:47 -07:00
Stephen Birarda
e2ae85176f make settings methods slots in Menu so they are accessible 2013-08-15 15:41:25 -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
Stephen Birarda
c930d058b1 fix monochrome option menu hook 2013-08-15 15:23:26 -07:00
Stephen Birarda
eb4508aafb hook timing tests to Menu 2013-08-15 14:46:25 -07:00
Stephen Birarda
cd000cb7c1 remove the particle system from ground plane 2013-08-15 14:37:27 -07:00
Stephen Birarda
0e4d54d5b0 voxel mode actions group cannot be exclusive 2013-08-15 12:48:48 -07:00
Stephen Birarda
4903122432 fix hooks to voxel stats dialog 2013-08-15 12:38:26 -07:00
Stephen Birarda
10109fff10 inlined spacing cleanup in Head, remove noise 2013-08-15 11:04:18 -07:00
Stephen Birarda
eb7714f6c4 change signature of Menu helper for cleaner code in ctor 2013-08-15 10:56:37 -07:00
Stephen Birarda
46b064b7d6 initial decoupling of menu from Application 2013-08-15 10:46:51 -07:00
Stephen Birarda
5b181bd351 add new Menu class for Application cleanup 2013-08-12 12:29:01 -07:00
Andrzej Kapolka
a24f215f09 Moved menu, chat entry field to ui subdirectory. 2013-04-30 09:59:05 -07:00
Stephen Birarda
189bfdfb36 add header comments to Vincent's menu files 2013-04-10 16:16:36 -07:00
Stephen Birarda
b152d43f77 refactor menu callbacks and row/column adding 2013-04-10 16:07:46 -07:00
vincent
b43475a34e #19171 Missing Code Review changes 2013-04-11 00:23:41 +02:00
vincent
4dbff46234 #19171 Code Review changes 2013-04-11 00:13:40 +02:00
vincent
eb646ade84 #19171 split of menu.cpp in menuColumn.cpp and menuRow.cpp 2013-04-10 22:39:01 +02:00
vincent
6a5c51bc69 #19171 Add a simple openGL menu that will work x-platform 2013-04-10 21:31:29 +02:00