Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-16 21:57:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
20697 commits 74 branches 59 tags 1.2 GiB
Commit graph

9942 commits

Author SHA1 Message Date
Atlante45
e246b979f7 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-03 17:50:17 -08:00
Atlante45
8d814ab07b Updated Oculus pickray 2014-12-03 17:05:42 -08:00
Atlante45
bd39688c62 Magnifiy window tweaks 2014-12-03 17:04:26 -08:00
Andrzej Kapolka
6764f29cd2 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-03 16:49:10 -08:00
Andrzej Kapolka
8fb766a5d0 Only recreate the renderers for nodes that have changed. 2014-12-03 16:44:13 -08:00
Atlante45
0624ab7c72 Fixed aspect ratio and cropped overlay texture 2014-12-03 16:04:23 -08:00
ZappoMan
cd92185c5b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 
Conflicts:
	examples/newEditEntities.js
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	libraries/entities/src/EntityTree.h
 2014-12-03 15:07:47 -08:00
Atlante45
73004d1bee Decoupled reticules from Overlays view 2014-12-03 14:40:47 -08:00
Brad Hefta-Gaub
f10b656877 Merge pull request #3870 from AndrewMeadows/thermonuclear 
pull entity simulation out of EntityTree
 2014-12-03 14:30:44 -08:00
Andrzej Kapolka
7a81e6c9e1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-03 14:30:31 -08:00
Sam Gateau
322dd38322 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-03 14:23:49 -08:00
Andrzej Kapolka
df23a84cc2 Bump up the glyph texture size so that we don't spill over into another 
texture.
 2014-12-03 14:18:47 -08:00
Sam Gateau
913007939b Trying to read the light attribute 2014-12-03 14:12:50 -08:00
Stephen Birarda
5c3e90f64f resolve conflicts on merge with upstream master 2014-12-03 13:11:56 -08:00
Andrzej Kapolka
88048e8599 Make sure the position of the heightfield/voxel brush is valid before acting. 2014-12-03 12:47:32 -08:00
Andrzej Kapolka
d975e3f0ce Fixed signed/unsigned warnign. 2014-12-03 12:38:10 -08:00
Andrzej Kapolka
1e93137e6b Fix for overflow when computing metavoxel stats. 2014-12-03 12:24:58 -08:00
Andrzej Kapolka
e32c214e4d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-03 12:08:06 -08:00
Brad Hefta-Gaub
f70f07e694 Merge pull request #3890 from PhilipRosedale/master 
When in HMD, arrow keys make jump turns
 2014-12-03 10:54:22 -08:00
ZappoMan
5f9c1c490b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-03 10:44:56 -08:00
Stephen Birarda
98f56aaa0c fix URL/filename discrepancy for local scripts 2014-12-03 09:55:55 -08:00
Philip Rosedale
d63ace9f61 fix angular velocity from oculus, tweak hair 2014-12-02 23:53:46 -08:00
Philip Rosedale
57e2f71bb7 remove unused body delta pitch, roll 2014-12-02 23:24:47 -08:00
Philip Rosedale
3ca20a7eee Add jump/warp turning when in HMD 2014-12-02 23:08:34 -08:00
Andrzej Kapolka
94d0612804 Fix for Hermite display. 2014-12-02 20:17:18 -08:00
Andrzej Kapolka
1a1b1ca3f3 Fix for voxelizing heightfields. 2014-12-02 19:49:27 -08:00
Andrzej Kapolka
990a533eea Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-02 17:13:32 -08:00
Philip Rosedale
73d358b150 Merge pull request #3888 from PhilipRosedale/master 
Bug Fix: Hydra controllers sometimes moving constantly with hydraMove.js
 2014-12-02 15:31:50 -08:00
Andrew Meadows
a21ebe4f6a merge andrew/thermonuclear into andrew/inertia 2014-12-02 15:31:30 -08:00
Andrew Meadows
c9ea6885c1 PhysicsEngine is now an EntitySimulation 2014-12-02 15:29:41 -08:00
ZappoMan
a47a0377ef Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-02 14:57:30 -08:00
ZappoMan
63d1ac8375 implement support for entity subclasses to implement their own detailed ray intersection, make likes light pickability toggle 2014-12-02 14:56:12 -08:00
Philip Rosedale
06b22cf605 ...and don't turn on/off UI from hydra 2014-12-02 14:50:25 -08:00
Andrzej Kapolka
284cd54e28 More detachment fixes. 2014-12-02 14:33:54 -08:00
Sam Gateau
8b75272cde Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-02 13:49:28 -08:00
Sam Gateau
40df497374 Hack for the Viking Palace scene before demo for good looking lightmaps 2014-12-02 13:48:59 -08:00
Atlante45
bf21376c90 TexturedHemisphere class 2014-12-02 13:34:11 -08:00
Andrzej Kapolka
d7a64260b1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-02 13:24:46 -08:00
Andrzej Kapolka
4d233c09a3 At least on Linux, fixes an annoying issue where closing the application 
window causes it to disappear and reappear briefly before exiting.
 2014-12-02 13:19:39 -08:00
Andrzej Kapolka
a022b7fa17 Fix for successive heightfield placements. 2014-12-02 13:12:45 -08:00
ZappoMan
cc012aad00 reset view frustum 2014-12-02 12:54:10 -08:00
Atlante45
3c5f33f0ac Hemisphere vbo refactoring 2014-12-02 12:28:04 -08:00
Andrzej Kapolka
b4b1559e32 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-02 12:07:38 -08:00
ZappoMan
6d385d9a75 get rid of redundant _displayViewFrustum and use _viewFrustum 2014-12-02 11:45:33 -08:00
Andrew Meadows
ff7559c2c2 merge upstream/master into andrew/thermonuclear 2014-12-02 11:41:29 -08:00
Brad Hefta-Gaub
22bee75f7f Merge pull request #3885 from birarda/double-scripts 
fix for ScriptEngine blocked load
 2014-12-02 11:19:28 -08:00
Andrew Meadows
b9944edf66 OctreeServer::createTree() is now protected 2014-12-02 11:13:37 -08:00
Andrew Meadows
0814949e4c moving EntityCollisionSystem back to entities lib 2014-12-02 11:05:17 -08:00
Stephen Birarda
0a92374ca6 fix an incorrect connection to script load error 2014-12-02 10:39:20 -08:00
Stephen Birarda
d7f168999d don't block main thread for a script load 2014-12-02 10:30:23 -08:00
Brad Hefta-Gaub
9d213f9fb7 Merge pull request #3884 from huffman/entity-tools-polish 
Entity tools polish
 2014-12-02 10:21:20 -08:00
Brad Hefta-Gaub
7f8f57b055 Merge pull request #3879 from birarda/master 
fix for ice-server heartbeat without an access token, hifi:// URL
 2014-12-02 10:19:12 -08:00
ZappoMan
526664ac57 delete old dead code 2014-12-01 22:11:34 -08:00
Andrzej Kapolka
5b4869f43d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-01 16:43:39 -08:00
Ryan Huffman
0b7ddb009d Fix tabification of tool windows 2014-12-01 16:33:51 -08:00
Andrew Meadows
1df6c32a4e moving Shape* back into shared lib 
removing dependency of entities lib on physics lib
physics lib now depends on entities lib
 2014-12-01 16:03:14 -08:00
dev
21d3892094 Merge branch 'master' of https://github.com/highfidelity/hifi into fbx 2014-12-01 13:03:18 -08:00
Ryan Huffman
fc5adef501 Update the tool window to use tabbed windows 2014-12-01 12:24:40 -08:00
Sam Gateau
845e687fc5 Adding a Hack for the apaartment model to boost the lightmaps 2014-12-01 11:45:07 -08:00
ZappoMan
6d7f799dbe oculus mirror lean hack 2014-12-01 10:32:35 -08:00
Stephen Birarda
40db44e4bd fix for custom hifi URL lookup 2014-12-01 09:59:51 -08:00
AndrewMeadows
1b5b4c0b44 Merge pull request #3872 from ZappoMan/cleanupMenus 
remove Entities developer menu items from C++ menu, make them available through script
 2014-12-01 09:29:56 -08:00
Philip Rosedale
e44ca5a7f7 Merge pull request #3876 from ZappoMan/bugFixes 
fixes the stutter in animation when observer moves
 2014-11-30 18:44:21 -08:00
