Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-29 15:17:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
19263 commits 76 branches 59 tags 1.2 GiB
Commit graph

9376 commits

Author SHA1 Message Date
Stephen Birarda
e2536dd3f8 remove a debug line 2014-10-27 16:55:24 -07:00
Stephen Birarda
80d9014726 have spacebar fire an action event at center of screen 2014-10-27 16:54:28 -07:00
Stephen Birarda
209c12cb1c repairs for texture replacement by name 2014-10-27 16:52:22 -07:00
Stephen Birarda
bb652c0784 rename signal in AbstractControllerScriptingInterface from cancel to back 2014-10-27 16:01:39 -07:00
Stephen Birarda
8e6b6d5294 have controller A button fire action at center of screen 2014-10-27 15:58:42 -07:00
Stephen Birarda
8a9f2d172a rename HFCancelEvent to HFBackEvent, fire from joystick 2014-10-27 15:51:59 -07:00
Stephen Birarda
04e7e979aa bubble up HFCancelEvent from ESC key 2014-10-27 15:42:40 -07:00
Stephen Birarda
7b5115c35f add a new meta event, HFCancelEvent 2014-10-27 15:37:31 -07:00
ZappoMan
c17ffe9433 add the new properties to LightEntityItem class 2014-10-27 15:31:21 -07:00
Stephen Birarda
c3fe7c7497 send global HFActionEvent from ControllerScriptingInterface 2014-10-27 15:21:47 -07:00
Andrzej Kapolka
4ab90ce49c Avoid killing the updater twice. 2014-10-27 15:04:03 -07:00
Andrzej Kapolka
7bcc267cb5 Fix for crash on exit. 2014-10-27 15:01:06 -07:00
Sam Gateau
6101c3b758 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-10-27 14:55:42 -07:00
Stephen Birarda
d38dd2c53a repairs for recursive source files, move HF meta events to SE 2014-10-27 14:18:23 -07:00
Stephen Birarda
0ddf665b86 add an HFMetaEvent class as super class for meta events 2014-10-27 12:56:48 -07:00
Sam Gateau
89f9e5b01b try to get more coherent names 2014-10-27 11:49:51 -07:00
Sam Gateau
ff44a460d6 Add NSIGHT Profiliing capability 2014-10-27 11:40:52 -07:00
Stephen Birarda
6626787ae5 have mouse press/release fire HFActionEvent 2014-10-27 11:40:33 -07:00
Stephen Birarda
55735a3f0d add start and end to HFActionEvent 2014-10-27 11:11:23 -07:00
David Rowe
07630755d4 Fix braces 2014-10-27 11:03:34 -07:00
Stephen Birarda
d09c9233d8 add position to HFActionEvent 2014-10-27 10:55:16 -07:00
AndrewMeadows
9d93ec5a5a Merge pull request #3656 from huffman/separate-camera-tool 
Add camera move tool for editing
 2014-10-27 10:54:02 -07:00
Stephen Birarda
b7ebc9e902 add a class for custom HFActionEvent 2014-10-27 10:51:48 -07:00
Andrew Meadows
f25cfc0c7f remove debug code 2014-10-27 10:22:40 -07:00
Andrew Meadows
c1728c0296 Merge upstream/master into andrew/experimental 2014-10-27 10:08:48 -07:00
Stephen Birarda
d5a3ea77ff Merge branch 'master' of https://github.com/highfidelity/hifi into lobby 2014-10-27 09:28:50 -07:00
Pete
8d97a20bd9 Worklist #20074 
- Add new Preferences item for Oculus Max FPS, defaults to 75, range is
[30, 95]
- Load and save this value appropriately
- When VR mode is enabled/disabled, set the Render Target Framerate to
this value/unlimited
 2014-10-26 21:14:20 -07:00
Stojce
61c80183ad fix for mirror size on different scale resloutions 2014-10-26 08:12:07 +01:00
David Rowe
0fdcf381fa Code tidy 2014-10-25 09:23:37 -07:00
David Rowe
c6463abfb8 Prevent keys captured by script from being used as menu shortcuts 2014-10-25 09:22:30 -07:00
David Rowe
5f91f583e8 Merge branch 'master' into 19976 
Conflicts:
	interface/CMakeLists.txt
 2014-10-24 20:34:45 -07:00
David Rowe
f373719f02 Don't include speech recognition if building with Visual Studio Express 2014-10-24 20:12:23 -07:00
Philip Rosedale
2dff75dac1 Merge pull request #3665 from stojce/20143 
CR for Job #20143 - BUG:  Rearview mirror rendering at wrong size
 2014-10-24 19:45:26 -07:00
Sam Gateau
334e032c17 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-10-24 17:58:54 -07:00
Sam Gateau
80a87b3b44 framerate is as fast as the display can go 2014-10-24 17:50:31 -07:00
David Rowe
55436eba9a Don't "fail" loading speech commands if none to load 2014-10-24 17:45:37 -07:00
Stephen Birarda
57e7fa233f Merge pull request #3664 from PhilipRosedale/master 
Tour Guide script to let you follow people, better hair
 2014-10-24 17:10:57 -07:00
Philip Rosedale
33204b0d27 Merge pull request #3660 from birarda/xbox-controller 
add a guard in case SDL misreports number of axes
 2014-10-24 17:06:51 -07:00
Andrzej Kapolka
8684384316 Disconnect metavoxel LOD from avatar LOD. 2014-10-24 16:38:57 -07:00
Philip Rosedale
d5d0fbd9d8 Hair gravity always the same 2014-10-24 16:08:01 -07:00
David Rowe
38524b3349 Merge branch 'master' into 19976 2014-10-24 15:43:55 -07:00
Stephen Birarda
fa174029fd Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-24 15:26:39 -07:00
Stephen Birarda
c57fc314f0 just resize axis vector is sdl decides to lie about the number of axes 2014-10-24 15:13:54 -07:00
Stephen Birarda
9289249df5 add a guard in case SDL somehow forgets about axes 2014-10-24 15:06:18 -07:00
Atlante45
66b15230e7 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_fixed 2014-10-24 15:02:29 -07:00
Atlante45
847ef64b66 move audio env data over to new packet 2014-10-24 14:27:55 -07:00
Philip Rosedale
ab557447f2 fix uninitialized mouth blending variables 2014-10-24 12:51:54 -07:00
Stephen Birarda
3b436e04ae Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-24 09:43:04 -07:00
Sam Gateau
5b0fd99115 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-10-24 09:28:13 -07:00
AndrewMeadows
31a1b8bb06 Merge pull request #3651 from PhilipRosedale/master 
Better animation for audio-only mouth movement
 2014-10-24 08:46:32 -07:00
Philip Rosedale
e5d64a0d5d Merge pull request #3644 from birarda/data-web-page 
fix for DataWeb hifi link handling
 2014-10-23 21:11:32 -07:00
Philip Rosedale
3f7df5962d Merge pull request #3657 from ey6es/metavoxels 
Further incremental improvements to heightfield voxelization.
 2014-10-23 21:10:21 -07:00
Andrzej Kapolka
003d2f031a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-23 16:15:11 -07:00
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
David Rowe
e514f345e1 Change to use dedicated speech recognition engine instead of shared 2014-10-22 14:35:09 -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
David Rowe
375c71d2ef Tidying 2014-10-22 11:38:45 -07:00
David Rowe
69b1c4273f Tidy object management 2014-10-22 11:27:06 -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
David Rowe
a45d4b2d7d Add first pass at Windows speech recognizer implementation 2014-10-22 10:17:29 -07:00
ZappoMan
2f9766e051 first cut at light entity 2014-10-22 08:41:31 -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
David Rowe
66a2639fae Add non-SAPI specific functionality 2014-10-20 14:04:19 -07:00
David Rowe
524c413681 Enable SpeechRecognizer menu item and JavaScript object for Windows 2014-10-20 13:52:37 -07:00
David Rowe
f872902ab9 Add stubs for Windows SpeechRecognizer interface 2014-10-20 13:40:11 -07:00
David Rowe
7566b7e546 Add SpeechRecognizer.h and .cpp to Windows builds 2014-10-20 13:26:51 -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
ZappoMan
921a3fb8c0 switch QList<> to QVector<> and add some guards against out of range indices 2014-10-15 20:18:04 -07:00
samcake
01b64d78e3 Merge pull request #3601 from ZappoMan/frustumCullModelParts 
Implement "segregation" of mesh groups
 2014-10-15 18:09:48 -07:00
