Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-25 14:47:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
19437 commits 25 branches 0 tags 1.1 GiB
Commit graph

9999 commits

Author SHA1 Message Date
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
Sam Gateau
ff4d28abeb hack a separate emissive information in the g-buffer 2014-11-25 18:27:49 -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
4fbb094978 No reason to change that... 2014-11-24 15:39:34 -08:00
Sam Gateau
1f10a44ae4 More typos in glsl 2014-11-24 15:38:12 -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
Sam Gateau
6591f4dac2 adjust lighmap shading equation 2014-11-24 11:18:21 -08:00
Sam Gateau
8b23a2cd1e adding the shader files for the lightmap case 2014-11-24 10:33:31 -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
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
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
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
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
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
779f5f7614 Default avatar fixes. 2014-11-14 13:02:02 -08:00