Sam Gateau
321d651d77 Hack for avoiding lightmaps loading in starchamber 2014-11-30 12:54:43 -08:00
Brad Hefta-Gaub
91fe014411 Merge pull request #3875 from PhilipRosedale/master 
Auto-turn body when head yaw is beyond 45 degrees in HMD
 2014-11-30 05:40:55 -08:00
ZappoMan
5c2cc20313 fixes the stutter in animation when observer moves 2014-11-28 17:36:55 -08:00
David Rowe
583e079d3a Fix Hydra cursors in VR display 
They weren't being drawn at the correct location an so weren't matching
up with location of voxel being added or deleted, for example.
 2014-11-28 10:01:15 -08:00
Brad Hefta-Gaub
8a86b2d239 Merge pull request #3873 from samcake/tot 
Fix lighmaps for VC demo 12/1/2014
 2014-11-27 13:01:10 -08:00
Sam Gateau
c78af1c982 fixing the bug when lighmaps are diasppearing in the <apartment>, i don;t understand why 2014-11-27 10:48:36 -08:00
Philip Rosedale
c284303031 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-26 20:35:51 -08:00
Philip Rosedale
56b27a2595 Merge pull request #3871 from ZappoMan/HMDMode 
Various HMD Tools improvements
 2014-11-26 20:33:38 -08:00
ZappoMan
fe010b685a more HMD Tools improvements, better support for detecting adding/removing screens 2014-11-26 20:19:23 -08:00
Philip Rosedale
e822b191d0 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-26 19:57:31 -08:00
Philip Rosedale
39042f61cd 1P mirror can lean fwd/back 2014-11-26 19:57:18 -08:00
ZappoMan
184acaedef switch to single button for mode switching 2014-11-26 19:43:01 -08:00
ZappoMan
85ca03199e remove Entities developer menu items from C++ menu, make them available through script 2014-11-26 17:53:41 -08:00
ZappoMan
fe9fab68bf don't exit app in full screen or hdm mode 2014-11-26 17:30:59 -08:00
Andrzej Kapolka
5710bfcf6c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-26 16:19:16 -08:00
Andrzej Kapolka
0a329bbe3c More work on LOD rendering; now rendering in preview. 2014-11-26 16:18:57 -08:00
Philip Rosedale
f0fa627892 Merge pull request #3869 from ctrlaltdavid/fix-leap-hands-in-face 
Fix Leap hands in face
 2014-11-26 15:49:29 -08:00
Andrew Meadows
5acaaa9c3b merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	interface/src/entities/EntityCollisionSystem.cpp
	libraries/entities/src/EntityItem.h
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTree.h
	libraries/entities/src/EntityTreeElement.cpp
 2014-11-26 15:36:08 -08:00
Philip Rosedale
91aca51dc6 Merge pull request #3868 from ZappoMan/HMDMode 
First cut at HMD Tools window
 2014-11-26 14:53:25 -08:00
Andrzej Kapolka
790b085307 Rejiggering the heightfield renderer for LOD. 2014-11-26 13:02:11 -08:00
ZappoMan
711f9f6905 fix bug where audio meter is incorrectly offset when in oculus mode 2014-11-26 12:34:47 -08:00
ZappoMan
2fc3fdc7e6 improve how cameras are reset when leaving vr mode 2014-11-26 12:26:02 -08:00
Andrew Meadows
d84f57fafa merge upstream/master into andrew/thermonuclear 2014-11-26 12:18:19 -08:00
Andrew Meadows
cda8ac85c1 EntityCollisionSystem moves to interface 
and interface connects EntityCollision system to EntityTree
 2014-11-26 12:15:24 -08:00
Andrew Meadows
dd3a7b9b9d EntitySimulation takes EntityItem* rather than ID 2014-11-26 12:12:43 -08:00
ZappoMan
208eb663bd prevent HMD tools from being moved to HMD screen 2014-11-26 12:07:39 -08:00
David Rowe
5f58c76842 Fix hands being put in face if Leap on HMD is set but Leap not connected 
The joints were reporting themselves as "active" even though the Leap
wasn't connected, both at startup if not connected and after unplugging.
 2014-11-26 12:03:10 -08:00
Brad Hefta-Gaub
b136f4c649 Merge pull request #3867 from AndrewMeadows/bispinor 
don't lookup entity by ID when deleting script
 2014-11-26 11:07:07 -08:00
Andrzej Kapolka
1d9c7d7c72 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-26 10:56:23 -08:00
ZappoMan
0c5a978411 fix crash in activateWindowAfterEnterMode in no oculus case 2014-11-26 10:53:38 -08:00
ZappoMan
ad6680553c snap cursor to center of HMD tools dialog when shown, or app when the dialog is hidden 2014-11-26 10:46:47 -08:00
Andrew Meadows
3262c9a8bd don't lookup entity when deleting script 2014-11-26 10:27:03 -08:00
ZappoMan
c580617921 better mirrored monitor support 2014-11-26 10:23:44 -08:00
ZappoMan
59eeeb9006 add debug details to HMDTools 2014-11-26 10:11:29 -08:00
Sam Gateau
fa375539d0 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-11-26 09:42:31 -08:00
ZappoMan
821cf46ee9 don't delete the HMDToolsDialog on hide, keep it around till app exit. 2014-11-26 09:11:26 -08:00
ZappoMan
ee46c781c4 expand comment 2014-11-26 08:40:11 -08:00
Philip Rosedale
7737994399 Merge pull request #3865 from ctrlaltdavid/20197 
CR for Job #20197 - Bug: Initial ping stats mis-reported
 2014-11-26 08:08:50 -08:00
ZappoMan
53ecf97df2 fix broken camera after leaving oculus/hmd mode 2014-11-25 21:58:26 -08:00
ZappoMan
e94db7bbc2 removed some debug, added a resetSensors() on exit of HMD mode 2014-11-25 20:37:13 -08:00
ZappoMan
f111fb2c4b added a comment to clarify why getCameraOrientation has an oculus special case 2014-11-25 20:36:39 -08:00
Andrzej Kapolka
f6a6e185cf Heightfield import simplifications. 2014-11-25 18:53:27 -08:00
Andrzej Kapolka
7f14a66922 More work on heightfield quadtrees. 2014-11-25 18:27:09 -08:00
Sam Gateau
77077f4e9c hack a separate emissive information in the g-buffer 2014-11-25 18:17:28 -08:00
Sam Gateau
cb1850e082 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-11-25 14:10:30 -08:00
ZappoMan
aa44906841 make HMD tools a checkable menu 2014-11-25 13:27:16 -08:00
Brad Hefta-Gaub
883fda241f Merge pull request #3864 from huffman/entity-tools-front-draw 
Update entity tools to draw grabbers in front
 2014-11-25 12:55:16 -08:00
ZappoMan
333f323856 Merge branch 'master' of https://github.com/highfidelity/hifi into HMDMode 2014-11-25 12:46:18 -08:00
ZappoMan
bc376a0a15 more improvements to HMD Tools 2014-11-25 12:46:00 -08:00
ZappoMan
6108f7d9cd fix bug in resetSensors moving cursor to center of window on multiple screen systems 2014-11-25 12:45:20 -08:00
Ryan Huffman
0b23b57e1e Update border comment in Cube3DOverlay 2014-11-25 12:43:01 -08:00
Brad Hefta-Gaub
c4ea6bac1d Merge pull request #3863 from huffman/overlay-front-draw 
Overlay Front Draw
 2014-11-25 12:27:21 -08:00
Ryan Huffman
2cb30c2157 Update color used for Cube3DOverlay border 2014-11-25 12:17:46 -08:00
Ryan Huffman
f8c8ed868e Update float that should be bool 2014-11-25 12:08:48 -08:00
Ryan Huffman
c5f2b3b588 Add borderSize to Cube3DOverlay 2014-11-25 12:05:13 -08:00
AndrewMeadows
450b365bb6 Merge pull request #3860 from ZappoMan/cleanupMenus 
remove spatial audio menu items
 2014-11-25 11:28:18 -08:00