ZappoMan
56b4d58f18 implement mesh groups and pull out shader programs in renderMeshes() to outside the loop based on group 2014-10-15 17:08:47 -07:00
Stephen Birarda
fcd73858b8 remove Faceplus as a face tracker option 2014-10-15 15:13:52 -07:00
ZappoMan
8a83511942 first cut at separating opaque from transparent meshes 2014-10-15 14:40:42 -07:00
ZappoMan
c8db8855cc move tallyAllTimerRecords out of conditional so they don't pile up 2014-10-15 14:23:29 -07:00
AndrewMeadows
8372975bad Merge pull request #3582 from PhilipRosedale/master 
'Ribbons' that are driven by audio loudness and tuned/draped for mask avatars
 2014-10-15 14:08:20 -07:00
ZappoMan
3a6715c0bc improve timing stats display 2014-10-15 14:00:56 -07:00
ZappoMan
46cb780aa5 view cull mesh parts 2014-10-15 10:08:21 -07:00
ZappoMan
eab96587fe add stats for entity rendering details 2014-10-15 09:24:58 -07:00
ZappoMan
da4c179a9f correctly track rendered entities 2014-10-15 09:23:59 -07:00
ZappoMan
8c37181635 add menu item for enable/disable culling of model parts 2014-10-15 09:23:27 -07:00
Stephen Birarda
e9bcc90166 handle remaining conversions for AccountManager passing QNetworkReply 2014-10-14 16:16:54 -07:00
Stephen Birarda
c4b0dc9dcc initial handling of username signature in domain-server 2014-10-14 16:03:35 -07:00
Andrzej Kapolka
fba383f6d3 Render voxel cursor on heightfields, too. 2014-10-14 15:21:45 -07:00
Atlante45
4a3f72ab0b Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-14 15:13:50 -07:00
Andrzej Kapolka
394bf2b4ee Basic sculpt tool, refactored common material bits in tools. 2014-10-14 14:37:32 -07:00
Stephen Birarda
22b599b8cc repair for persisting of Account to file after keypair generation 2014-10-14 14:21:18 -07:00
Andrzej Kapolka
ff368f9848 Merge pull request #3592 from samcake/temp0 
Rendering resolution can be different than the native window resolution
 2014-10-14 11:56:50 -07:00
Stephen Birarda
69402e275c use DER format for generated keys in RSAKeypairGenerator 2014-10-14 11:51:58 -07:00
Stephen Birarda
5f67194564 fix member variable order in Joystick class 2014-10-14 11:39:28 -07:00
Stephen Birarda
d0f91c5c2e remove old mechanism for octree payments 2014-10-14 11:38:50 -07:00
Stephen Birarda
912512936e add RSAKeypairGenerator to generate a 2048-bit keypair 2014-10-14 11:36:40 -07:00
David Rowe
a619d0460d Show chat alerts in icon tray only if not already seen 2014-10-14 11:08:24 -07:00
David Rowe
5151563b79 Coding standard 2014-10-14 11:08:02 -07:00
Stephen Birarda
cca8b68d2e update location and profile paths for new format 2014-10-14 10:40:58 -07:00
AndrewMeadows
2a35c4af4d Merge pull request #3593 from huffman/20024 
CR for Job #20024 - UI edits to Running Scripts dialog
 2014-10-14 09:52:13 -07:00
Stephen Birarda
20f97792bf Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-14 09:26:11 -07:00
Sam Gateau
153d3b532b merged with upstream, all clear 2014-10-14 00:19:19 -07:00
samcake
e7af0cbe7f Using the correct scaling factor for the avatar display name call. CHanged the scale coming from the widget.devicePixelRatio to the actual RenderResolutionScale we assign in the Application 2014-10-14 00:08:29 -07:00
Sam Gateau
113fb1908a fix the first issues 2014-10-13 23:28:43 -07:00
NextPrior
a0a5530641 Initial reverb implementation 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Audio.cpp
	interface/src/Audio.h
	libraries/script-engine/src/ScriptEngine.cpp
 2014-10-13 18:13:51 -07:00
samcake
700ec5cf79 Rendering resolution can be different than the native window resolution 
- Get rid of the different GlowModes since we found the correct one (DIFFUSE and ADD)
  Get rid of the ui to change the mode

- INtroduce a "RenderResolutionScale" in the application that controls the ratio ofthe resolution between the framebuffers and the native window provided by Qt

- In the paintGL, in the default rendering path:
  the rendering Framebuffers are resized to the window.size * renderResolutionScale.
  The viewport is assigned to the framebuffer size from GlowEffect.prepare() to GlowEffect.render() (and not the original GLCanvas size)
  at the end of GLowEffect render, the final step is to blit the colorbuffer from the rendering into the window's default framebuffer at the original resolution, and that requires one more glViewport

- add the ui in developer/render/ menu "scale resolution" where you can select the scaling level. THis should show in the rendering with ugly aliasing when selecting a scale under 1/2.
 2014-10-13 18:00:50 -07:00
Andrzej Kapolka
00490af837 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-13 17:59:35 -07:00
Clément Brisset
87d067c8f0 Merge pull request #3590 from ctrlaltdavid/extra-logging 
Minor logging improvements
 2014-10-13 16:20:43 -07:00
Clément Brisset
f6f187e7f0 Merge pull request #3587 from ctrlaltdavid/20101 
CR for Job #20101 - Upload model file function is broken
 2014-10-13 16:16:49 -07:00
Clément Brisset
9d050782cc Merge pull request #3586 from ctrlaltdavid/20093 
CR for Job #20093 - Add a menu item corresponding to the apostrophe key (reset sensors)
 2014-10-13 16:14:04 -07:00
Andrzej Kapolka
fcbdf04c19 Apply alpha restrictions when we apply the edit. 2014-10-13 16:01:38 -07:00
Andrzej Kapolka
13efaba22c Basic metavoxels example. 2014-10-13 15:34:38 -07:00
Andrzej Kapolka
60576bdcbd Basic metavoxel scripting bits. 2014-10-13 15:05:16 -07:00
ZappoMan
c7d544cd58 wire up collision signals 2014-10-13 14:36:06 -07:00
ZappoMan
4c85e9f581 removing particles 2014-10-13 14:10:57 -07:00
David Rowe
958acfcfe0 Fix version logging include to include build number and write in log 2014-10-13 13:23:31 -07:00
David Rowe
bd9451d4c6 Log Oculus SDK version used in build 2014-10-13 13:20:24 -07:00
AndrewMeadows
d90d30ad9f Merge pull request #3585 from ZappoMan/editToolsImprovements 
various edit tool fixes
 2014-10-13 10:12:47 -07:00
AndrewMeadows
3d888b6c27 Merge pull request #3584 from huffman/sdl-update 
Update to SDL2
 2014-10-13 09:37:16 -07:00
