Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 11:19:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
19435 commits 76 branches 59 tags 1.2 GiB
Commit graph

19435 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
ZappoMan
37ffa48fa3 more work on improved model picking 2014-12-04 16:43:12 -08:00
Andrzej Kapolka
9819658e20 Spanner subdivision streaming bits. 2014-12-04 16:41:19 -08:00
Philip Rosedale
dbf64b2de7 Merge pull request #3898 from DaveDubUK/walk-JS-1.12 
Version 1.12 of the walk.js script
 2014-12-04 16:29:19 -08:00
Philip Rosedale
47c2ea95f4 Merge branch 'master' of https://github.com/worklist/hifi 2014-12-04 16:07:28 -08:00
Clément Brisset
26340353ac Merge pull request #3897 from ZappoMan/rayPickWork 
Work on improving pickable entities - Lights Optionally pickable, Spheres & Text pick properly, other bug fixes
 2014-12-04 15:43:17 -08:00
Clément Brisset
2a1c3a3220 Merge pull request #3905 from huffman/gamepad-disable-warp 
Disable the warp button in gamepad.js
 2014-12-04 15:27:18 -08:00
Ryan Huffman
ba3f051c8c Disable the warp button in gamepad.js 2014-12-04 15:11:16 -08:00
Brad Hefta-Gaub
0e71c5c282 Merge pull request #3904 from huffman/gamepad-mirror-toggle 
Make gamepad mirror button toggle
 2014-12-04 14:49:42 -08:00
Ryan Huffman
3bbee640fb Make gamepad mirror button toggle 2014-12-04 14:48:03 -08:00
Brad Hefta-Gaub
227f5a498f Merge pull request #3903 from huffman/gamepad-mirror 
Add button to gamepad.js to toggle mirror mode
 2014-12-04 14:27:09 -08:00
Sam Gateau
e114d92515 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-04 14:26:19 -08:00
Sam Gateau
4168993ebe Replace c++11 usage of auto by explicit declaration 2014-12-04 14:23:47 -08:00
Ryan Huffman
500b8a49d1 Add button to gamepad.js to toggle mirror mode 2014-12-04 14:17:24 -08:00
ZappoMan
5ec9a9b6ed make text entities correctly ray pick 2014-12-04 13:49:46 -08:00
ZappoMan
842ee714b8 make text entities correctly ray pick 2014-12-04 13:08:16 -08:00
Sam Gateau
3215957398 better interpretation of the hifi light intensity and fixes for compilation on mac 2014-12-04 12:31:40 -08:00
Brad Hefta-Gaub
b9ce5b0d0c Merge pull request #3901 from huffman/gamepad-multi-speed 
Add multi-speed control to gamepad.js
 2014-12-04 12:20:36 -08:00
Andrzej Kapolka
a990b4ae1f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-04 12:19:45 -08:00
Ryan Huffman
e3a34f6db0 Add multi-speed control to gamepad.js 2014-12-04 12:17:31 -08:00
Sam Gateau
f4e1af6abc clean code in GeometryCache around the FBX file loader 2014-12-04 12:02:30 -08:00
ZappoMan
b6fd3628c8 first round of hacking on implementing rendering of models for detailed ray picking 2014-12-04 12:00:38 -08:00
Brad Hefta-Gaub
3a396b3256 Merge pull request #3900 from huffman/entity-tools-fix-rp-rotation 
Fix entity tool rotation to rotate around registration point
 2014-12-04 11:41:22 -08:00
Ryan Huffman
1ee45e8bd1 Fix entity tool rotation to rotate around registration point 2014-12-04 11:24:56 -08:00
Brad Hefta-Gaub
cab1be25ed Merge pull request #3899 from huffman/entity-tools-fix-registration-point 
Entity tools fix registration point
 2014-12-04 11:04:27 -08:00
Sam Gateau
94cdae073b Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-04 11:02:23 -08:00
ZappoMan
11f10f9512 make sphere entities pick off their actual sphere, fix bug in ray picking multiple items with different distances 2014-12-04 10:54:04 -08:00
Ryan Huffman
1f82831bcc Fix call to getRelativeCenterPosition 2014-12-04 10:47:09 -08:00
Clément Brisset
a7a7ad775e Merge pull request #3896 from huffman/fix-entity-selection 
Fix entity tool selection when inactive
 2014-12-04 10:39:42 -08:00