Ryan Huffman
9020fee31a Merge branch 'master' of github.com:highfidelity/hifi into overlay-front-draw 2014-11-25 09:53:18 -08:00
Ryan Huffman
649ae4a448 Update 3D overlays to only use one list 2014-11-25 09:49:10 -08:00
ZappoMan
e35242345c first cut at HMD Tools dialog 2014-11-25 09:26:24 -08:00
ZappoMan
a28d74570d bug fixes in setFullscreen() and setEnableVRMode() 2014-11-25 09:25:22 -08:00
Ryan Huffman
4febc45b6a Add drawInFront to Base3DOverlay::getProperty 2014-11-25 08:44:38 -08:00
Ryan Huffman
925c2a8f6c Update array to use pointers 2014-11-25 08:34:44 -08:00
Ryan Huffman
8b982872c2 Add calls to Overlays::render3DFront() 2014-11-24 23:19:53 -08:00
Ryan Huffman
0b46e35f31 Add support for separate list of 3d overlays to be drawn in front 2014-11-24 23:19:17 -08:00
Ryan Huffman
1d865ace9d Add drawInFront property to Base3DOverlay 2014-11-24 21:16:29 -08:00
David Rowe
732ad8f993 Use valid font for Windows so that '-'s are displayed 2014-11-24 18:33:10 -08:00
David Rowe
01867e2459 Display "--" for ping values if not yet valid 2014-11-24 18:32:47 -08:00
dev
ce103acdf6 More debugging of the FBXReader in order to understand how to interpret the material fields 2014-11-24 18:32:36 -08:00
Sam Gateau
6a63099a0f Fixed syntax issues and review critics, put all the debugging code in a #define block 2014-11-24 15:24:20 -08:00
Sam Gateau
68e2df8fc2 add a emissive parameter value to the lightmap shaders 2014-11-24 14:35:42 -08:00
ZappoMan
08772bbae0 remove spatial audio menu items 2014-11-24 13:07:22 -08:00
Sam Gateau
f67b4b9ff4 clean out comments so the 2 rendering modes for entities work, scene batch or per model batch 2014-11-24 11:44:54 -08:00
Andrew Meadows
37093cbd00 merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
 2014-11-24 11:24:39 -08:00
Sam Gateau
1f22d5b493 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-11-24 10:05:39 -08:00
Philip Rosedale
137642f8a5 Merge pull request #3858 from ZappoMan/modelSceneRendering 
make render entities as scene the default
 2014-11-23 14:08:25 -08:00
ZappoMan
2e9a9bf5c2 make render entities as scene the default 2014-11-23 12:01:58 -08:00
ZappoMan
80c1f5038c Merge branch 'master' of https://github.com/highfidelity/hifi into lobbyTweaks 2014-11-23 11:39:05 -08:00
ZappoMan
5ea6973fe7 fix isFacingAvatar for 3d text overlays 2014-11-23 10:53:03 -08:00
ZappoMan
efe202b7e8 make a version of computePick that works off of view frustum even when in HMD mode, updates to lobby 2014-11-22 21:25:43 -08:00
ZappoMan
93755e6506 fix bugs in unloading scripts when changing domains 2014-11-22 11:53:50 -08:00
Sam Gateau
87471df7a1 First version of the lighmap working 2014-11-21 18:08:34 -08:00
Andrzej Kapolka
41eaf340c6 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-21 12:47:26 -08:00
Andrzej Kapolka
296718e2aa Removed redundant members, clarified class names, used better hash factors. 2014-11-21 12:46:24 -08:00
David Rowe
9e32b2c64e Suppress Windows C4305 compiler warnings in gverb includes 2014-11-20 20:58:31 -08:00
Andrzej Kapolka
87cc565c1a I believe this should be a better hash function for the voxel coordinates. 2014-11-20 18:16:57 -08:00
Philip Rosedale
e07f53d022 remove unused test audio filters 2014-11-20 19:57:24 -06:00
Philip Rosedale
6e89437bce simplify audio scope menu(s) 2014-11-20 19:34:56 -06:00
Andrzej Kapolka
2adb519193 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-20 17:34:51 -08:00
Philip Rosedale
9a9f6bc485 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-20 19:20:57 -06:00
Philip Rosedale
57d3bac805 Merge pull request #3844 from ZappoMan/sitEntityScript 
First cut at sit entity script
 2014-11-20 19:20:39 -06:00
Andrzej Kapolka
d4693232d3 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-20 17:17:09 -08:00
Andrzej Kapolka
f2f7335f58 Increase the block size, reduce the overhead. 2014-11-20 17:16:52 -08:00
Philip Rosedale
ddcd39ea65 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-20 18:51:04 -06:00
Philip Rosedale
2a260f86c8 Merge pull request #3845 from birarda/lobby 
tweaks for new lobby orb
 2014-11-20 18:46:43 -06:00
Andrzej Kapolka
1e294e043b Batch voxel drawing, too. 2014-11-20 16:37:37 -08:00
Philip Rosedale
d8a74a4db4 add max distance at which you will auto-magically look at someone else 2014-11-20 18:34:06 -06:00
ZappoMan
b2c342c5c7 add support for unload method 2014-11-20 15:36:28 -08:00
Philip Rosedale
cd2a6f0f9c merge fix 2014-11-20 17:35:50 -06:00
Philip Rosedale
e1ad9d3b4b Fix eyes jittering when turning away/toward someone 2014-11-20 17:26:11 -06:00
Andrzej Kapolka
da85714dc8 Batch heightfield sections for better performance. 2014-11-20 15:09:38 -08:00
Andrew Meadows
1b778603c8 fix for crash in SkeletonModel::updateStandingFoot() 2014-11-20 14:21:08 -08:00
Stephen Birarda
47f86fac68 have QAudioOutput cleaned up with injector thread 2014-11-20 13:48:29 -08:00
Andrzej Kapolka
53809803dd These edits need to be sent reliably 2014-11-20 12:56:56 -08:00
Andrzej Kapolka
d351a65999 Increase the smoothing cutoff. 2014-11-20 12:09:33 -08:00
Andrzej Kapolka
0a976ad262 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-20 11:26:29 -08:00
Sam Gateau
7daff18101 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-11-20 09:57:59 -08:00
Sam Gateau
764ad72471 adding the light map support from FBX 2014-11-20 09:54:41 -08:00
Andrzej Kapolka
fa122b505a Further improvement to normals. 2014-11-19 17:38:45 -08:00
Atlante45
4d5451fafe Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f 
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/SkeletonModel.cpp
 2014-11-19 17:28:24 -08:00
Andrzej Kapolka
82fc75b2c4 Tweak to normal computation on dual contour surfaces. 2014-11-19 17:27:10 -08:00
Andrew Meadows
47f2cbd73b merge upstream/master into andrew/inertia 2014-11-19 17:07:55 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Brad Hefta-Gaub
3a8e89f754 Merge pull request #3831 from ey6es/master 
Clear the saccade when Faceshift is active.
 2014-11-19 16:39:18 -08:00
Brad Hefta-Gaub
7dd88eca08 Merge pull request #3829 from samcake/temp1 
refining the avatar display name rendering with different behavior if in...
 2014-11-19 16:39:04 -08:00
Brad Hefta-Gaub
0b7c3d3356 Merge pull request #3828 from AndrewMeadows/bispinor 
don't slide feet during idle animations
 2014-11-19 16:38:34 -08:00
Andrew Meadows
961dc5a231 merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItem.h
 2014-11-19 15:41:53 -08:00
Andrzej Kapolka
e943a6167c Clear the saccade when Faceshift is active. 2014-11-19 13:27:13 -08:00
Andrzej Kapolka
b68c836b12 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-19 11:49:27 -08:00
dev
fc54ad93b8 refining the avatar display name rendering with different behavior if in HMD mode or not 2014-11-19 11:46:59 -08:00
Andrew Meadows
82bf0f6210 menu item for "idle animations shift hips" hack 2014-11-19 09:38:10 -08:00
Ryan Huffman
d1d561b833 Initialize ToolWindow _selfHidden property 2014-11-19 09:18:17 -08:00
Andrew Meadows
6673d9d0c2 avatar stands on lowest toe 2014-11-19 09:13:24 -08:00
dev
ce50152863 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-19 01:06:33 -08:00
dev
2e19ad48a7 ready for pull request 2014-11-19 00:50:59 -08:00
Andrzej Kapolka
d273e7c399 Render heightfields -> render spanners. 2014-11-18 19:49:08 -08:00
dev
4028e66c08 trying to fix the lighting issue in stereo and fix the display name size and orientation 2014-11-18 18:59:54 -08:00
Andrzej Kapolka
a0f75c990e Working on fetching/clearing heightfield chunks. 2014-11-18 17:12:47 -08:00
Andrzej Kapolka
632f3bfa7f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-18 17:12:40 -08:00
Stephen Birarda
2274b35d08 connect to sandbox domain by default 2014-11-18 15:35:11 -08:00
Brad Hefta-Gaub
ee19a2d5a7 Merge pull request #3820 from huffman/grid-updates 
Grid tool updates + fixes
 2014-11-18 14:57:08 -08:00