Philip Rosedale
99e596ae7e really remove file 2014-10-13 17:35:00 +01:00
Philip Rosedale
c4000eb468 fix windows error 2014-10-13 17:33:01 +01:00
David Rowe
c6bf09f509 Fix model uploading for the case that haven't uploaded model before 2014-10-13 08:35:52 -07:00
Philip Rosedale
18979adf23 remove startup debug from buckyballs 2014-10-12 20:42:53 -07:00
Philip Rosedale
e5f93d00ac remove unused utility functions 2014-10-12 20:42:15 -07:00
Philip Rosedale
dc09572776 remove unused functions 2014-10-12 20:17:20 -07:00
Philip Rosedale
bc6346c257 Removed unused constant, class 2014-10-12 20:14:51 -07:00
Philip Rosedale
a054408abb Merge branch 'master' of https://github.com/worklist/hifi 2014-10-12 17:04:37 -07:00
ZappoMan
a08ddecc3a fix shifting tickmarks 2014-10-10 22:06:12 -07:00
Ryan Huffman
42479b1ae2 Add joystickWithName for PrioVR 2014-10-10 18:03:08 -07:00
Ryan Huffman
a24b5c24a9 Update max axis value to reflect maximum negative value 2014-10-10 17:28:09 -07:00
Andrzej Kapolka
dc8dc112c9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-10 17:19:24 -07:00
Andrzej Kapolka
60da0f1567 Allow drawing cursor on dual contour surface, wired up material paint tool. 2014-10-10 17:18:52 -07:00
Philip Rosedale
9be2b33971 Hair draped for masks and driven by audio loudness 2014-10-10 17:06:11 -07:00
Ryan Huffman
762cc71d31 Update to SDL2 2014-10-10 17:03:10 -07:00
Andrzej Kapolka
1911cfd0be Basic ray/voxel intersection testing up and running. 2014-10-10 15:11:37 -07:00
Stephen Birarda
21114d5f56 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-10 14:30:43 -07:00
Stephen Birarda
df6f4d4c95 remove cara face tracking, cleanup warnings 2014-10-10 14:17:52 -07:00
David Rowe
edf8cb671d Add "reset sensors" menu item corresponding to the apostrophe key 2014-10-10 13:24:48 -07:00
Andrzej Kapolka
c8c09a1e7b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-10 13:02:10 -07:00
David Rowe
b718d27ac6 Merge branch 'master' into 20073 2014-10-10 12:04:36 -07:00
David Rowe
357d49d442 Fix building without Oculus library 2014-10-10 11:36:47 -07:00
David Rowe
b0f4bc0d1c Tidy up log messages 2014-10-10 11:08:15 -07:00
David Rowe
0a5fdee1f2 Use NULL rather than 0 for "no overlay" 2014-10-10 11:00:41 -07:00
David Rowe
aa37ba5dfd Use const parameters 2014-10-10 10:57:17 -07:00
David Rowe
64d9a96a2b Update SVG file location 2014-10-10 10:42:13 -07:00
Stephen Birarda
76d00f351d Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-10 09:28:14 -07:00
AndrewMeadows
2a8b002725 Merge pull request #3576 from ZappoMan/editToolsImprovements 
First cut at new rotation UI/UX
 2014-10-10 08:17:22 -07:00
Brad Hefta-Gaub
961590414c Merge pull request #3574 from PhilipRosedale/master 
Oculus fixed for 3rd person and fullscreen mirror view
 2014-10-09 21:30:18 -07:00
ZappoMan
8105ded4eb handle reloading a new url in billboard overlays 2014-10-09 21:12:05 -07:00
Andrzej Kapolka
7b0d002355 Working on ray/voxel intersection testing. 2014-10-09 19:51:02 -07:00
ZappoMan
e5572e9deb don't render if alpha is 0 2014-10-09 19:20:33 -07:00
Andrzej Kapolka
51ff4cf7bb Merge pull request #3567 from samcake/master 
Improve the TextRenderer::draw(), step 1
 2014-10-09 18:46:23 -07:00
Sam Gateau
6687660d2f Fixing Andrzej's comments bis 2014-10-09 17:29:06 -07:00
Sam Gateau
1fc78e4277 Fixing Andrzej's comments 2014-10-09 17:18:51 -07:00
Stephen Birarda
31df339565 pipe username signature requirement through to DomainHandler 2014-10-09 16:53:22 -07:00
Philip Rosedale
f18faf9e3e removed commented code. 2014-10-09 16:46:06 -07:00
Philip Rosedale
2da4345b21 First person and mirror HMD view almost fixed 2014-10-09 13:32:35 -07:00
Sam Gateau
86c20b26eb Adding proper TODO and comments 2014-10-09 12:20:46 -07:00
Sam Gateau
d080d6347b Fixing const usage on a template function 2014-10-09 11:10:04 -07:00
Sam Gateau
b0c02311c0 Fixing include filename case 2014-10-09 10:56:41 -07:00
Sam Gateau
adc4e8c513 Fixing unix file format issues with msdev2010 2014-10-09 10:39:28 -07:00
samcake
9f0936de53 Improve the TextRenderer::draw(), first step 
- Introduce a managed Buffer for data to be used on the GPU. THis is the first type of resource (second will be texture) that we plan to    use in the graphics engine in the long term. this is an api agnostic replacement to QGLBuggerObject
  It's in the new file gpu/Resource.h(.cpp)

- Add two gpu::Buffers in the TextRenderer that collect all the glyph vertices (coords + texcoords + color) during the for loop on the string characters of the TextRenderer::draw(). Right now the text glyphs are then drawn in one draw call (and not one per character) at the end of the function.

THe step 2 plan is to keep on collecting all the glyphs from all the TextRenderer::Draw() issued during one frame and to draw all of them in a single drawcall. We decided to split the task in 2 so it's easier to review.
 2014-10-09 10:17:50 -07:00
ZappoMan
2004159778 implement basic support for planar overlay type intersections 2014-10-08 20:29:53 -07:00
Brad Hefta-Gaub
c9c3ab985a Merge pull request #3565 from PhilipRosedale/master 
Simplify camera class to have no interpolation, simpler structure
 2014-10-08 17:06:21 -07:00
Brad Hefta-Gaub
80e82c95ca Merge pull request #3560 from birarda/xbox-controller 
allow a call to Joysticks.reset to reset SDL while interface is running
 2014-10-08 17:06:12 -07:00
Philip Rosedale
01bef6be6d remove unused cameraPushback variable 2014-10-08 15:28:29 -07:00
Andrzej Kapolka
19ec68309b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-08 15:22:17 -07:00
Andrzej Kapolka
37eff685bc Remove the "render lower detail as points" option. It doesn't seem too 
promising.
 2014-10-08 15:11:55 -07:00
Andrzej Kapolka
b5b82ed387 Provide the option to display lower detail metavoxel data as points. 2014-10-08 14:05:14 -07:00
Stephen Birarda
ce505c1b0c add a missing HAVE_SDL wrap on setter in Joystick 2014-10-08 12:09:40 -07:00
Clément Brisset
e4f5f11429 Merge pull request #3557 from birarda/master 
fix for window modalities
 2014-10-08 11:53:48 -07:00
David Rowe
05915ae134 Make calibration message update its location more often 2014-10-08 11:53:07 -07:00
Andrzej Kapolka
049a00b85b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-08 11:51:10 -07:00
Stephen Birarda
8e2d41f37f remove deadzone handling from Joystick class 2014-10-08 11:41:07 -07:00
AndrewMeadows
4873528068 Merge pull request #3543 from birarda/domain-tunnel 
handle local socket changes when moving networks for auto networked domains
 2014-10-08 11:36:56 -07:00
Stephen Birarda
17b9f4a37d allow a call to Joysticks.reset to reset SDL while interface is running 2014-10-08 11:34:45 -07:00
Philip Rosedale
12349a8854 Fix rearview mirror camera 2014-10-08 10:59:46 -07:00
Philip Rosedale
00c182ad7b Fix full screen mirror keyboard controls 2014-10-08 10:51:06 -07:00
Philip Rosedale
2636fdd3cb Fix third person camera distance 2014-10-08 10:23:45 -07:00
Stephen Birarda
b0a99c48a7 don't force metavoxel editor to stay on top 2014-10-08 10:05:13 -07:00
Stephen Birarda
a8a8b81386 don't make long and address bar modal so they don't steal input 2014-10-08 10:00:50 -07:00
Philip Rosedale
c4c9f4820d First pass at simplifying camera, removes interpolation to target and setbacks 2014-10-08 10:00:47 -07:00
Stephen Birarda
3794e166ad change LoginDialog modality so it doesn't steal input 2014-10-08 09:51:16 -07:00
AndrewMeadows
c56923d316 Merge pull request #3549 from ZappoMan/editToolsImprovements 
add tick marks to planar ellipse/circle overlays
 2014-10-08 09:33:34 -07:00
