PhilipRosedale
|
7dd1a7525e
|
starting to add faceshift head mouse
|
2013-10-01 16:10:22 -07:00 |
|
ZappoMan
|
793a14e25a
|
first cut at new faster voxel pipeline
|
2013-10-01 10:37:14 -07:00 |
|
Philip Rosedale
|
a22b3d28bf
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-09-30 12:44:07 -07:00 |
|
Philip Rosedale
|
f30ff1704a
|
Fix to make touch-look MUCH smoother for flying around
|
2013-09-30 12:43:25 -07:00 |
|
Philip Rosedale
|
7a74432bef
|
Merge pull request #994 from ZappoMan/voxel_geo_shader
removed old normal support from voxel system only using global normals
|
2013-09-30 11:37:09 -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
|
9645cd9831
|
Click on voxels as way of moving around
|
2013-09-28 15:18:59 -07:00 |
|
stojce
|
a0f23d409e
|
Merging changes
|
2013-09-28 13:16:50 +02:00 |
|
stojce
|
bac228bdb8
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-09-28 12:47:47 +02:00 |
|
Philip Rosedale
|
549b863665
|
Merge pull request #988 from ZappoMan/voxel_geo_shader
voxel rendering performance and debugging improvements
|
2013-09-27 13:27:29 -07:00 |
|
ZappoMan
|
605c2f30cf
|
add memory usage debugging
|
2013-09-27 10:17:10 -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
|
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 |
|
ZappoMan
|
552d9fadd8
|
rearranged menus, some hacking on voxel shader
|
2013-09-26 14:51:57 -07:00 |
|
Andrzej Kapolka
|
4dec183262
|
Enlarge heads when they're moused over.
|
2013-09-26 12:07:13 -07:00 |
|
Andrzej Kapolka
|
63efeccb13
|
Renaming for clarity.
|
2013-09-25 17:38:37 -07:00 |
|
Freddy
|
36104d0b06
|
remove unused older voxel grab thrust
|
2013-09-23 23:04:27 -07:00 |
|
Freddy
|
027811e37c
|
Increase thrust while holding keys down to allow very fast speeds
|
2013-09-23 22:53:35 -07:00 |
|
ZappoMan
|
3d4341cee4
|
hacking on voxel geometry shader
|
2013-09-23 15:18:45 -07:00 |
|
Andrzej Kapolka
|
133ba3a00a
|
Set normals based on indices, cache face models.
|
2013-09-20 17:40:15 -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 |
|
Stephen Birarda
|
bbbdc4f88c
|
fixes for InfoView ownership and display
|
2013-09-18 16:42:51 -07:00 |
|
Stephen Birarda
|
8a901382a3
|
get rid of local and domain options in interface
|
2013-09-18 14:01:32 -07:00 |
|
Stephen Birarda
|
ab85c4109d
|
use QHostInfo and QHostAddress for DS changes in NodeList
|
2013-09-18 13:29:53 -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
|
6613ad0591
|
Arrow keys now also control nudge guide. Avatar position is now fixed
during nudge.
|
2013-09-13 18:10:52 -07:00 |
|
LionTurtle
|
394e660ac3
|
Use WASD to move nudge guide instead of mouse.
Nudge can be completed with return/enter key now.
Nudge is now accessible in any voxelEditMode.
|
2013-09-13 17:51:10 -07:00 |
|
LionTurtle
|
67bbcc4d9b
|
Put upper bound on increasing nudge precision (i.e. making the nudge
less precise).
|
2013-09-13 14:08:21 -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 |
|
LionTurtle
|
cef4837654
|
Fix voxel erase bug in nudge code. Fix rendering of nudge guide.
|
2013-09-11 16:43:50 -07:00 |
|
stojce
|
a362fdc2ed
|
name the current domain server
|
2013-09-10 21:51:50 +02:00 |
|
stojce
|
114cc065bd
|
Merge branch 'master' of https://github.com/worklist/hifi into 19418
|
2013-09-10 21:05:44 +02:00 |
|
ZappoMan
|
befbc1b93a
|
Merge pull request #916 from LionTurtle/master
Nudge
|
2013-09-10 11:16:12 -07:00 |
|
LionTurtle
|
30c8af222d
|
Merge remote-tracking branch 'upstream/master'
|
2013-09-10 11:10:50 -07:00 |
|
LionTurtle
|
3b464094d9
|
Remove magic numbers, fix spacing, and other code clean up in nudge code.
|
2013-09-10 11:09:50 -07:00 |
|
Philip Rosedale
|
4245f33c3c
|
Merge pull request #915 from ey6es/master
Subtract the long term average from the eye gaze directions. Best solution I've found so far for aligning the gaze.
|
2013-09-10 09:36:04 -07:00 |
|
LionTurtle
|
f41533fee6
|
Add nudgeVoxel shading in grid. Fix erase bug.
|
2013-09-09 18:23:37 -07:00 |
|
LionTurtle
|
b0803c1267
|
Merge remote-tracking branch 'upstream/master'
|
2013-09-09 16:54:34 -07:00 |
|
LionTurtle
|
ac878c9c63
|
UI for nudge completed!
|
2013-09-09 16:53:31 -07:00 |
|
Stephen Birarda
|
613334074f
|
leverage qDebug and custom message handler for verbose logging
|
2013-09-09 15:11:11 -07:00 |
|
Andrzej Kapolka
|
f8aee88a5b
|
Let's try subtracting the long-term average from the eye directions.
|
2013-09-09 14:30:26 -07:00 |
|
Andrzej Kapolka
|
ddf92b39c7
|
Fix for off-axis ambient occlusion.
|
2013-09-08 17:52:35 -07:00 |
|