Brad Hefta-Gaub
b94f8c6b87 Merge pull request #3818 from samcake/temp0 
Introduce the Stereo optimization for occulus rendering path
 2014-11-18 14:56:14 -08:00
Ryan Huffman
2bfd3d213a Update ToolWindow to auto-hide itself when main window loses focus 2014-11-18 12:50:37 -08:00
Ryan Huffman
ad3d7fbfb4 Improve performance of drawing GridOverlay3D 2014-11-18 12:24:52 -08:00
Andrzej Kapolka
add615810b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-18 11:19:04 -08:00
dev
5f3488eff6 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-18 10:34:49 -08:00
Andrew Meadows
3864adf82d merge upstream/master into andrew/inertia 2014-11-18 10:24:17 -08:00
Andrew Meadows
388830c2a2 Merge branch 'bispinor' into inertia 
Conflicts:
	interface/src/entities/RenderableModelEntityItem.cpp
	libraries/entities/src/BoxEntityItem.cpp
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItem.h
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTree.h
	libraries/entities/src/EntityTreeElement.cpp
 2014-11-18 10:23:38 -08:00
Brad Hefta-Gaub
e1085a6cbb Merge pull request #3816 from AndrewMeadows/bispinor 
changes to EntityTree simulation state management
 2014-11-18 10:03:22 -08:00
Andrew Meadows
2d400e6ae0 rename PhysicsWorld to PhysicsEngine 2014-11-18 09:55:25 -08:00
dev
853015da4c Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-18 09:47:25 -08:00
dev
2997589559 Merge branch 'temp0' of https://github.com/samcake/hifi into temp0 2014-11-18 09:46:43 -08:00
dev
4442b46880 Introduce the stereo improvment for the Oculus rendering path 2014-11-18 09:44:30 -08:00
Philip Rosedale
4168249ef5 Merge pull request #3817 from ZappoMan/movables 
Add "rotate" and "sounds" to movable.js
 2014-11-18 09:17:08 -08:00
ZappoMan
35b5dd520e added simulated holdingClickOnEntity in case of no mouse move 2014-11-17 20:12:58 -08:00
Andrzej Kapolka
24dc5f0db9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-17 18:44:50 -08:00
Andrzej Kapolka
a3e65fc231 Simplification, window fix. 2014-11-17 18:44:38 -08:00
Andrew Meadows
b07a580651 merge updstream/master into andrew/bispinor 2014-11-17 17:50:17 -08:00
Andrew Meadows
af606f01a9 combined SimulationStates Moving and Changing 
also funnel entity updates by UDP packet through a single list
 2014-11-17 17:35:44 -08:00
Atlante45
5eac93dcfd User separate gverb instance for local reverb 2014-11-17 16:59:23 -08:00
Andrzej Kapolka
4308a45028 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-17 16:46:51 -08:00
Andrew Meadows
dd0bdabfe1 setSimulationState() --> computeSimulationState() 2014-11-17 15:50:35 -08:00
AndrewMeadows
b48c2c2717 Merge pull request #3813 from Atlante45/draggable_js 
Faster and better Local reverb / no echo
 2014-11-17 15:16:06 -08:00
AndrewMeadows
c2e80aed70 Merge pull request #3809 from Atlante45/mute_signal 
JS Mute signal
 2014-11-17 15:14:40 -08:00
Atlante45
a8c38aab64 dryFraction factorisation 2014-11-17 14:47:20 -08:00
Atlante45
082b9ff59f Faster and better Local reverb / no echo 2014-11-17 13:43:55 -08:00
Andrzej Kapolka
f18d4e4a0e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-17 12:23:22 -08:00
Andrzej Kapolka
5b47b067b7 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-17 12:20:14 -08:00
Atlante45
de2b86957b Proportional dry fraction 2014-11-17 12:04:45 -08:00
Andrzej Kapolka
3f3eae9350 Adjusted distances for new avatar sizes. 2014-11-17 12:02:09 -08:00
Atlante45
46eebe9d40 Give noisy mutes their own packet type 2014-11-17 10:26:47 -08:00
Atlante45
0507edf90f Merge branch 'master' of https://github.com/highfidelity/hifi into mute_signal 2014-11-17 09:56:55 -08:00
Atlante45
2585013615 JS signal when AM mutes client 2014-11-17 09:54:43 -08:00
ZappoMan
5686ef6e94 Merge branch 'master' of https://github.com/highfidelity/hifi into textEntity 2014-11-16 11:04:36 -08:00
Brad Hefta-Gaub
c5426914ff Merge pull request #3806 from ctrlaltdavid/fix-bandwidth-dialog-opening 
Fix Bandwidth Details dialog opening if click meter's pos when UI hidden
 2014-11-16 08:49:15 -08:00
Brad Hefta-Gaub
3ab5753ce0 Merge pull request #3803 from stojce/20170 
CR for Job #20170 - Add checkbox to boolean item in NewEditEntities.js properties panel
 2014-11-16 08:48:59 -08:00
ZappoMan
42e8d4d377 fix warnings in overlays 2014-11-15 20:38:21 -08:00
ZappoMan
05fa3c89a7 Merge branch 'master' of https://github.com/highfidelity/hifi into textEntity 2014-11-15 20:38:07 -08:00
David Rowe
bb15fc138c Fix Bandwidth Details dialog opening if click meter's pos when UI hidden 2014-11-15 09:28:40 -08:00
Brad Hefta-Gaub
db3755f4a6 Merge pull request #3794 from thoys/20176 
CR for Job #20176 - Ability to clone Overlay in Javascript
 2014-11-15 08:27:36 -08:00
Stojce Slavkovski
cc487d76ca Merge branch 'master' of https://github.com/highfidelity/hifi into 20170 
Conflicts:
	examples/libraries/entityPropertyDialogBox.js
 2014-11-15 09:50:09 +01:00
ZappoMan
60908ef040 fix some warnings 2014-11-14 22:15:28 -08:00
Andrzej Kapolka
479bea1eb2 Removed heightfield buffer code. 2014-11-14 17:18:34 -08:00
Andrzej Kapolka
bba042e823 Heightfield material paint bits. 2014-11-14 16:52:29 -08:00
ZappoMan
f31b5aba27 use actual background color 2014-11-14 16:31:50 -08:00
ZappoMan
dd349ebfd1 coding standard cleanup, fix warning 2014-11-14 16:03:43 -08:00
ZappoMan
62c64479c2 first cut at text entity 2014-11-14 15:58:12 -08:00
Thijs Wenker
38ed104397 added const to copy constructors 2014-11-15 00:21:50 +01:00
Thijs Wenker
1a9f7c6e21 Merge branch 'master' of https://github.com/worklist/hifi into 20176 2014-11-14 23:01:18 +01:00
Thijs Wenker
ba5491bc8b moved writeToClone to copy constructor 2014-11-14 22:55:25 +01:00
Atlante45
0227bc742b Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame 2014-11-14 13:30:04 -08:00
Andrzej Kapolka
6dc4abd286 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-14 13:22:37 -08:00
Brad Hefta-Gaub
8485a07352 Merge pull request #3799 from samcake/temp0 
improvement on stereo rendering (but not Occulus....)
 2014-11-14 13:06:43 -08:00
Andrzej Kapolka
aae168dd46 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-14 12:43:52 -08:00
Sam Gateau
4f878682a9 fix syntax 2014-11-14 12:38:50 -08:00
Sam Gateau
0973d197cf Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-14 12:25:00 -08:00
Sam Gateau
43a6a0420b remove useless comments 2014-11-14 12:24:38 -08:00
Andrzej Kapolka
14eb87aefd Eliminate wacky scales in favor of newfangled "meters." 2014-11-14 12:23:47 -08:00
Atlante45
4c40f5e7de Changed entity scripts debug 2014-11-14 12:20:20 -08:00
Sam Gateau
d9ae3eb5b6 clean version of the simple stereo ack, not available for Occulus yet 2014-11-14 12:07:59 -08:00
Brad Hefta-Gaub
1d14f94cb0 Merge pull request #3797 from huffman/entity-tool-properties 
Entity Tools - Properties window, Tool window, Various fixes
 2014-11-14 11:48:57 -08:00