Stephen Birarda
7773a94df7 resolve conflicts on merge with upstream master 2014-10-08 09:27:16 -07:00
Sam Gateau
dda7c6699e backup current work on TextRenderer 2014-10-07 23:52:00 -07:00
Philip Rosedale
f4b9ccbceb remove unused camera functions 2014-10-07 21:51:46 -07:00
Andrzej Kapolka
04b628bede Added option to display Hermite data 2014-10-07 16:44:55 -07:00
Stephen Birarda
6e81bde7bd make position path clearer for address bar 2014-10-07 15:30:44 -07:00
Stephen Birarda
ec6b6999a0 fix for location hash in address bar 2014-10-07 15:29:57 -07:00
Andrzej Kapolka
604fc84232 More fiddling with averages. 2014-10-07 14:33:01 -07:00
Stephen Birarda
ea4c5a8900 repairs for new user scoped paths 2014-10-07 14:18:05 -07:00
Andrzej Kapolka
c9fb73ecf8 Playing around with using points to represent distant voxel surfaces. 2014-10-06 18:52:10 -07:00
Andrzej Kapolka
9fc0abe2b3 Working on metavoxel averaging. Still pretty rough. 2014-10-06 17:30:28 -07:00
David Rowe
ebf615fc30 Fix header declaration 2014-10-06 17:25:40 -07:00
Philip Rosedale
63730a37da Bring initial walk speed down for easier maneuvering around people 2014-10-06 15:26:47 -07:00
Stephen Birarda
b4cfce8ffa final NetworkAccessManager return repairs 2014-10-06 14:58:23 -07:00
Stephen Birarda
a358b4e2af repair another reference to NetworkAccessManager 2014-10-06 14:57:54 -07:00
Stephen Birarda
f19c5c9850 repair NetworkAccessManager returns, handle custom AS port in assignment-client 2014-10-06 14:57:38 -07:00
Philip Rosedale
8084c5c77d Merge pull request #3552 from AndrewMeadows/inertia 
Tweak low velocity avatar keyboard control.
 2014-10-06 14:56:38 -07:00
Stephen Birarda
2d3f3edcad Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-06 14:31:39 -07:00
Andrew Meadows
6aba2359ed Tweak low velocity avatar keyboard control. 2014-10-06 14:27:43 -07:00
Leonardo Murillo
65b559ca3d Missed one 2014-10-06 15:21:51 -06:00
ZappoMan
12deec928c add tick marks to planar ellipse/circle overlays 2014-10-06 14:15:22 -07:00
Andrzej Kapolka
0d5f81c062 Merge pull request #3540 from samcake/temp0 
replacing glutSolidSPhere by a cached Geometry
 2014-10-06 12:23:44 -07:00
Sam Gateau
ba2d072a65 fix syntax issues for constant names and the CmakeLists.txt useless change 2014-10-06 12:15:36 -07:00
Sam Gateau
4f26c9e0fa fix formatting and syntax issues 2014-10-06 11:06:23 -07:00
Leonardo Murillo
0b7ff18970 Changes in non-Js code 2014-10-06 11:24:10 -06:00
Stephen Birarda
f89b225da2 handle local socket changes by monitoring every so often 2014-10-06 09:17:25 -07:00
AndrewMeadows
85a2d297d4 Merge pull request #3535 from stojce/20061 
CR for Job #20061 - Style our address bar / "go to" UI
 2014-10-06 07:57:00 -07:00
AndrewMeadows
a91d66d8bb Merge pull request #3533 from stojce/20091 
CR for Job #20091 - Windows : Popup to download update is unreadable on Windows (see attached screenshot)
 2014-10-06 07:53:44 -07:00
Andrew Meadows
01a3eaa26b added experimental MyAvatar.setSkeletonOffset() 
for improved walk animations
 2014-10-05 19:10:55 -07:00
David Rowe
32399d8620 Delete calibration message if exit VR display while calibrating 2014-10-04 20:07:37 -07:00
David Rowe
6992b41c5c Fix avatar rotation erroneously initiating HMD calibration 2014-10-04 19:53:00 -07:00
David Rowe
817da8ca05 Display a static billboard prompting user to hold still to calibrate HMD 2014-10-04 19:33:24 -07:00
David Rowe
614f5314f2 Add some property setters to the billboard overlay 2014-10-04 19:32:20 -07:00
David Rowe
fc24d96947 Make overlays accessible from C++ code 2014-10-04 19:31:52 -07:00
Sam Gateau
bd5c6517a5 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 
Conflicts:
	interface/src/ui/MetavoxelEditor.cpp
	interface/src/ui/overlays/Sphere3DOverlay.cpp
 2014-10-03 17:31:05 -07:00
Stephen Birarda
5203113b41 separate ICE ID and domain ID for reconnections to moved domains 2014-10-03 17:01:33 -07:00
Sam Gateau
738369e21f Replacing glutSolidSphere by a cached Geometry 
Instead of calling glutSolidSphere, just call Application::getInstance()->getGeometryCache()->renderSphere(...)

- replaced all the instances of "glutSolidSphere"
- Changed the atmosphere shaders so instead of drawing a sphere of the size of the atmosphere, we draw a unit sphere, the vertices get scaled at the right radius in th vertex shader using  fOuterRadius
 2014-10-03 16:55:58 -07:00
Stephen Birarda
e32de3208d Merge pull request #3538 from birarda/hydra-crash 
fix for path for hydras in installer release
 2014-10-03 15:34:25 -07:00
Stephen Birarda
2ce2c9e953 add a missing slash in path for release hydra support 2014-10-03 15:33:51 -07:00
Andrzej Kapolka
7c942e1010 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-03 13:53:11 -07:00
Andrzej Kapolka
78825f0c4d Fix for normalization crash. 2014-10-03 13:52:50 -07:00
David Rowe
0a4bc2bc48 Add VR display auto-calibration user message calculations 2014-10-03 13:47:11 -07:00
David Rowe
d3b37684cd Add VR display auto-calibration logic 2014-10-03 13:46:41 -07:00
Stephen Birarda
52ec949aac Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-03 11:26:23 -07:00
Stephen Birarda
ea0a1a4fb6 don't store domain hostname, leverage AddressManager only 2014-10-03 10:46:05 -07:00
Stephen Birarda
96aacab8ab load Address from settings to get back to domain and path 2014-10-03 10:42:15 -07:00
Stephen Birarda
f27105100a have AddressManager know its current domain and current path 2014-10-03 10:29:02 -07:00
Philip Rosedale
56c71b667b Merge pull request #3530 from ZappoMan/editToolsImprovements 
Experimental Version of new Entity Editing UI/UX
 2014-10-03 10:26:09 -07:00
ZappoMan
6846426f23 CR feedback 2014-10-03 10:13:56 -07:00
ZappoMan
cd6adb8f28 CR feedback 2014-10-03 10:13:09 -07:00
ZappoMan
f6b8a51074 CR feedback 2014-10-03 10:03:54 -07:00
ZappoMan
46d96c22fa CR feedback 2014-10-03 10:01:58 -07:00
ZappoMan
602404c569 CR feedback 2014-10-03 09:55:29 -07:00
ZappoMan
4ab0a8e13d CR feedback 2014-10-03 09:49:54 -07:00
ZappoMan
00799e39e1 CR feedback 2014-10-03 09:48:54 -07:00
ZappoMan
467e9b1831 CR feedback 2014-10-03 09:47:17 -07:00
ZappoMan
515789927b fix float defines from CR feedback 2014-10-03 09:43:46 -07:00
Philip Rosedale
84b2bc14c0 Merge pull request #3526 from ey6es/metavoxels 
Tweaks to the way dual contour edits are performed, added cuboid shape and made snapping to grid optional for boxes.
 2014-10-03 09:08:18 -07:00
