Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-05 06:36:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
19464 commits 25 branches 0 tags 1.1 GiB
Commit graph

19464 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
91fd574eb5 Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick 2014-12-06 15:28:54 -08:00
ZappoMan
7011162c70 removed dead code 2014-12-06 15:07:02 -08:00
ZappoMan
08092e7abe removed dead code 2014-12-06 15:06:00 -08:00
ZappoMan
1a1fb18ba1 removed dead code 2014-12-06 15:03:26 -08:00
ZappoMan
c8e648c4d7 removed unused menu item 2014-12-06 15:00:29 -08:00
ZappoMan
a03984a561 removed some debug code 2014-12-06 14:59:50 -08:00
ZappoMan
3bb16ce831 properly wire up precision picking in JS api 2014-12-06 12:03:46 -08:00
ZappoMan
7ea85073f4 introduce precision picking in API form 2014-12-06 11:45:49 -08:00
ZappoMan
303274a554 tweaks and debug cleanup 2014-12-06 10:59:48 -08:00
ZappoMan
ec907d1d1d removed debug 2014-12-06 09:44:30 -08:00
Brad Hefta-Gaub
2bf93bd9f0 Merge pull request #3913 from huffman/entity-tool-property-fixes 
Entity tool property fixes + add script property
 2014-12-06 00:40:18 -08:00
ZappoMan
1fec69698e get the triangle picking for submeshes working, remove some debug 2014-12-05 23:23:21 -08:00
ZappoMan
f1c6e2d1a2 more debugging 2014-12-05 19:52:48 -08:00
ZappoMan
ae647d39d0 fix models with registrations other than 0,0,0 2014-12-05 16:14:18 -08:00
Ryan Huffman
a89411fd5e Add script URL to properties tool 2014-12-05 15:27:40 -08:00
Ryan Huffman
896a34212b Fix sections not properly updating in properties tool 2014-12-05 15:27:24 -08:00
Andrzej Kapolka
01c209ef07 Merge pull request #3912 from PhilipRosedale/master 
Add gamepad warp to headMove, remove step turning when head rotated
 2014-12-05 15:27:03 -08:00
Andrzej Kapolka
f175233ea2 Merge pull request #3910 from samcake/temp0 
Create the gpu library
 2014-12-05 15:26:12 -08:00
ZappoMan
0ccbb98bde more work on improved model picking 2014-12-05 15:03:35 -08:00
Philip Rosedale
2c8b1721cc Add warp from right ('O') button on gamepad 2014-12-05 14:06:41 -08:00
Sam Gateau
69792178b9 trying to fix the linux compilation 2014-12-05 13:43:04 -08:00
Ryan Huffman
c4581c3337 Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-window-polish 2014-12-05 13:42:06 -08:00
Sam Gateau
c49b753c98 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-12-05 13:38:30 -08:00
ZappoMan
d5fbe5b6b4 Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick 2014-12-05 12:48:00 -08:00
Brad Hefta-Gaub
a3fbaab957 Merge pull request #3911 from huffman/entity-tool-window-polish 
Entity Properties Tool Window Polish
 2014-12-05 12:38:43 -08:00
Brad Hefta-Gaub
697783c4d2 Merge pull request #3909 from ZappoMan/mirrorTest 
Revert the removal of _displayViewFrustum for now, since it breaks small mirror
 2014-12-05 12:37:57 -08:00
Brad Hefta-Gaub
1de7db390e Merge pull request #3908 from PhilipRosedale/master 
Orbiting sound example, ability to set injector position, better butterflies
 2014-12-05 12:37:42 -08:00
Ryan Huffman
eddc7e12d0 Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-window-polish 2014-12-05 12:26:18 -08:00
ZappoMan
a6b86da47a basics of triangle picking working for models 2014-12-05 11:31:27 -08:00
Ryan Huffman
849397288e Update properties tool to be a resizable table 2014-12-05 10:46:35 -08:00
Ryan Huffman
0ece6c0968 Update properties window to show properties for locked entities 2014-12-05 10:43:15 -08:00
ZappoMan
0647211fb8 Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick 2014-12-05 10:13:55 -08:00
Sam Gateau
0fbdda7582 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-12-05 10:13:38 -08:00
ZappoMan
d3aacc3838 Merge branch 'master' of https://github.com/highfidelity/hifi into mirrorTest 
Conflicts:
	interface/src/MetavoxelSystem.cpp
 2014-12-05 10:11:49 -08:00
Philip Rosedale
0ad361fd60 Merge pull request #3902 from samcake/tot 
Adding detection of a "hifi" global light in a FBX file used to pass information
 2014-12-05 10:07:52 -08:00
ZappoMan
e68e3fe774 Revert "get rid of redundant _displayViewFrustum and use _viewFrustum" 
This reverts commit 6d385d9a75.
 2014-12-05 10:06:17 -08:00
ZappoMan
9753c82a3b get rid of redundant _displayViewFrustum and use _viewFrustum 2014-12-05 10:04:23 -08:00
Philip Rosedale
915b7ae5b4 Merge pull request #3906 from ey6es/metavoxels 
Quadtree-based LOD reimplementation for spanner-based heightfields.
 2014-12-05 10:02:21 -08:00
ZappoMan
feab942375 Revert "get rid of redundant _displayViewFrustum and use _viewFrustum" 
This reverts commit 6d385d9a75.
 2014-12-05 10:01:16 -08:00
Philip Rosedale
bc609016a9 remove debug 2014-12-05 08:59:41 -08:00
Philip Rosedale
c5247ca65b Add ability to set injector properties during playing, and orbitingSound.js 2014-12-05 08:45:00 -08:00
Andrzej Kapolka
dff22b01b6 Allow loading "MDR" files saved by Wilbur, fix for reallocating error. 2014-12-05 01:58:45 -08:00
Sam Gateau
66c10544ae Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-12-04 17:16:39 -08:00
dev
16da10bf19 compiling the gpu library on mac 2014-12-04 17:15:59 -08:00
dev
da1bb83eb0 compiling the gpu library on mac 2014-12-04 17:14:41 -08:00
Andrzej Kapolka
466d99bcbb Removed unused members. 2014-12-04 17:12:06 -08:00
ZappoMan
005ce8432e Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick 2014-12-04 16:48:29 -08:00
ZappoMan
6b5fdceb6e more work on improved model picking 2014-12-04 16:48:04 -08:00
Andrzej Kapolka
ace415b138 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/src/MetavoxelSystem.cpp
 2014-12-04 16:46:32 -08:00
ZappoMan
f13bf65554 more work on improved model picking 2014-12-04 16:43:34 -08:00