Sam Gateau
cc78000641 introduce the concept of side thorugh out the rendering traversal 2014-11-14 11:22:11 -08:00
Thijs Wenker
fa4555a7a2 Merge branch 'master' of https://github.com/worklist/hifi into 20176 
Conflicts:
	interface/src/ui/overlays/Grid3DOverlay.cpp
	interface/src/ui/overlays/ImageOverlay.cpp
	interface/src/ui/overlays/Line3DOverlay.cpp
	interface/src/ui/overlays/LocalVoxelsOverlay.cpp
	interface/src/ui/overlays/LocalVoxelsOverlay.h
	interface/src/ui/overlays/Overlay.h
	interface/src/ui/overlays/Overlay2D.cpp
	interface/src/ui/overlays/Text3DOverlay.cpp
	interface/src/ui/overlays/TextOverlay.cpp
	interface/src/ui/overlays/TextOverlay.h
 2014-11-14 20:09:27 +01:00
Thijs Wenker
fa03a7eb0c fix ubuntu build 2014-11-14 19:53:56 +01:00
Ryan Huffman
28eebd3fa5 Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tool-properties 2014-11-14 10:53:18 -08:00
Ryan Huffman
604b1b620b Move dock window to ToolWindow 2014-11-14 10:52:08 -08:00
Stephen Birarda
903cd05ff8 put newlines back in interface log 2014-11-14 10:39:45 -08:00
Thijs Wenker
76ae60c5ca fix Ubuntu build 2014-11-14 19:27:27 +01:00
Andrew Meadows
bd34ac4357 merg upstream/master into andrew/inertia 2014-11-14 10:05:30 -08:00
Sam Gateau
f09b58c255 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-14 10:05:01 -08:00
Sam Gateau
642f436fba first draft of factorizing the rendering traversal for both sides in stereo 2014-11-14 09:56:36 -08:00
Andrew Meadows
5ba213f8d1 fix for function override with no return 2014-11-14 09:33:11 -08:00
Andrew Meadows
5eb606c44a merge upstream/master into andrew/inertia 2014-11-14 09:04:27 -08:00
Andrew Meadows
1a094f2b51 reorder PhysicsWorld and EntityTree in Application 2014-11-14 09:03:41 -08:00
AndrewMeadows
edc599bc2d Merge pull request #3792 from ZappoMan/bugFixes 
fix a couple bugs
 2014-11-14 08:33:49 -08:00
Andrzej Kapolka
b879471a4b Cursor rendering on spanners. 2014-11-13 20:55:36 -08:00
Brad Hefta-Gaub
db2b5fc28d Merge pull request #3791 from ctrlaltdavid/20128 
CR for Job #20128 - Make leapHands.js compensate for avatars without wrist joints
 2014-11-13 20:44:43 -08:00
Brad Hefta-Gaub
27c37f3a4e Merge pull request #3784 from ctrlaltdavid/20157 
CR for Job #20157 - Enable "Get Overlay properties" from javascript
 2014-11-13 20:43:38 -08:00
Ryan Huffman
3658d65028 Remove grid tool from menu 2014-11-13 20:02:19 -08:00
Andrzej Kapolka
b2ac33db16 Ray tests for heightfield spanners. 2014-11-13 19:53:16 -08:00
ZappoMan
6a4f1c857f fix a couple bugs 2014-11-13 18:35:04 -08:00
Andrzej Kapolka
75e1cf8a7b Migrate getHeightfieldHeight to spanner heightfields. 2014-11-13 18:00:25 -08:00
Ryan Huffman
6b2a497810 Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-grid-fixes 2014-11-13 17:48:17 -08:00
Ryan Huffman
03f155bcd8 Add tool window 2014-11-13 17:47:02 -08:00
Ryan Huffman
55612cc596 Add title to WebWindowClass 2014-11-13 17:46:20 -08:00
Philip Rosedale
4e11191856 Merge pull request #3789 from birarda/lobby 
use ResourceCache for Sound files so they are cached too
 2014-11-13 16:30:06 -08:00
David Rowe
8076bfea72 Merge branch 'master' into 20157 
Conflicts:
	interface/src/ui/overlays/Text3DOverlay.cpp
 2014-11-13 14:53:57 -08:00
ZappoMan
49ef6f8be0 some cleanup 2014-11-13 14:53:37 -08:00
ZappoMan
3ff89be3fd actually only pick programs once 2014-11-13 14:51:47 -08:00
Stephen Birarda
e10d132f75 avoid Qt QTimer thread bug by putting SoundCache on same thread 2014-11-13 14:47:28 -08:00
ZappoMan
d7d7db4494 Merge branch 'master' of https://github.com/highfidelity/hifi into modelSceneRendering 2014-11-13 14:47:15 -08:00
ZappoMan
7ba3c74bc0 more work on render model scenes 2014-11-13 14:47:02 -08:00
Thijs Wenker
cbb3d463b6 Fixed Overlays::isLoaded which did not to find my just created overlay. 2014-11-13 23:29:05 +01:00
AndrewMeadows
e509a4c41a Merge pull request #3787 from samcake/temp0 
Simplified the Transform usage in the gpu::api
 2014-11-13 14:10:55 -08:00
AndrewMeadows
b797c7b38c Merge pull request #3782 from ctrlaltdavid/20140 
CR for Job #20140 - Add Overlays.getTextWidth
 2014-11-13 13:52:53 -08:00
Thijs Wenker
388332966d Added cloning methods to Grid3DOverlay 
Added example script for cloning overlays (TODO: SpriteBillboard fix cloning of in example)
 2014-11-13 22:22:46 +01:00
Sam Gateau
5c9c78e62b Moving all the variables for the Input stage cache into a struct just like for transformStage 2014-11-13 12:32:48 -08:00
David Rowe
6f4952c7d5 More consts 2014-11-13 12:25:15 -08:00
Andrzej Kapolka
8a0ff4acf5 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/src/ui/MetavoxelEditor.cpp
 2014-11-13 12:17:37 -08:00
David Rowe
493455fdac Fix const 2014-11-13 11:34:40 -08:00
Thijs Wenker
14655870ec Merge branch 'master' of https://github.com/worklist/hifi into 20176 2014-11-13 20:14:26 +01:00
David Rowe
8d4cecda62 Optimization and coding standard 2014-11-13 11:06:40 -08:00
Sam Gateau
420118e9db Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-13 11:04:12 -08:00
Sam Gateau
7e2c4c0561 SImplified the Transform usage in the gpu::api, no more pointers, just values. Improved the Transform by compressing the memory footprint 2014-11-13 10:57:32 -08:00
Andrew Meadows
1bed4eeb5b merge upstream/master into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityTree.cpp
 2014-11-13 10:53:23 -08:00
Andrew Meadows
7f46ac0935 EntityTree gtts PhysicsWorld*, with less error 2014-11-13 10:12:52 -08:00
Andrew Meadows
ebe24b5c4c give the EntityTree a pointer to its PhysicsWorld 2014-11-13 10:04:55 -08:00
Andrew Meadows
14f49df44d Application gets a ThreadSafePhysicsWorld 2014-11-13 10:02:36 -08:00
David Rowe
fac6b6b426 Refactor QRect conversion to QScriptValue 2014-11-12 21:32:55 -08:00
David Rowe
9e19641a1d Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00
ZappoMan
4077f6c2ab Merge branch 'master' of https://github.com/highfidelity/hifi into animationUnification 2014-11-12 20:39:39 -08:00
ZappoMan
63a8608ac6 handle per model transforms, default scene mode off 2014-11-12 20:20:36 -08:00
ZappoMan
13f08e65d1 Merge branch 'master' of https://github.com/highfidelity/hifi into modelSceneRendering 
Conflicts:
	interface/src/renderer/Model.h
 2014-11-12 19:31:27 -08:00
Sam Gateau
859c99b9de Fix bug in the cache of GLBackend::TransformStage 2014-11-12 18:15:35 -08:00
Andrzej Kapolka
aaffd023e2 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-12 18:03:54 -08:00
Andrzej Kapolka
12f5bccd81 More chipping away. 2014-11-12 18:03:42 -08:00
Sam Gateau
c0496fd466 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-12 16:52:34 -08:00
Sam Gateau
d3a7b011bf defined the ViewTransform as the matrix transforming from eye space to world space (the opposite of before this commit) since it seems a better design. And cleaned the dead code in Application.cpp 2014-11-12 16:52:11 -08:00
David Rowe
725d56d41f Add property getting for all 2D overlays 2014-11-12 16:50:13 -08:00
Sam Gateau
8fb04af59d defined the ViewTransform as the matrix transforming from eye space to world space (the opposite of before this commit) since it seems a better design 2014-11-12 16:40:45 -08:00
Brad Hefta-Gaub
99dd20f828 Merge pull request #3780 from ctrlaltdavid/20182 
CR for Job #20182 - Add ability to set alpha on text overlays
 2014-11-12 16:26:59 -08:00