stojce
a1d3e3289c close icon size fix 2014-10-03 14:51:29 +02:00
stojce
429ddd7115 address bar style fix 2014-10-03 14:30:03 +02:00
stojce
6d9091e35f Merge branch 'master' of https://github.com/highfidelity/hifi into 20091 2014-10-03 14:22:13 +02:00
stojce
420326b212 Layout changes 2014-10-03 14:21:05 +02:00
stojce
be5f348e22 Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 2014-10-03 14:03:13 +02:00
stojce
f2095dacbd more dialog fixes 2014-10-03 13:45:26 +02:00
ZappoMan
023916e7e5 Merge branch 'master' of https://github.com/highfidelity/hifi into editToolsImprovements 2014-10-03 04:25:24 -07:00
ZappoMan
f59185c00b allow 3d overlays to be ignored from ray intersection 2014-10-03 03:02:54 -07:00
ZappoMan
175e5d5f79 add ray picking to 3D overlays 2014-10-02 20:44:49 -07:00
ZappoMan
a04941bcd5 removed some old debug 2014-10-02 17:56:31 -07:00
Andrzej Kapolka
c67f421ea9 Generate additional vertices with different normals when normals differ by 
"crease" angle.
 2014-10-02 17:25:44 -07:00
Ryan Huffman
5813e3098c Remove redundant code 2014-10-02 16:30:30 -07:00
Ryan Huffman
1976d1f1e2 Update runningScripts layout and add tip message 2014-10-02 16:27:02 -07:00
Ryan Huffman
fe8909ff0e Change reloadAllScripts shortcut 2014-10-02 16:26:32 -07:00
ZappoMan
d666f9ce98 Merge branch 'master' of https://github.com/highfidelity/hifi into editToolsImprovements 
Conflicts:
	examples/editModels.js
 2014-10-02 15:17:59 -07:00
Stephen Birarda
8cb258e14c don't use just filename when searching in application framework 2014-10-02 14:35:54 -07:00
Stephen Birarda
262054d0eb handle ICE requirement in address manager response 2014-10-02 14:18:17 -07:00
Andrzej Kapolka
27099f6dcd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-02 13:03:00 -07:00
Andrzej Kapolka
4e19cc21f6 Remove the "box edit" in favor of using the spanner edit. 2014-10-02 13:01:39 -07:00
Andrzej Kapolka
bce0147776 Added aspect fields to cuboids. 2014-10-02 12:51:56 -07:00
Stephen Birarda
138e57bcd8 don't set SIXENSE_LIB_FILENAME for INSTALLER_BUILD 2014-10-02 11:16:25 -07:00
ZappoMan
5bcbfe96b8 add alpha color support to billboard overlay 2014-10-02 10:19:08 -07:00
ZappoMan
b2e725c964 add dashed line support to cube overlay 2014-10-02 10:18:42 -07:00
Stephen Birarda
172ee3d7dc add failsafe for hydra load, look in app frameworks folder 2014-10-02 09:06:29 -07:00
Andrzej Kapolka
42e95f2b38 Working on spanner metavoxel edits. 2014-10-01 18:46:23 -07:00
stojce
9c926d9e67 Layout changes 2014-10-02 00:17:57 +02:00
stojce
afc27b8a8b Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 2014-10-01 23:36:30 +02:00
Andrzej Kapolka
1ca212f43d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-01 11:55:27 -07:00
ZappoMan
94c2540db0 add dashed line drawing to Base3DOverlay and 3d line and rectangle overlays 2014-10-01 09:45:20 -07:00
ZappoMan
7a9be9e5b9 implement support for localRenderAlpha property in the rendering portion of entities 2014-10-01 09:43:59 -07:00
Philip Rosedale
8f40780af0 Merge pull request #3517 from ctrlaltdavid/20048 
CR for Job #20048 - Leap - Make leapHands.js work with Leap-on-Rift
 2014-09-30 21:06:45 -07:00
Andrzej Kapolka
14267e3902 Layout tweak. 2014-09-30 15:42:33 -07:00
Andrzej Kapolka
add7ad4d4e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-30 15:21:27 -07:00
Andrzej Kapolka
5d2f6b98e2 Added erase buttons, initialize color editor on creation. 2014-09-30 15:20:24 -07:00
Andrzej Kapolka
70847ff3f9 Allow painting boxes that aren't grid-aligned; merged color and material 
tools.
 2014-09-30 14:53:19 -07:00
ZappoMan
c3b0700601 introduce Planar3DOverlay for common features of rectangle and circle, introduced rectanglular 3D plane 2014-09-30 14:52:44 -07:00
Thijs Wenker
fd21d100f6 line indention fixes 2014-09-30 22:37:29 +02:00
Thijs Wenker
bacad6bcd2 Merge branch 'editmodels_js-model-list' of https://github.com/thoys/hifi 2014-09-30 22:33:50 +02:00
Thijs Wenker
110e26a9e9 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-30 22:32:35 +02:00
Thijs Wenker
7f34079d8f cleared comment 2014-09-30 22:31:41 +02:00
Philip Rosedale
e624058c14 Merge pull request #3514 from birarda/hydra-crash 
fix for debug build without sixense library
 2014-09-30 13:24:17 -07:00
Thijs Wenker
eed6e2e8f6 - Edit -> Model List menu option 
- Combo items can be JS objects now, write a toString() function for each JS object to describe them
 2014-09-30 22:11:21 +02:00
Andrzej Kapolka
001af5f982 Simplify the message situation by removing color-only edits. 2014-09-30 12:17:35 -07:00
Andrzej Kapolka
e01113d2a7 Simplifications suggested by Andrew. 2014-09-30 12:01:44 -07:00
Stephen Birarda
39ee62608b ensure HAVE_SIXENSE is defined to define _sixenseLibrary 2014-09-30 11:35:53 -07:00
ZappoMan
7fc6eecca7 added support for dashed lines for 3D Circle overlays 2014-09-30 11:27:16 -07:00
ZappoMan
16cdc2614f added circle overlays 2014-09-30 10:06:39 -07:00
David Rowe
673afca11b Update camera object's position and orientation with actual Rift values 2014-09-30 10:05:59 -07:00
Andrzej Kapolka
3c1f3b77a7 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-29 19:14:47 -07:00
Andrzej Kapolka
802b14d5ab Use Jacobi eigenvalue algorithm to get eigenvalues/eigenvectors. 2014-09-29 19:14:17 -07:00
Stephen Birarda
e512b05e62 add extra debug for hydra library initialization 2014-09-29 17:28:50 -07:00
Stephen Birarda
f047c2dff0 have OS X hydra support be disabled by default 2014-09-29 17:08:06 -07:00
ZappoMan
bffd236640 add glowLevel, and pulse to all overlays 2014-09-29 16:44:40 -07:00
Stephen Birarda
2fbd249d9f fix reset password link for LoginDialog 2014-09-29 16:38:10 -07:00
Stephen Birarda
3c236cc60a resolve conflicts on merge with upstream master 2014-09-29 16:00:50 -07:00
David Rowe
1bffaa262d Reference camera object rather than copy it 2014-09-29 15:46:22 -07:00
AndrewMeadows
c8882d68dd Merge pull request #3503 from birarda/domain-wizard 
lock changes to settings in the domain-server master config file
 2014-09-29 15:41:29 -07:00
