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

19456 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
a53e1c69fd Merge pull request #3914 from thoys/20163 
CR for Job #20163 - Implement virtual keyboard for use in HMD
 2014-12-07 10:22:34 -08:00
Thijs Wenker
351819708b style fixes 2014-12-06 23:50:30 +01: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
Thijs Wenker
ccdb13c951 virtualkeyboard: moved files to hifi public bucket 2014-12-06 00:33:33 +01: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
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
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
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
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
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
Thijs Wenker
c0ba9e73c2 fixed font height bq 2014-12-05 01:07:49 +01:00
Philip Rosedale
47c2ea95f4 Merge branch 'master' of https://github.com/worklist/hifi 2014-12-04 16:07:28 -08:00
Thijs Wenker
a7185738e9 virtualkeyboard: scaling text in input box 2014-12-05 00:52:36 +01: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