Brad Hefta-Gaub
70c463695a Merge pull request #3779 from PhilipRosedale/master 
Remove buckyBalls and faceshift lean-to-drive
 2014-11-12 16:26:50 -08:00
Brad Hefta-Gaub
331e9d6558 Merge pull request #3775 from birarda/lobby 
repairs to local audio injection
 2014-11-12 16:26:38 -08:00
Andrzej Kapolka
49a9387020 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-12 15:42:36 -08:00
Andrzej Kapolka
d05bb49a74 Yet more heightfield spanner bits. 2014-11-12 15:40:54 -08:00
Sam Gateau
7fa4ea7527 commented on the else branch in the update TRansform stack doing nothing 2014-11-12 15:04:52 -08:00
ZappoMan
d2ab3e69f0 some cleanup 2014-11-12 14:59:03 -08:00
ZappoMan
6ff8abcbdd sepearate looping logic from AnimationHandle 2014-11-12 14:47:10 -08:00
David Rowe
8c3bedae9d Add position vector and color object script value examples 
OverlayPropertyResult type is needed to successfully move QScriptValue
objects from QScriptEngine in Overlays to QScriptEngine in script.
 2014-11-12 14:33:52 -08:00
ZappoMan
ba760c4108 remove warning 2014-11-12 13:38:10 -08:00
ZappoMan
96705bfd74 allow AnimationHandle to be set from AnimationDetails 2014-11-12 13:36:08 -08:00
ZappoMan
50bf5db50f Merge branch 'master' of https://github.com/highfidelity/hifi into modelSceneRendering 2014-11-12 13:20:27 -08:00
ZappoMan
d97d1119c7 keep tree locked until after endScene 2014-11-12 12:25:02 -08:00
ZappoMan
b2f64b9362 cleanup 2014-11-12 12:17:46 -08:00
David Rowe
4fa5447c85 Add overlay getProperty() for text overlay "text" property 2014-11-12 12:13:57 -08:00
ZappoMan
9f3f815f55 shuffle to hopefully cleanup diff 2014-11-12 12:10:57 -08:00
ZappoMan
4245da5157 add menu item to enable/disable rendering as scene 2014-11-12 12:07:27 -08:00
ZappoMan
4b22dadf09 first cut at implementing model scene rendering 2014-11-12 11:53:22 -08:00
Sam Gateau
3332cc693c Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-12 10:42:27 -08:00
Stephen Birarda
1e8e337fc7 fix spacing in NetworkGeometry method 2014-11-12 09:48:36 -08:00
Stephen Birarda
5415f8a350 handle texture replacement if model hasn't yet loaded 2014-11-12 09:47:18 -08:00
Philip Rosedale
6af2b7aadf remove buckyballs and face shift lean driving (should be a script if desired) 2014-11-12 07:33:59 -08:00
Sam Gateau
30615f09c5 fixing template syntax for linux, hope we can move to c++11 soon:) 2014-11-12 01:07:28 -08:00
Sam Gateau
f634b1c5cb avoid for a new Transform for identity gpu::Batch::setTransformModel when rendering model part which are blend shapes AND fix a bug in GLBackend when the ModelTransform is NULL then let's use the ViewTransform only 2014-11-12 01:03:53 -08:00
Sam Gateau
6096a61ecc avoid for a new Transform for identity gpu::Batch::setTransformModel when rendering model part which are blend shapes 2014-11-12 00:52:40 -08:00
Sam Gateau
5f0fdeccb2 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-12 00:27:12 -08:00
Sam Gateau
b716a512c6 Stable version of the Transform and usage for Model rendering with soimilar performances and same accuracy level 2014-11-12 00:26:44 -08:00
Stephen Birarda
b7b371ba61 resolve conflicts on merge with upstream master 2014-11-11 20:53:24 -08:00
Stephen Birarda
9bd870f4b0 fix hifi url handling after update to 5.3.2 2014-11-11 20:45:04 -08:00
Stephen Birarda
f9aed39352 don't try to open a joystick if controller is NULL 2014-11-11 18:17:24 -08:00
David Rowe
8ac3aba2bd Make text overlays apply alpha to text as well as background 2014-11-11 17:54:02 -08:00
David Rowe
6cf833cf98 Add text overlay textWidth() method 2014-11-11 17:31:49 -08:00
Sam Gateau
7a9f45d34f Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-11 16:40:11 -08:00
Sam Gateau
668c5e298d clean up the Transform class and the rendering path in Model.cpp 2014-11-11 16:39:00 -08:00
Stephen Birarda
a5a02b5f8a add AudioInjectorLocalBuffer for more control 2014-11-11 16:34:00 -08:00
Stephen Birarda
0e30c65e60 handle cleanup of local injection, volume 2014-11-11 15:12:11 -08:00
Philip Rosedale
e6bbb53483 Merge pull request #3774 from ZappoMan/newEntityNotification 
implement "preload" method for entity Scripts
 2014-11-11 14:46:23 -08:00
Stephen Birarda
83529c1fed fix QIODevice fail in AudioInjector by passing explicit size 2014-11-11 14:45:33 -08:00
Andrzej Kapolka
08475cc90b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-11 14:40:34 -08:00
Andrzej Kapolka
caef237376 More work on spannerizing heightfields. 2014-11-11 14:40:05 -08:00
ZappoMan
8975fbe1ee removed blank line 2014-11-11 14:26:45 -08:00
Brad Hefta-Gaub
d38496c3c7 Merge pull request #3771 from huffman/entity-grid-tool 
Add entity grid tool
 2014-11-11 14:21:26 -08:00
ZappoMan
8ec3f8ce99 implement support for calling preload when the script changes 2014-11-11 14:21:06 -08:00
Stephen Birarda
cd3877b584 handle local audio output via AudioInjector directly for control 2014-11-11 14:14:43 -08:00
ZappoMan
2bc7896dee first cut at preload script behavior 2014-11-11 13:46:48 -08:00
Andrew Meadows
0d0f98f669 init and step physics simulation 2014-11-11 12:09:59 -08:00
Stephen Birarda
d0e8c294da handle passing of local audio interface to AudioInjector 2014-11-11 11:22:16 -08:00
Andrew Meadows
fa48da6c98 merge upstream/master into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityItem.cpp
 2014-11-11 11:14:12 -08:00
Andrew Meadows
82d7b70ec9 add offset to physics simulation 2014-11-11 10:56:31 -08:00
Philip Rosedale
d9141b4010 Merge pull request #3750 from Atlante45/reverb_for_own_voice 
Reverb for own voice
 2014-11-11 10:52:26 -08:00
Ryan Huffman
bedd9c76f2 Merge branch 'master' of github.com:highfidelity/hifi into entity-grid-tool 
Conflicts:
	examples/newEditEntities.js
 2014-11-11 10:48:49 -08:00
Ryan Huffman
3ec28f8e30 Add WindowScriptingInterface::doCreateWebWindow 2014-11-11 10:15:16 -08:00
Ryan Huffman
a1d771a0be Rename WebWindow to WebWindowClass 2014-11-11 10:03:14 -08:00
Ryan Huffman
bd61eba664 Remove unused include 2014-11-11 10:00:28 -08:00
Stephen Birarda
d083e75d2d groundwork for better locally looped audio 2014-11-11 09:59:10 -08:00
Ryan Huffman
f577cdd2f4 Add Grid3DOverlay to Overlays 2014-11-11 09:56:47 -08:00
Sam Gateau
ad51416c28 move the transform class files to the Shared library, still problem with negative scale composition 2014-11-11 09:54:35 -08:00
Ryan Huffman
2ebca0a659 Add Grid3DOverlay 2014-11-11 09:50:25 -08:00
AndrewMeadows
22dbebbe09 Merge pull request #3760 from DaveDubUK/20142 
CR for Job #20142 - Walk Cycle Polish Description
 2014-11-11 09:10:32 -08:00
Andrzej Kapolka
93a61dd0c2 More heightfield bits. 2014-11-10 19:26:19 -08:00
Andrzej Kapolka
e0e9eaa15d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-10 18:06:51 -08:00
Philip Rosedale
c965c21702 Merge pull request #3758 from ey6es/master 
Mirror/warning fixes.
 2014-11-10 17:23:43 -08:00