Andrzej Kapolka
4c617c6d55 Stop using the emissive color for glow. 2014-09-29 14:51:45 -07:00
Andrzej Kapolka
72ff908bd3 Fix for metavoxel crashes on Windows. I was expecting the scope of a 
temporary object to last until the next line; turns out VC++ can destroy
it in the middle of evaluating the line.
 2014-09-29 14:37:11 -07:00
Stephen Birarda
a847c2d80d move url handling to after settings load debug 2014-09-29 13:15:28 -07:00
Stephen Birarda
3fbf141686 handle avatar location changes after avatar position has been reloaded 2014-09-29 13:14:25 -07:00
Stephen Birarda
1f4c0b6340 wrap sixenseExit call in HAVE_SIXENSE ifdef 2014-09-29 13:09:25 -07:00
Stephen Birarda
db0bfd53ae make the sixense library name a constant 2014-09-29 12:58:40 -07:00
Stephen Birarda
f7a17b7dec dynamically load sixense lib on OS X to make avoiding hid_init crash easier 2014-09-29 12:58:01 -07:00
Andrzej Kapolka
9855fbcfb4 Don't bother using a callback to render the eye vectors; just rely on the 
post-lighting call to Avatar::render, like everything else.  This should fix
the crash that Philip was seeing (presumably due to avatars' being deleted
during the draw process).
 2014-09-29 11:45:12 -07:00
Stephen Birarda
eb7ee36168 use two dashes for url as command line option 2014-09-29 10:29:40 -07:00
stojce
2486a24c90 possible fix for Windows login and address-bar modal dialog 2014-09-29 18:26:25 +02:00
David Rowe
6375e42d88 Configure Leap controller per HMD option when controller is created 2014-09-28 17:19:14 -07:00
David Rowe
5c406a0e06 Add "Leap Motion on HMD" developer menu option 2014-09-28 17:18:46 -07:00
Brad Hefta-Gaub
a701bcea7b Merge pull request #3502 from ctrlaltdavid/20055 
Make default eye model calculation be reliable
 2014-09-28 12:06:03 -07:00
Clément Brisset
6d3bdd862b Merge pull request #3501 from ey6es/metavoxels 
Use the rather elaborate technique described in the Rice papers to find the minimizing point for each cell.
 2014-09-27 19:52:42 -07:00
David Rowe
dbf6daf80c Fix default eye model calculation to be reliable 2014-09-27 11:25:37 -07:00
Andrzej Kapolka
681bb60d03 Could extra comments. 2014-09-26 20:24:24 -07:00
Andrzej Kapolka
1cbbcdaedc Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-26 20:11:47 -07:00
Atlante45
7d78584aee Fix chat shortcut 2014-09-26 20:11:14 -07:00
Andrzej Kapolka
8ebb2a7fb4 Ridiculously complicated minimization code. 2014-09-26 19:32:41 -07:00
Philip Rosedale
9b228c9e37 Merge pull request #3497 from ZappoMan/entityPropsRescale 
add rescale support to entity properties UI
 2014-09-26 16:42:15 -07:00
ZappoMan
cbc502553b add rescale support to entity properties UI 2014-09-26 16:25:24 -07:00
Stephen Birarda
bd73c950ac cleanup for eyePosition ifdef HAVE_LIBOVR 2014-09-26 15:44:10 -07:00
Stephen Birarda
7c738edbd8 Merge pull request #3488 from PhilipRosedale/master 
Correct eye contact for Oculus users
 2014-09-26 15:42:03 -07:00
Stephen Birarda
3cbfad69cd fix indentation issues for merged AddressBarDialog classes 2014-09-26 14:32:59 -07:00
Stephen Birarda
5b2b0c47c0 Merge pull request #3483 from stojce/20061 
Code Review for Job #20061
 2014-09-26 14:24:44 -07:00
AndrewMeadows
7f7861671e Merge pull request #3471 from ctrlaltdavid/20055 
Code Review for Job #20055
 2014-09-26 14:00:33 -07:00
Andrzej Kapolka
aa0b3a18ef Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-26 13:53:23 -07:00
Andrzej Kapolka
efa22d931f If we're rendering the billboard, don't render the body. 2014-09-26 13:48:11 -07:00
Andrzej Kapolka
3fe6e30632 Working on QR decomposition. 2014-09-26 13:43:28 -07:00
David Rowe
c0419c61f4 Fix missing constructor initialization 2014-09-26 09:15:17 -07:00
David Rowe
aa9511c263 Position Rift camera at avatar model's mid-eye location 2014-09-25 22:49:12 -07:00
Philip Rosedale
597871442e fix linux build fail 2014-09-25 17:39:53 -07:00
Philip Rosedale
3fd1ab40e4 remove magic number 2014-09-25 16:17:05 -07:00
Philip Rosedale
1d4b86d85b Blink first with one eye and at slightly different speeds, look back and forth exactly at eyes when receiving gaze in Oculus 2014-09-25 16:00:56 -07:00
stojce
5610cfeb34 CR fixes 2014-09-26 00:57:56 +02:00
stojce
6a3bc8f255 Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 2014-09-25 23:57:19 +02:00
Philip Rosedale
693bc11868 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-25 11:59:14 -07:00
Philip Rosedale
7836fd8a85 Add world space eye locations (for making eye contact) to the oculus manager 2014-09-25 11:58:41 -07:00
AndrewMeadows
697c7f6a61 Merge pull request #3481 from ZappoMan/collidingEntities 
First cut at colliding entities
 2014-09-25 09:38:50 -07:00
Brad Hefta-Gaub
84630a8f74 Merge pull request #3484 from huffman/20024 
Code Review for Job #20024
 2014-09-25 09:33:58 -07:00
Brad Hefta-Gaub
0775e9dde4 Merge pull request #3479 from PhilipRosedale/master 
Improved eye contact, audio driven mouth and brows, linear audio scope
 2014-09-25 09:32:37 -07:00
Brad Hefta-Gaub
712f88baa3 Merge pull request #3476 from birarda/xbox-controller 
add script support for general SDL controllers
 2014-09-25 09:25:08 -07:00
Philip Rosedale
fcc5eb9d0a Tuning of audio-driven mouths and brows to look better and not stay open 2014-09-24 16:37:55 -07:00
ZappoMan
6b8c9bba42 improved debug in entity renderer 2014-09-24 16:05:04 -07:00
ZappoMan
f43ba4a68b first cut at getting entities to collide 2014-09-24 15:28:04 -07:00
Philip Rosedale
75e536235c Avatars look at your camera, not your avatar. Improvements to lookAt code 2014-09-24 14:38:44 -07:00
stojce
039deb8b42 added go button active state icon 2014-09-24 23:26:34 +02:00
Stephen Birarda
3ab24d6ea5 add a missing HAVE_SDL block 2014-09-24 11:59:44 -07:00
Stephen Birarda
875c1dba72 change name in header comment to match new class name 2014-09-24 08:40:39 -07:00
stojce
92cb17cbbe Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 
Conflicts:
	interface/src/Menu.h
 2014-09-24 09:25:04 +02:00
Stephen Birarda
9348888ae5 map PrioVR to new JoystickScriptingInterface 2014-09-23 17:42:48 -07:00
Stephen Birarda
13d3eb02e3 report the 360 axis values in xbox.js 2014-09-23 17:19:57 -07:00
Stephen Birarda
d50c81e4a1 add a property for number of buttons in Joystick 2014-09-23 17:10:25 -07:00
Stephen Birarda
00b0806c4d move JoystickManager to JoystickScriptingInterface, add Joystick class for SDL Joystick 2014-09-23 17:09:46 -07:00
stojce
8031454f61 use backslash to activate chat 2014-09-24 00:22:51 +02:00
stojce
c14bf84af8 layout fix 2014-09-24 00:14:00 +02:00
Stephen Birarda
900daf48eb initial working connection of an xbox gamepad 2014-09-23 14:48:44 -07:00
Ryan Huffman
1ee01fdab3 Merge branch 'master' of github.com:highfidelity/hifi into 20024 2014-09-23 14:10:00 -07:00
Philip Rosedale
729d3cf9bc Merge branch 'master' of https://github.com/worklist/hifi 2014-09-23 12:50:52 -07:00
Philip Rosedale
21a15cff2a Avatar can look at corrected position when looking at me 2014-09-23 12:50:47 -07:00
Brad Hefta-Gaub
b7245f8259 Merge pull request #3469 from ctrlaltdavid/20054 
Code Review for Job #20054
 2014-09-23 09:57:31 -07:00
