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

10784 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
35be8cd941 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-11 10:23:13 -07:00
Andrzej Kapolka
4e37586577 Merge pull request #2250 from birarda/windows-build 
windows build cleanup after dependencies work, BUILD guide updates
 2014-03-11 10:22:53 -07:00
Andrzej Kapolka
81e3197751 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-11 10:03:30 -07:00
Stephen Birarda
2f95f3b3a2 Merge pull request #2245 from ZappoMan/cruft_cleanup 
Cruft cleanup
 2014-03-11 09:45:40 -07:00
Stephen Birarda
f3e8e68457 fix a typo for path to tapped qxmpp formula 2014-03-11 09:41:33 -07:00
Stephen Birarda
dc0b9712bb updates to BUILD guide to suggest using tapped formulas 2014-03-11 09:40:54 -07:00
Stephen Birarda
778ad1411f resolve conflicts on merge with upstream master 2014-03-11 09:39:00 -07:00
Andrzej Kapolka
52a831d3f5 Merge pull request #2258 from ZappoMan/bugfixes 
remove space bar behavior from editrVoxels.js
 2014-03-10 18:04:00 -07:00
Andrzej Kapolka
ae6a59ef78 Ray intersections for models, don't load resources if there's no network 
manager installed.
 2014-03-10 17:53:20 -07:00
Stephen Birarda
0b8852cfbe clarify when it is possible to drag-and-drop external dependency 2014-03-10 17:40:06 -07:00
Stephen Birarda
9053379a88 updates to BUILD for addition of qxmpp 2014-03-10 17:36:34 -07:00
Andrzej Kapolka
78957e42be Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-10 17:19:03 -07:00
Stephen Birarda
933d0d21ed Merge pull request #2259 from birarda/master 
remove homebrew formula to place in separate repo
 2014-03-10 17:10:09 -07:00
Stephen Birarda
8f13f38502 update the BUILD guide to point to the new formula location 2014-03-10 17:09:32 -07:00
Stephen Birarda
7080a5f503 remove qt5 homebrew formula - it lives at highfidelity/homebrew-formulas 2014-03-10 17:08:57 -07:00
Andrzej Kapolka
9e5aae4a39 Remove spanner bits. 2014-03-10 17:01:27 -07:00
ZappoMan
06a0332fd5 remove space bar behavior from editrVoxels.js 2014-03-10 16:44:33 -07:00
Atlante45
dd4604f1c5 Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels 2014-03-10 16:41:56 -07:00
Andrzej Kapolka
2005b8dd9d Slight tweak to Visage instructions (in order not to overwrite our custom 
configuration).
 2014-03-10 15:16:48 -07:00
Andrzej Kapolka
853bba27ca Applied Ryan's tweaks to Visage mapping and config file. 2014-03-10 15:13:24 -07:00
Andrzej Kapolka
802cc3eeed Some untested ray intersection bits. 2014-03-10 14:58:31 -07:00
Andrzej Kapolka
7fc55e5596 Better merging for normals. 2014-03-10 13:00:58 -07:00
Andrzej Kapolka
3b63424abd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-10 12:27:07 -07:00
Andrzej Kapolka
34ddddae1b Basic LRU cache. Closes #2234. 2014-03-10 12:06:07 -07:00
stojce
3753c01e31 Merge branch 'master' of https://github.com/worklist/hifi into 19495 2014-03-10 20:03:55 +01:00
Andrzej Kapolka
9731159b82 Merge branch 'master' of https://github.com/highfidelity/hifi into joints 2014-03-10 10:57:48 -07:00
Andrzej Kapolka
de8165c544 Merge pull request #2253 from ey6es/master 
Initialize scale to unity.  Closes #2232.
 2014-03-10 10:54:07 -07:00
Andrzej Kapolka
c6655382d6 Initialize scale to unity. Closes #2232. 2014-03-10 10:52:46 -07:00
Atlante45
a7415d25b3 Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels 2014-03-10 10:50:43 -07:00
Andrzej Kapolka
d2f947aee1 Working on LRU cache for resources. 2014-03-10 10:49:38 -07:00
stojce
a7732deecb Merge branch 'master' of https://github.com/worklist/hifi into 19495 2014-03-10 18:18:10 +01:00
Stephen Birarda
bd0086892d Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-10 09:36:52 -07:00
Stephen Birarda
f099616aff Merge pull request #2246 from ZappoMan/bugfixes 
temporary fix to OSX 10.8 problem by delaying creation of _networkAccessManager
 2014-03-10 09:29:51 -07:00
Stephen Birarda
002738037c only look for the 32-bit oculus lib on windows 2014-03-10 09:28:20 -07:00
Stephen Birarda
4e382099fb have FindGLEW only look for 32-bit static lib 2014-03-10 09:27:32 -07:00
Stephen Birarda
6d5515a41d clarify that Windows builds are 32-bit, fix double GLEW_STATIC 2014-03-10 09:27:01 -07:00
Stephen Birarda
741bf9fe9c remove double definition of GLEW_STATIC 2014-03-10 09:22:51 -07:00
Stephen Birarda
3c7da7496c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-10 09:00:50 -07:00
Philip Rosedale
2a06cfd1bf Merge branch 'master' of https://github.com/worklist/hifi 2014-03-09 18:45:36 -05:00
stojce
ba0bf75d56 Merge branch 'master' of https://github.com/worklist/hifi into 19495 2014-03-09 10:12:46 +01:00
ZappoMan
e2415642f0 temporary fix to OSX 10.8 problem by delaying creation of _networkAccessManager 2014-03-09 00:10:31 -08:00
ZappoMan
f4d487464a more constructor cleanup 2014-03-09 00:01:47 -08:00
ZappoMan
7fb872c1d7 remove dead VoxelSceneStats class and clean up Voxel Stats to be OctreeStats 2014-03-08 23:53:44 -08:00
ZappoMan
cfa618d694 cleanup constructors 2014-03-08 23:31:23 -08:00
Brad Hefta-Gaub
4fbb4b240e Merge pull request #2244 from ZappoMan/fix_cmake_policy_warning 
windows build fixes - mostly cmake problems
 2014-03-08 20:07:51 -08:00
ZappoMan
9c93149bd7 fix searching for sixense SDK on windows 2014-03-08 18:46:36 -08:00
Brad Hefta-Gaub
fe4b2494b8 Merge branch 'master' of git://github.com/worklist/hifi into fix_cmake_policy_warning 2014-03-08 18:29:43 -08:00
ZappoMan
1ceb05bf09 click harder 2014-03-08 18:22:30 -08:00
Brad Hefta-Gaub
e0cbecc3dd Merge pull request #2243 from ZappoMan/fix_cmake_policy_warning 
fix cmake policy warnings
 2014-03-08 17:57:55 -08:00
ZappoMan
35a1bb8744 fix cmake policy warnings 2014-03-08 17:26:38 -08:00