Philip Rosedale
885a93b7e3 Merge pull request #3769 from birarda/plugs 
add guard for handling of local audio
 2014-11-10 17:20:19 -08:00
Stephen Birarda
dabc2b23a3 add a guard in case local audio cannot be handled 2014-11-10 15:51:56 -08:00
Andrzej Kapolka
0664ff3181 Moved spanners into separate file, working on heightfields as spanners. 2014-11-10 15:51:41 -08:00
Atlante45
02b401701f Set a minimum mute intervalle in the mixer 2014-11-10 15:46:36 -08:00
Atlante45
125ef0e3e2 make pulsate function into a cos 2014-11-10 15:12:40 -08:00
Atlante45
53fb9e9047 make mute icon pulsate when muted 2014-11-10 14:11:17 -08:00
Andrzej Kapolka
5f89b6e00e The spec actually says that the 'L' (should have been 'LL' anyway) isn't 
necessary; the compiler will know to read the constant as a long long.
 2014-11-10 11:58:52 -08:00
Andrzej Kapolka
a77525209d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-10 11:54:05 -08:00
Andrzej Kapolka
0c1ea784b9 Set face. 2014-11-10 11:49:02 -08:00
Andrzej Kapolka
431bb0af1d Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/Application.cpp
 2014-11-10 11:46:09 -08:00
Sam Gateau
7ccb7495c7 Merge and resolve conflict on APplication.cpp 2014-11-10 10:07:24 -08:00
Sam Gateau
631ed9da78 let's start reusing the Batch per model from frame to frame 2014-11-10 10:04:19 -08:00
Brad Hefta-Gaub
fc89f92097 Revert "Revert "Fix build warning"" 2014-11-07 21:53:56 -08:00
Brad Hefta-Gaub
3a90e869d4 Revert "CR for Job #20140 - Add Overlays.getTextWidth" 2014-11-07 21:50:19 -08:00
Brad Hefta-Gaub
09490b58b4 Revert "Fix build warning" 2014-11-07 21:47:28 -08:00
Brad Hefta-Gaub
8e9d0a6396 Merge pull request #3762 from ctrlaltdavid/fix-build-warning 
Fix build warning
 2014-11-07 20:24:08 -08:00
Brad Hefta-Gaub
8e17bc74bf Merge pull request #3759 from ctrlaltdavid/20140 
CR for Job #20140 - Add Overlays.getTextWidth
 2014-11-07 20:14:18 -08:00
David Rowe
94d82455a0 Fix build warning 2014-11-07 19:56:54 -08:00
Stephen Birarda
1e52232a4c add destructors for arrays in Hair 2014-11-07 17:21:53 -08:00
Stephen Birarda
2ca673175a rename StdDev to StDev, patch its leak 2014-11-07 17:15:54 -08:00
Andrzej Kapolka
6445b3aa5d Linux warnings fixes. 2014-11-07 15:59:16 -08:00
David Rowe
a904b128b3 Fix boolean literal value 2014-11-07 15:28:39 -08:00
Andrzej Kapolka
9a14e46c78 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-07 14:45:30 -08:00
Andrzej Kapolka
cd110d6048 Fix for invalid projection matrix on startup. 2014-11-07 14:35:01 -08:00
Sam Gateau
9d146e7ea3 improving the evalFromRawMatrix decomposition 2014-11-07 14:27:22 -08:00
Andrzej Kapolka
7008012492 Trigger fixes. 2014-11-07 14:20:31 -08:00
Andrzej Kapolka
b421ee9243 Fix for audio toolbox. 2014-11-07 14:09:40 -08:00
Andrzej Kapolka
61e0660d65 This actually seems to work differently on OS X versus Linux. 2014-11-07 14:01:28 -08:00
Andrzej Kapolka
a4db244182 Mirror/warning fixes. 2014-11-07 13:57:20 -08:00
David Rowe
a50c3c1696 Fix order of wrist and hand joints in Leapmotion controller 2014-11-07 12:04:03 -08:00
Stephen Birarda
beb7c339f3 Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-11-07 11:18:04 -08:00
Sam Gateau
dc748a85a3 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-07 11:14:55 -08:00
Stephen Birarda
bd8b71a02a complete handling of local audio loopback 2014-11-07 11:05:01 -08:00
Stephen Birarda
66949ee7a9 Merge branch 'master' of https://github.com/highfidelity/hifi into local-audio 2014-11-07 10:57:37 -08:00
Brad Hefta-Gaub
4a6c5e4203 Merge pull request #3753 from RyanDowne/master 
Changes to Hair to make it look more like clothing
 2014-11-07 10:55:08 -08:00
Ryan
d0ca9ed14c Changes to Hair to make it look more like clothing 2014-11-07 10:45:58 -08:00
Stephen Birarda
e78f149369 Merge branch 'master' of https://github.com/highfidelity/hifi into local-audio 2014-11-07 10:28:31 -08:00
Stephen Birarda
f1a238a6c2 piping for local UI sounds 2014-11-07 10:08:09 -08:00
ZappoMan
45ca063249 use original textures for textureNames 2014-11-07 10:00:04 -08:00
Sam Gateau
fa9318aafe Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-07 09:59:09 -08:00
Sam Gateau
e1a9830d9a mirror doesn't work with the new transform stack 2014-11-07 09:58:32 -08:00
ZappoMan
fdc5aa1da5 include urls with texture names, make sure to wait till default textures loaded before setting new textures 2014-11-07 09:54:13 -08:00
Stephen Birarda
0f32346324 resolve conflicts on merge with upstream master 2014-11-07 09:10:12 -08:00
ZappoMan
7b40a7cd89 CR feedback 2014-11-07 09:07:28 -08:00
ZappoMan
c48d79ad8b add gettable feature which lists texture names 2014-11-07 09:05:47 -08:00
David Rowe
7e6d616f20 Add text overlay textWidth() method 
Is accessible from JavaScript.
 2014-11-07 08:58:31 -08:00
David Rowe
02f6f6769b Enable different copies of otherwise identical text renderers 
Needed when using computeWidth() because it messes up draw() rendering.
 2014-11-07 08:56:50 -08:00
Atlante45
011e531971 Magic numbers and casts 2014-11-07 14:41:59 +01:00
ZappoMan
542d671e54 cleanup entity scripts when changing domains or entity is deleted 2014-11-06 20:01:09 -08:00
Andrzej Kapolka
e08a0144c2 Cleanup on aisle three! Removed the color/normal/voxelized spanner bits, as 
well as the throbbing/scripted guides and the notion of spanner masking.
 2014-11-06 19:15:43 -08:00
ZappoMan
55576e7f9d fix crash in mouse messages while quitting 2014-11-06 17:53:22 -08:00
ZappoMan
c1385a9c35 fix random crash on checkEnterLeaveEntities 2014-11-06 17:41:55 -08:00
ZappoMan
bceab4ead9 clear all octree related state when disconnecting from a domain 2014-11-06 17:25:49 -08:00
Atlante45
dcfeef4712 Reference and comments 2014-11-07 00:24:37 +01:00
Stephen Birarda
2f66e56e46 update Stats to new tbb node iteration 2014-11-06 15:23:30 -08:00
Stephen Birarda
ce02d79d41 update OctreeStatsDialog to new tbb node iteration 2014-11-06 15:22:30 -08:00
Stephen Birarda
d82e2fb8f4 update NodeBounds.cpp to new tbb node iteration 2014-11-06 15:21:18 -08:00
Stephen Birarda
aa7e995672 update MetavoxelSystem.cpp to new tbb node iteration 2014-11-06 15:18:56 -08:00
Stephen Birarda
455cbac8a5 repairs to node hash iterations in Application 2014-11-06 15:16:45 -08:00
Atlante45
1e6cadc7c1 Extra lines 2014-11-07 00:06:57 +01:00
Ryan Huffman
3e109ee770 Add WebWindow widget for scripts 2014-11-06 14:57:04 -08:00
Atlante45
4dc40c9e84 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_for_own_voice 2014-11-06 23:17:53 +01:00
Sam Gateau
9e34e9d0a6 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-06 14:15:59 -08:00
AndrewMeadows
efd9626c2f Merge pull request #3740 from samcake/temp0 
Introduce the input stream stage to the gpu::Batch and apply it for model rendering
 2014-11-06 14:14:08 -08:00