Stephen Birarda
7bae88e996 fix for calls to glm sqrt with ints 2014-09-23 08:52:22 -07:00
stojce
5a7b7cca44 Add finish lookup event 2014-09-23 11:32:16 +02:00
Stephen Birarda
1007f528f0 Merge branch 'master' of https://github.com/highfidelity/hifi into move-locations 2014-09-22 17:42:59 -07:00
Stephen Birarda
5be045d612 remove LocationManager and NamedLocation, replace with DataWebDialog 2014-09-22 16:55:44 -07:00
Stephen Birarda
eb0f7da517 cleanup to snapshot class to reduce passing of variables 2014-09-22 16:14:06 -07:00
Andrzej Kapolka
18cb15ee7d Warning fixes. 2014-09-22 15:31:46 -07:00
David Rowe
f95e20153c Fix upright head model position calculation for avatar scale changes 2014-09-22 15:13:08 -07:00
Andrzej Kapolka
e6b0dc592b Don't save the billboard. 2014-09-22 15:03:25 -07:00
Andrzej Kapolka
aeb424cd71 Fix for billboards. 2014-09-22 15:01:39 -07:00
Stephen Birarda
e5a54116dc correctly return empty string for domain ID if it is null 2014-09-22 15:00:07 -07:00
Stephen Birarda
523a4e6ba2 allow moving of location from DataWebDialog for locations 2014-09-22 11:58:23 -07:00
stojce
cc83c2b2e0 Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 2014-09-22 20:52:17 +02:00
stojce
466dbdcee5 added address bar dialog 2014-09-22 20:51:19 +02:00
AndrewMeadows
a0b458fd1d Merge pull request #3465 from chansensturm/audio-noise 
New Audio Edit Buffer Object / Click Removal /  ....
 2014-09-22 11:38:42 -07:00
David Rowe
a11bf7f15b Decouple Rift head tracking from avatar's head position 
This makes the Rift's view reflect the user's physical movements exactly
while the avatar follows the movements as best it can.
 2014-09-22 11:02:12 -07:00
AndrewMeadows
3d89aa9c9c Merge pull request #3463 from ey6es/deference 
Break deferred lighting business out into its own class, use deferred lighting for voxels/avatars/entities/particles in addition to metavoxels.  Don't merge until after conference, obviously.
 2014-09-22 10:42:25 -07:00
Stephen Birarda
84df6058cb add domainID to location scripting interface 2014-09-22 10:42:14 -07:00
Stephen Birarda
25c86af40f Merge branch 'master' into move-locations 2014-09-22 10:22:30 -07:00
Craig Hansen-Sturm
90379ee7eb frame and channel counts are now consistently uint32_t / float32_t replaces float 2014-09-20 04:50:11 -07:00
Andrzej Kapolka
6c907a9d83 Read the emissive color property and use it to effect glow. 2014-09-19 16:49:51 -07:00
Andrzej Kapolka
9515145b9b Removed commented lines. 2014-09-19 15:48:56 -07:00
Atlante45
36a3372f58 Same fix for MyAvatar class 2014-09-19 15:47:13 -07:00
Atlante45
c570931f35 Fix attachemnt getting into wrong state 
If you play a recording containing attachement with different
attachemnts already on, those attachement will sometime get into a wrong
state.
 2014-09-19 15:43:22 -07:00
Andrzej Kapolka
646c0dc48f Working on translucent model bits. 2014-09-19 15:31:46 -07:00
Ryan Huffman
145425276d Fix script list not being hidden 2014-09-19 14:17:08 -07:00
Andrzej Kapolka
8d3eef708a Move various avatar render bits to post-lighting section. 2014-09-19 13:13:05 -07:00
Andrzej Kapolka
446c2193ff Limit what we render for deferred point/spot lights based on the light's 
radius.
 2014-09-19 12:18:00 -07:00
Andrzej Kapolka
08fda3bbef Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-19 10:30:40 -07:00
Andrzej Kapolka
e356b06c75 Fix for lights in rear view mirror/head mode. 2014-09-18 17:39:40 -07:00
Stephen Birarda
e09eef98f2 add option to add javascript objects to a DataWebDialog 2014-09-18 17:17:33 -07:00
Andrzej Kapolka
c6aad42f21 Move LocalLight to AvatarManager, apply it at the avatar level. 2014-09-18 17:09:53 -07:00
Andrzej Kapolka
b9ae005e53 Working on the actual deferred lights. 2014-09-18 16:12:46 -07:00
Philip Rosedale
d3cc22b39d Merge branch 'master' of https://github.com/worklist/hifi 2014-09-18 14:51:19 -07:00
Brad Hefta-Gaub
a5ea0479c1 Merge pull request #3450 from birarda/master 
handle hifi urls emitted from DataWebDialog in Application
 2014-09-18 13:36:37 -07:00
Stephen Birarda
9f3d908d9f fix typo in comment 2014-09-18 13:32:01 -07:00
Brad Hefta-Gaub
c48b3ae51e Merge pull request #3451 from birarda/fix-ssl-handshake-race 
make sure the OAuthWebViewHandler is ready before the NodeList might need it
 2014-09-18 13:29:54 -07:00
Andrzej Kapolka
5c22fe7bd1 Translucency tweak. 2014-09-18 13:27:15 -07:00
Andrzej Kapolka
fb7e633cac Post-merge fixes. 2014-09-18 13:17:23 -07:00
Andrzej Kapolka
c54e1c937c Merge branch 'master' of https://github.com/highfidelity/hifi into deference 
Conflicts:
	interface/src/avatar/Head.cpp
 2014-09-18 13:08:55 -07:00
David Rowe
ff8ea46e26 Hide menu bar when fullscreen in Rift VR display mode 2014-09-18 11:34:48 -07:00
Stephen Birarda
75ecdd2f68 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-18 11:27:33 -07:00
Philip Rosedale
3f9eff2a90 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-18 10:48:44 -07:00
Philip Rosedale
8c71ed3f10 Improving headMove, added JS call for neckPosition 2014-09-18 10:48:36 -07:00
Stephen Birarda
533a60c35e make sure OAuthWebViewHandler is ready before the NodeList is 2014-09-18 10:34:17 -07:00
Stephen Birarda
7e7c4bd580 handle hifi urls emitted from DataWebDialog 2014-09-18 10:09:57 -07:00
Andrew Meadows
2f3eba2896 merge upstream/master into andrew/ragdoll 2014-09-18 09:55:50 -07:00
Andrew Meadows
1ad08e34c4 support for mulitiple frames for scripted motor 2014-09-18 09:54:27 -07:00
Philip Rosedale
929e463e40 Merge pull request #3447 from birarda/webkit-dialogs 
add a DataWebDialog class to display auth'ed pages from data-web
 2014-09-18 09:48:22 -07:00
Stephen Birarda
a0675162b6 hook My Locations to data-web dialog 2014-09-18 09:35:33 -07:00
Stephen Birarda
93561d3b21 remove the existing user locations dialog 2014-09-18 09:27:07 -07:00
Stephen Birarda
bf83e8fe09 remove the user locations model 2014-09-18 09:23:22 -07:00
Stephen Birarda
d860b8e8db remove test DataWebDialog from Application 2014-09-18 09:22:14 -07:00
Brad Hefta-Gaub
945b251f9b Merge pull request #3446 from stojce/20037 
Code Review for Job #20037
 2014-09-18 09:05:29 -07:00
