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 |
|
Stephen Birarda
|
c930d058b1
|
fix monochrome option menu hook
|
2013-08-15 15:23:26 -07:00 |
|
Stephen Birarda
|
b4da77028b
|
fix true colorization of voxels
|
2013-08-15 15:16:58 -07:00 |
|
Stephen Birarda
|
80967e6941
|
fix by source false colorization
|
2013-08-15 15:16:13 -07:00 |
|
Stephen Birarda
|
2742e723e0
|
fix V2 occlusion false coloring
|
2013-08-15 15:15:43 -07:00 |
|
Stephen Birarda
|
e77aae157b
|
fix in view and occluded false colorization
|
2013-08-15 15:15:19 -07:00 |
|
Stephen Birarda
|
c7be2e13cd
|
repair false coloring by distance
|
2013-08-15 15:12:05 -07:00 |
|
Stephen Birarda
|
cf5c53281b
|
repair first couple of false colorize methods
|
2013-08-15 15:07:49 -07:00 |
|
Stephen Birarda
|
f72f9d8735
|
fix hook to render pipeline warnings and kill local voxels
|
2013-08-15 14:57:40 -07:00 |
|
Stephen Birarda
|
474b0465a7
|
hook tree stat calculation to menu
|
2013-08-15 14:50:12 -07:00 |
|
Stephen Birarda
|
eb4508aafb
|
hook timing tests to Menu
|
2013-08-15 14:46:25 -07:00 |
|