Sam Gateau
555360e470 Merge branch 'temp0' of https://github.com/samcake/hifi into temp1 2014-11-06 14:04:03 -08:00
Sam Gateau
bed524716d Removed all the prefix to the enum values, since all the enums are in the gpu scope we consider its good to avoid name colisions 2014-11-06 14:01:43 -08:00
Andrzej Kapolka
788f1b91c0 Use near radius as threshold, since we need to switch to full screen rendering 
whenever any point of the near window intersects the light volume.
 2014-11-06 12:54:49 -08:00
Andrzej Kapolka
2c0b8c9172 Winding order fixes. 2014-11-06 12:45:02 -08:00
Stojce Slavkovski
06da1bd566 add checkbox support in scripting interface 2014-11-06 20:41:08 +01:00
Sam Gateau
b0189efcdf Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-06 10:56:54 -08:00
Sam Gateau
820c0798aa In BufferStream, clean up the constructor and destructor 2014-11-06 10:43:54 -08:00
Sam Gateau
2d06e71e32 Remove double definition of static const arrays for Types and Dimensions 2014-11-06 10:42:14 -08:00
Sam Gateau
5a51a99f76 Fixing missing brackets after if 2014-11-06 10:40:06 -08:00
AndrewMeadows
843aaf4e95 Merge pull request #3747 from PhilipRosedale/master 
First pass audio mixer muting, improved tour guide, hair, injector loudness in JS
 2014-11-06 10:36:46 -08:00
Sam Gateau
4a73b0773b first take at the Transform encapsulating a transform matrix 2014-11-06 09:56:05 -08:00
Sam Gateau
67535a386c first take at the Transform encapsulating a transform matrix 2014-11-06 09:55:34 -08:00
Atlante45
efc86b9f75 Remove debug 2014-11-06 17:42:27 +01:00
Atlante45
ff197a2f64 Base implementation for own reverb 2014-11-06 12:46:37 +01:00
Philip Rosedale
54957a2fa1 merge fix 2014-11-05 21:08:24 -08:00
Philip Rosedale
0b205f3f16 fix bad spaces 2014-11-05 17:06:00 -08:00
Philip Rosedale
688bd0f34f first pass audio mixer automatic muting of noisy streams, tour guide improvements, new lightExample.js, hair hangs over cone 'body' 2014-11-05 16:58:58 -08:00
Andrzej Kapolka
fd00461b4e Perspective correction fix (lets us use lower tesselation on light volumes). 2014-11-05 16:50:34 -08:00
Thijs Wenker
d3d80d3fe2 filled in the rest of the properties 2014-11-06 00:34:59 +01:00
Stephen Birarda
63c5dacdd0 final changes to use new hash from LimitedNodeList 2014-11-05 15:12:42 -08:00
Stephen Birarda
8a72cdd59d leverage new libcuckoo hash outside LimitedNodeList 2014-11-05 15:09:54 -08:00
Thijs Wenker
709ad84933 added clone functionality to Overlays: 
Overlays.cloneOverlay(OverlayID)
 2014-11-05 23:44:59 +01:00
DaveDubUK
7a1f7bd418 Update to walk.js v 1.1 
Revised code structure (see /libraries for new files), walk animation
completely overhauled (now using geometric wave generators, Fourier
synthesis and Butterworth LP filtering for selected motion curve
construction), redesigned sidestepping animations, tweaked flying
animations, decreased maximum walk speed in Interface to more natural
human value, improved Hydra support, added support for Leap motion,
animation file sizes optimised, cleared out code used to work around now
fixed bugs, lots of minor tweaks and improvements. walk.js is now under
100,000 characters, but I had to use tabs instead of 4 spaces to get it
below the threshold.
 2014-11-05 20:11:11 +00:00
Stephen Birarda
bff6707715 repair implicit cast of ints into unsigned colorBuffer 2014-11-05 12:02:05 -08:00
Stephen Birarda
663167d684 wait on AudioInjectors when shutting down interface 2014-11-05 10:37:22 -08:00
Stephen Birarda
2c667d209d make the AudioInjectorScriptingInterface a singleton 2014-11-05 10:10:05 -08:00
Sam Gateau
2b27af51f1 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-05 09:35:26 -08:00
Andrzej Kapolka
fb4c1d38eb Set Oculus camera fov/aspect ratio. 2014-11-04 19:04:31 -08:00
Andrzej Kapolka
a0e0c47701 Depth value tweak. 2014-11-04 18:27:24 -08:00
Sam Gateau
562ecc8e3a fix glLight attenuation bad values by filtering before glcall 2014-11-04 18:18:24 -08:00
Andrzej Kapolka
52d0b15979 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-04 18:13:58 -08:00
Andrzej Kapolka
892987d68a Increase tesselation to minimize artifacts. 2014-11-04 18:13:33 -08:00
Andrzej Kapolka
feabd1d5b3 Use a fullscreen quad when we're actually inside the light influence. 2014-11-04 18:08:56 -08:00
Sam Gateau
a344d46871 fix std::bitset method 2014-11-04 18:05:04 -08:00
Sam Gateau
1eb49d3763 fixing template bracket issues 2014-11-04 17:54:54 -08:00
Andrzej Kapolka
1763d8f7f0 Switch to using cones/spheres (as opposed to screen-aligned quads) with depth 
testing for light geometry.
 2014-11-04 17:29:19 -08:00
Sam Gateau
99eb46f218 Removed any checkGLError so they do not show 2014-11-04 17:10:17 -08:00
Sam Gateau
27aadd24b3 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-04 16:43:26 -08:00
Sam Gateau
441d09a460 debugiing the mysterious glError coming from glFrustum 2014-11-04 16:42:58 -08:00
Sam Gateau
4afa0b4188 more GL error checking 2014-11-04 15:52:25 -08:00
Brad Hefta-Gaub
24c324fd1d Merge pull request #3735 from ctrlaltdavid/20126 
CR for Job #20126 - Rift HUD shouldn't move with head
 2014-11-04 15:52:10 -08:00
Brad Hefta-Gaub
583b7b1267 Merge pull request #3732 from thoys/20166 
CR for Job #20166 - Extend AudioDeviceScriptingInterface to have muted property and mute event
 2014-11-04 15:51:05 -08:00
Andrzej Kapolka
576ac23e71 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-04 15:10:19 -08:00
Sam Gateau
66d732fc33 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-04 14:52:22 -08:00
Sam Gateau
c842060dc5 fix names for stream and Batch interface 2014-11-04 14:51:57 -08:00
Andrzej Kapolka
3b56f613e2 Cone render function, some cleanup of GeometryCache methods. 2014-11-04 13:21:51 -08:00
Philip Rosedale
c4eeebe03e Merge branch 'master' of https://github.com/worklist/hifi 2014-11-04 12:44:31 -08:00
Stephen Birarda
fab3a61f1b Merge pull request #3737 from birarda/lobby 
fix for Camera.getPosition() calls
 2014-11-04 12:40:08 -08:00
Stephen Birarda
72f80d4a0f make camera getPosition() callable from js 2014-11-04 12:39:50 -08:00
Philip Rosedale
558aa52d30 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-04 12:14:08 -08:00
Philip Rosedale
6b8476a87f Merge pull request #3734 from birarda/lobby 
bubble up a PickRay with action event, camera cleanup
 2014-11-04 12:03:29 -08:00
Andrzej Kapolka
f00c54c23c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-04 11:45:23 -08:00
Andrzej Kapolka
03ce8081a4 Oh, when will I learn not to use "near" and "far" as variable names? 2014-11-04 11:44:47 -08:00
Stephen Birarda
f53455ee55 use a ray from the near clip for action ray 2014-11-04 11:40:47 -08:00
Stephen Birarda
fe0d593ac4 expose camera mode as property and leverage in scripts 2014-11-04 10:41:13 -08:00
Stephen Birarda
790aa848ae leverage Camera object for scripting, remove sep interface 2014-11-04 10:33:55 -08:00
Stephen Birarda
957705998f fix an uninitialized action ray when hitting spacebar 2014-11-04 10:19:56 -08:00
Stephen Birarda
8d6b041758 send a pick ray with HFActionEvent, not x,y 2014-11-04 10:01:25 -08:00
ZappoMan
af1b69d8a1 removed some dead code 2014-11-04 09:01:45 -08:00
Sam Gateau
e290347a05 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-03 23:48:03 -08:00
Sam Gateau
f413f93c62 fix the bug for blend shape when more than one and clean the model rendering with the new stream and buffer gpu api 2014-11-03 23:26:39 -08:00
Andrzej Kapolka
3ba3299e35 Use glFrustum rather than Oculus's projection utility method, which seems to 
be returning weird results.
 2014-11-03 21:13:01 -08:00