Stephen Birarda
e2c3b626b3 add a DataWebDialog for authenticated access to data-web html 2014-09-18 09:05:25 -07:00
Philip Rosedale
432622d168 merge fix 2014-09-18 08:37:14 -07:00
Philip Rosedale
dbcb778ea9 Drive mouth with loudness relative to long term average 2014-09-18 08:33:41 -07:00
Brad Hefta-Gaub
cfc8cf0d7b Merge pull request #3443 from ey6es/master 
Allow blenders to stack up to a point in order to reduce latency with fewer avatars (but still cap work with lots of avatars).
 2014-09-17 23:30:36 -07:00
stojce
a6a48aafdc Hide name for all avatars, including MyAvatar 2014-09-18 07:34:14 +02:00
stojce
9a523a60cf Add option to toggle on/off names above heads 2014-09-18 06:59:29 +02:00
Andrew Meadows
b8f49dc6ef fix vertical jitter (for real this time) 2014-09-17 21:56:38 -07:00
Andrzej Kapolka
e0a56b4a95 Rejiggered the blender handling: allow up to N blenders active at once so 
that with small numbers of avatars, the blenders can stack for lower latency.
 2014-09-17 17:57:08 -07:00
Andrew Meadows
8359e672bb merge upstream/master into andrew/ragdoll 2014-09-17 17:56:35 -07:00
Andrew Meadows
cefe8e0268 scripted motor params are now Q_PROPERTIES 2014-09-17 17:55:10 -07:00
Andrew Meadows
21a17823d4 Fix for vertical jitter when walking on floor 2014-09-17 16:26:07 -07:00
Andrzej Kapolka
4a2e68fea4 Fix for eyes on skeleton (e.g., Mixamo) models. 2014-09-17 15:36:22 -07:00
Brad Hefta-Gaub
fd321a5ed1 Merge pull request #3439 from birarda/master 
upload a snapshot for location on location creation, cleanup interface start errors
 2014-09-17 14:52:04 -07:00
Brad Hefta-Gaub
cf135c300c Merge pull request #3436 from ey6es/master 
Fix for shirts on avatars created with new version of Fuse.
 2014-09-17 14:51:54 -07:00
Stephen Birarda
48e45265a3 only add a directory to the filesystem watcher if not empty 2014-09-17 14:43:48 -07:00
Stephen Birarda
abafaffe44 fix a missed Model->Entity rename that caused slot error 2014-09-17 14:43:48 -07:00
Stephen Birarda
8dddbb9d4b make snapshots uploaded for locations temp files that will be cleared 2014-09-17 14:43:48 -07:00
Stephen Birarda
e7b9e2b060 have LocationManager upload snapshot after location creation 2014-09-17 14:43:48 -07:00
Stephen Birarda
7848c63fae handle name location shortcut explicitly to work around bug 2014-09-17 14:43:48 -07:00
Andrzej Kapolka
a3c107545e Allow rendering eye vectors even if there's no head model. 2014-09-17 14:35:34 -07:00
Ryan Huffman
0efce7c8ee Add hotkey to reload all scripts 2014-09-17 13:50:57 -07:00
Andrzej Kapolka
ce9ecba5d8 Merge branch 'master' of https://github.com/highfidelity/hifi into deference 
Conflicts:
	interface/resources/shaders/model.frag
	interface/resources/shaders/model_cascaded_shadow_map.frag
	interface/resources/shaders/model_cascaded_shadow_normal_map.frag
	interface/resources/shaders/model_cascaded_shadow_normal_specular_map.frag
	interface/resources/shaders/model_cascaded_shadow_specular_map.frag
	interface/resources/shaders/model_normal_map.frag
	interface/resources/shaders/model_normal_specular_map.frag
	interface/resources/shaders/model_shadow_map.frag
	interface/resources/shaders/model_shadow_normal_map.frag
	interface/resources/shaders/model_shadow_normal_specular_map.frag
	interface/resources/shaders/model_shadow_specular_map.frag
	interface/resources/shaders/model_specular_map.frag
	interface/src/renderer/Model.cpp
	interface/src/renderer/Model.h
 2014-09-17 13:50:13 -07:00
Atlante45
3751e05ce3 Fixes crash in Model::scaleToFit() 2014-09-17 13:37:16 -07:00
AndrewMeadows
42a84b7ff1 Merge pull request #3429 from ctrlaltdavid/20021 
Code Review for Job #20021
 2014-09-17 09:19:29 -07:00
Andrzej Kapolka
fbd1efad81 Allow specifying material opacity. 2014-09-16 17:52:39 -07:00
Andrew Meadows
489871d0d6 added MyAvatar.setMotorVelocity() & friends for JS 2014-09-16 17:09:32 -07:00
Andrzej Kapolka
07efda89ef Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-16 13:20:43 -07:00
ZappoMan
9cbc53abc3 pack position and orientation in silent frames 2014-09-16 13:06:46 -07:00
Andrew Meadows
612dc9d226 minor cleanup 2014-09-16 10:09:57 -07:00
Stephen Birarda
866f2005bd handle case where a location should be faced 2014-09-16 10:08:21 -07:00
Stephen Birarda
0033dfe5af use quat orientation to store locations and user locations 2014-09-16 09:57:21 -07:00
David Rowe
a594136a9a Fix up hand roll, pitch, and yaw as best able for now 2014-09-15 20:12:13 -07:00
Andrzej Kapolka
bfaac9eae1 Deferred lighting tweaks. 2014-09-15 18:38:10 -07:00
Brad Hefta-Gaub
a9206e0e85 Merge pull request #3422 from chansensturm/audio-temp 
Implement Gordon-Smith 2-pole quadrature oscillator
 2014-09-15 18:24:11 -07:00
Andrzej Kapolka
7580a1da89 Glow fix for simple shader. 2014-09-15 17:33:07 -07:00
Andrzej Kapolka
da05d37015 Leave the glow level alone when writing the deferred-lit bits. 2014-09-15 17:19:15 -07:00
Andrzej Kapolka
580d591dc4 Working on getting glow to work with deferred lighting. 2014-09-15 17:11:36 -07:00
Philip Rosedale
bd5cb346d2 Merge pull request #3420 from AndrewMeadows/ragdoll 
Walking avatar tweaks
 2014-09-15 16:12:23 -07:00
Andrzej Kapolka
0f3a020b5d Working on getting particles/entities to work with deferred lighting; 
normalize normals from buffer.
 2014-09-15 16:07:48 -07:00
Philip Rosedale
8eeebd15da Merge pull request #3418 from ey6es/master 
Ryan's new blendshape mappings for Mixamo.
 2014-09-15 14:17:00 -07:00
Andrew Meadows
0539246089 merge upstream/master into andrew/ragdoll 2014-09-15 13:56:51 -07:00
Andrew Meadows
b2432876ce More reliable floor detection for avatar movement. 
Also tweaked max walking speed.
 2014-09-15 13:53:37 -07:00
Craig Hansen-Sturm
7a9cf193b4 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-15 13:47:24 -07:00
Stephen Birarda
193c125d66 fix scope for switch case 2014-09-15 13:29:13 -07:00
Andrzej Kapolka
467a9582c7 Somehow my reverting the ambient occlusion effect didn't take. 2014-09-15 13:29:03 -07:00
Stephen Birarda
6e9da9747e add a missing update of having heard from the audio-mixer 2014-09-15 13:25:50 -07:00
Andrzej Kapolka
6a0b3fa202 Ryan's new blendshape mappings for Mixamo. 2014-09-15 13:16:17 -07:00
Andrzej Kapolka
70c8c146bc Fix for specular issue on Nvidia, try passing along material colors. 2014-09-15 12:44:25 -07:00
Andrzej Kapolka
9caa4d3a08 Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-15 12:19:30 -07:00