Stephen Birarda
8c79d19e3e
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-10-23 16:07:54 -07:00
Sam Gateau
9f6454f570
Merge branch 'temp0' of https://github.com/samcake/hifi into temp1
2014-10-23 15:20:20 -07:00
Sam Gateau
d92c03364a
Improve comment regarding the replacement of the QGLProgram->bind()
2014-10-23 14:53:43 -07:00
Ryan Huffman
fde7b30501
Add Camera::modeUpdated()
2014-10-23 14:47:41 -07:00
Sam Gateau
d7fca1fd27
FIxing the merge
2014-10-23 14:39:22 -07:00
Sam Gateau
ac269e16c0
start working on the target framerate control
2014-10-23 13:19:34 -07:00
Andrzej Kapolka
34cba5c031
Added options to selectively toggle heightfield/dual contour surface
...
rendering.
2014-10-23 13:16:43 -07:00
Leonardo Murillo
a4965e7f60
No need for https when downloading assets
2014-10-23 13:59:08 -06:00
Philip Rosedale
9394f72b18
clarify fake blendshape array size
2014-10-23 11:55:06 -07:00
Philip Rosedale
1d68413b66
Audio-only mouth uses multiple blend shapes
2014-10-23 11:43:13 -07:00
Ryan
9495c2c87a
Merge remote-tracking branch 'hifi/master'
2014-10-23 08:01:43 -07:00
stojce
4e75837a64
Merge branch 'master' of https://github.com/highfidelity/hifi into 20143
2014-10-23 14:26:13 +02:00
Clément Brisset
b1b7114e66
Revert "Reverb"
2014-10-22 22:46:37 -07:00
Philip Rosedale
3ba3354e11
Merge pull request #3636 from Atlante45/reverb
...
Reverb
2014-10-22 21:51:57 -07:00
Clément Brisset
0525c562b0
Merge pull request #3643 from ctrlaltdavid/rift-calibration-countdown
...
Rift calibration countdown
2014-10-22 17:42:35 -07:00
Clément Brisset
bf9d467328
Merge pull request #3638 from huffman/entity-tools-updates
...
Entity tool fixes
2014-10-22 17:40:21 -07:00
Stephen Birarda
04416ff40c
fix for DataWebPage hifi link handling
2014-10-22 17:27:42 -07:00
David Rowe
0e3495986d
Add countdown to HMD calibration billboard
2014-10-22 16:58:10 -07:00
David Rowe
38d50a76eb
Add IsFacingAvatar getter and setter to Text3DOverlay
2014-10-22 16:47:40 -07:00
Ryan
883bb5aa68
Merge remote-tracking branch 'hifi/master'
2014-10-22 16:44:37 -07:00
Atlante45
8ccbfcf695
code cleanup
2014-10-22 16:41:41 -07:00
Stephen Birarda
7b0f1477a1
expose AvatarList to Interface SE, add avatarWithDisplayName method
2014-10-22 15:28:04 -07:00
Ryan Huffman
14555c4534
Add UndoStackScriptingInterface and support when editing entities
2014-10-22 14:54:04 -07:00
Atlante45
86c965a922
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb
2014-10-22 14:20:22 -07:00
Sam Gateau
d13283192f
Fix the bug happening on mac due to order in which parmaeters are evaluated for all of the gl calls, now fixed with an order independant code
2014-10-22 14:07:15 -07:00
Atlante45
ccc8e0d876
Statically link gverb
2014-10-22 12:56:44 -07:00
Stephen Birarda
e97aef581a
use InvokeMethod so that texture change happens on the right thread
2014-10-22 12:07:00 -07:00
Stephen Birarda
e079ec4363
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-10-22 12:03:46 -07:00
Ryan
2894a04027
Merge remote-tracking branch 'hifi/master'
2014-10-22 10:35:33 -07:00
Atlante45
e9d3729238
Remove unnecessary header
2014-10-22 10:30:46 -07:00
stojce
a3707a09ae
fix mirror ratio on retina
2014-10-22 09:42:55 +02:00
Brad Hefta-Gaub
f76d060de3
Revert "Record graphics API commands in a "gpu::Batch" to separate traversal from rendering"
2014-10-21 20:22:44 -07:00
Brad Hefta-Gaub
650660a0fc
Merge pull request #3632 from ey6es/metavoxels
...
Added network condition simulator for metavoxels, fixed crash issues with reliable deltas.
2014-10-21 18:36:11 -07:00
Sam Gateau
057c17fd2f
fix suseless spaces around parameters in functions
2014-10-21 18:14:26 -07:00
Sam Gateau
86819b9344
fix endline on Batch.cpp
2014-10-21 18:03:53 -07:00
Sam Gateau
f8f9383c43
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
2014-10-21 17:57:38 -07:00
Sam Gateau
821284edfd
Introduce the gpu::Batch for the full Model::render call
2014-10-21 17:46:41 -07:00
Andrzej Kapolka
4840c44d7c
Time calculation fix.
2014-10-21 17:41:41 -07:00
Andrzej Kapolka
311d1332f1
Include a simple bandwidth limit option.
2014-10-21 17:29:28 -07:00
Andrzej Kapolka
0f58b42795
Forgot these guys.
2014-10-21 16:27:26 -07:00
Stephen Birarda
fc39e82734
allow a texture change in ModelOverlay properties
2014-10-21 16:11:58 -07:00
Andrzej Kapolka
3d43e86faa
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-21 15:49:06 -07:00
Stephen Birarda
cc28fe958e
add a hack method to NetworkGeometry to change a material texture by name
2014-10-21 15:44:34 -07:00
Ryan
76afc32c1a
making hair look and move more like Rick James and less like Blondie
2014-10-21 15:28:06 -07:00
Clément Brisset
9476154375
Merge pull request #3628 from ZappoMan/master
...
add 3D text overlay support
2014-10-21 12:39:30 -07:00
ZappoMan
228de963ab
CR feedback
2014-10-21 12:28:44 -07:00
Stephen Birarda
047ee0a513
pipe texture names through to NetworkTexture
2014-10-21 12:20:12 -07:00
Andrzej Kapolka
02c6b5a8bf
Fix for send delay, delay ordering.
2014-10-21 12:16:55 -07:00
Andrzej Kapolka
5efb108e6c
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-21 11:45:43 -07:00
Sam Gateau
f090a1868c
qerge branch 'master' of https://github.com/highfidelity/hifi into temp0
...
q Please enter a commit message to explain why this merge is necessary,
2014-10-21 10:51:46 -07:00
Sam Gateau
00dbe486d9
FIrst working version of the GLBatching system introduced in the MOdelrendering path
2014-10-21 10:50:53 -07:00
ZappoMan
1b9565e575
cleanup
2014-10-21 08:25:04 -07:00
ZappoMan
956d7c73b2
removed debug
2014-10-21 08:21:01 -07:00
ZappoMan
99adb413e3
add 3D text overlay support
2014-10-21 08:20:15 -07:00
Philip Rosedale
4e605f5f67
First headMove "no-barf" version with lean/nod to walk, turn
2014-10-21 00:20:08 -07:00
Andrzej Kapolka
45fb31cd08
Basic network simulation for metavoxels.
2014-10-20 18:43:41 -07:00
Atlante45
94f66ef37a
Reverb logic tweaks
2014-10-20 15:35:01 -07:00
Atlante45
6f9557fe67
Do not destroy script reverb settings
2014-10-20 15:06:02 -07:00
Atlante45
85d56824a0
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb
2014-10-20 11:51:39 -07:00
Atlante45
37b47b52d3
Stream reverb settings from mixer to interface
2014-10-20 11:49:57 -07:00
AndrewMeadows
2569f70ac3
Merge pull request #3623 from ey6es/master
...
For FBX files with marked "skeleton" joints, only show those marked nodes in the upload dialog. Also added some more default node names to look for on upload.
2014-10-20 09:00:06 -07:00
AndrewMeadows
2e958599aa
Merge pull request #3621 from ey6es/metavoxels
...
Sculpt brush, very rough conversion of heightfield patches to dual contour surfaces on edit.
2014-10-20 08:55:01 -07:00
AndrewMeadows
f7c4804f33
Merge pull request #3613 from ctrlaltdavid/20112
...
CR for Job #20112 - chat alerts persist
2014-10-20 08:32:32 -07:00
Andrzej Kapolka
32c5f6e40e
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-17 18:28:16 -07:00
Andrzej Kapolka
da60a17b45
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-10-17 18:27:31 -07:00
Sam Gateau
0def490db7
startign to record all the gl commands in the Batch
2014-10-17 18:17:44 -07:00
Andrzej Kapolka
e98b99fe84
Merge pull request #3622 from birarda/domain-tunnel
...
work around double login issue by generating keypair on each launch
2014-10-17 18:05:45 -07:00
Andrzej Kapolka
c979ace924
Read the unit scale factor and include it in the offset scale.
2014-10-17 17:34:27 -07:00
Stephen Birarda
5882001311
Merge pull request #3619 from ZappoMan/modelOverlayRayPick
...
ray picking support for Model and 3D volume overlays
2014-10-17 17:03:37 -07:00
Andrzej Kapolka
1940fe67a0
Add jointEyeLeft/jointEyeRight/jointNeck to list of nodes we check for on
...
upload.
2014-10-17 16:57:15 -07:00
Stephen Birarda
5ecdb58e20
generate a new keypair on every interface launch
2014-10-17 16:55:50 -07:00
Andrzej Kapolka
1b9b0f9fc9
Look for and store the "Skeleton" type flag so that we can offer only skeleton
...
joints in the dropdown.
2014-10-17 16:51:55 -07:00
Atlante45
86b87770c2
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb
2014-10-17 16:50:19 -07:00
ZappoMan
61b53701f3
fix some comments
2014-10-17 16:07:08 -07:00
ZappoMan
70d718178d
make all volume3DOverlays handle proper ray picking against their rotated bounding box, make model overlays property ray pick as well
2014-10-17 13:36:37 -07:00
Atlante45
9ee0138ccf
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb
2014-10-17 10:50:08 -07:00
ZappoMan
fc507850be
Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles
2014-10-16 20:36:28 -07:00
Andrzej Kapolka
1fdfb51600
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-16 18:54:03 -07:00
Sam Gateau
a8c3b18e78
Adding the Batch class to GPU and fixing the compilation issues
2014-10-16 17:29:40 -07:00
Sam Gateau
f09133f413
Adding the Batch class to GPU
2014-10-16 17:23:31 -07:00
Brad Hefta-Gaub
a46610a7c1
Merge pull request #3609 from ZappoMan/groupMaterialsRendering
...
small optimization to model rendering
2014-10-16 16:24:28 -07:00
Andrew Meadows
c44a592032
longer lengths for experimental hair
2014-10-16 16:21:59 -07:00
ZappoMan
47f5d499f6
small optimization
2014-10-16 15:26:01 -07:00
Atlante45
5d146a00e7
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb
...
Conflicts:
interface/CMakeLists.txt
2014-10-16 15:21:34 -07:00
Andrzej Kapolka
fc6f0afb93
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-16 15:03:29 -07:00
samcake
a6b9fe34b5
Merge pull request #3606 from ZappoMan/groupMaterialsRendering
...
More Model::render() improvements
2014-10-16 14:42:37 -07:00
ZappoMan
148b880bb1
handle case of meshes with multiple parts with different materials better, don't mix them in with single material meshes
2014-10-16 14:32:07 -07:00
ZappoMan
d1f263ecc5
group materials together when rendering models
2014-10-16 14:05:35 -07:00
Andrzej Kapolka
459b9aba38
Gradual progress on converting heightfield portions to dual contour data.
2014-10-16 13:05:38 -07:00
Stephen Birarda
7bbaaf6b78
cleanup some username signature debug, fix interest list pull
2014-10-16 11:54:55 -07:00
AndrewMeadows
e75d2a167a
Merge pull request #3602 from ZappoMan/frustumCullModelParts
...
More Model::render() improvements
2014-10-16 11:04:57 -07:00
Atlante45
0f128509d8
removed old processReceivedAudio method
2014-10-16 10:58:19 -07:00
Brad Hefta-Gaub
866b3d40fc
Merge pull request #3604 from AndrewMeadows/inertia
...
experimental hair tuning
2014-10-16 10:53:31 -07:00
AndrewMeadows
4fbc589606
Merge pull request #3598 from birarda/domain-tunnel
...
initial pass at using keypairs for username verification for basic domain-server ACL
2014-10-16 10:49:03 -07:00
Andrew Meadows
8b54569480
experimental hair tuning submitted by Ryan
2014-10-16 10:20:12 -07:00
ZappoMan
ffb7bcf9d3
wire up different culling options to debug menus
2014-10-16 09:32:24 -07:00
ZappoMan
d238d06df5
build a cached lookup table for the shouldRenderMesh() LOD method
2014-10-16 01:00:32 -07:00
ZappoMan
bf77adc4bc
add support for LOD occulsion for too small meshes in Model::render()
2014-10-16 00:30:24 -07:00
Brad Hefta-Gaub
8ee26923da
Merge pull request #3600 from birarda/master
...
some dead code removal
2014-10-15 20:23:59 -07:00
ZappoMan
4c7ecba579
spelling change
2014-10-15 20:23:04 -07:00
