Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 09:53:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
10521 commits 71 branches 56 tags 1.2 GiB
Commit graph

10521 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
029b25ad29 make domain server less noisy about Agent assignments 2014-03-11 16:45:15 -07:00
ZappoMan
12becb9d19 improve octree stats display 2014-03-11 16:22:35 -07:00
Brad Hefta-Gaub
c09b5aec5e Merge pull request #2257 from ey6es/master 
Applied Ryan's tweaks to Visage mapping and config file.
 2014-03-11 12:39:23 -07:00
Brad Hefta-Gaub
df4128a2dd Merge pull request #2255 from ey6es/joints 
Rather than unloading resources immediately when unused, use a simple LRU cache.
 2014-03-11 12:38:42 -07:00
Brad Hefta-Gaub
82cfa41cbe Merge pull request #2263 from birarda/master 
fixes for warnings produced by Xcode 5.1
 2014-03-11 12:37:24 -07:00
Stephen Birarda
d1623e6e4d fixes for warnings produced by Xcode 5.1 2014-03-11 11:45: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
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
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
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
ZappoMan
06a0332fd5 remove space bar behavior from editrVoxels.js 2014-03-10 16:44:33 -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
34ddddae1b Basic LRU cache. Closes #2234. 2014-03-10 12:06:07 -07: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
Andrzej Kapolka
d2f947aee1 Working on LRU cache for resources. 2014-03-10 10:49:38 -07: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
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
ZappoMan
b98dfd82c9 Merge pull request #2237 from birarda/master 
remove svo-viewer to place in external repository
 2014-03-08 16:01:04 -08:00
Stephen Birarda
fa9722741e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-07 16:44:32 -08:00
Stephen Birarda
e52bc2c667 remove svo-viewer to place in external repository 2014-03-07 16:31:01 -08:00
ZappoMan
68c3e0e54d Merge pull request #2236 from Atlante45/fst_upload 
FST ploader base
 2014-03-07 15:42:52 -08:00
Leonardo Murillo
7b587a40e4 Merge pull request #2233 from birarda/cleanup-externals 
make freeglut and glew external dependencies
 2014-03-07 17:18:00 -06:00
Stephen Birarda
3eace31dde add a definition so that static GLEW works without DLL 2014-03-07 14:53:13 -08:00
Stephen Birarda
386d0b8c41 add instructions to put Freeglut DLL into path 2014-03-07 14:51:55 -08:00
Stephen Birarda
6f81803a3d don't have GLUT find module look for the DLL 2014-03-07 14:47:24 -08:00