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

19415 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
0fbdda7582 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-12-05 10:13:38 -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
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
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
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
Andrzej Kapolka
9819658e20 Spanner subdivision streaming bits. 2014-12-04 16:41:19 -08:00
Sam Gateau
1102b4d633 Moving GPU into it's own library 2014-12-04 16:40:55 -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
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
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
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
Ryan Huffman
acd5495b2a Add getRelativeCenterPosition 2014-12-04 10:29:10 -08:00
Ryan Huffman
b2c5b19fd7 Remove print 2014-12-04 10:20:02 -08:00
Ryan Huffman
efdc8f5494 Fix stretch tools to work correctly with registrationPoint 2014-12-04 10:19:51 -08:00
DaveDubUK
f223f51fa6 Version 1.12 of the walk.js script 2014-12-04 18:15:25 +00:00
Ryan Huffman
53f195eec4 Fix position of overlays when registrationPoint is not centered 2014-12-04 10:05:34 -08:00
Ryan Huffman
f48d304df0 Add registrationPoint to SelectionManager 2014-12-04 10:03:54 -08:00
ZappoMan
958b37dead Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-04 09:38:38 -08:00
Ryan Huffman
74acf9513b Fix entity tool selection when inactive 2014-12-04 08:47:18 -08:00
Sam Gateau
592e902f46 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-04 00:25:15 -08:00
Sam Gateau
30d87ee026 Trying to capture light information in order to get the one GLobal Light object containg the intensity value 2014-12-04 00:24:08 -08:00
Brad Hefta-Gaub
c901b8d1eb Merge pull request #3895 from AndrewMeadows/thermonuclear 
fix for non-animating models
 2014-12-03 17:26:00 -08:00
Andrew Meadows
ab011d5b30 fix for non-animating models 2014-12-03 16:49:49 -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
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
Brad Hefta-Gaub
96c3bfceef Merge pull request #3889 from huffman/entity-tools-polish-2 
Entity tools polish - round 2
 2014-12-03 14:31:27 -08:00