Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 22:22:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
23929 commits 71 branches 56 tags 1.2 GiB
Commit graph

568 commits

Author SHA1 Message Date
Seth Alves
ef5dffecf6 fix filenames in comments 2015-04-07 10:03:14 -07:00
Seth Alves
9014397167 try again without macro 2015-04-07 09:59:04 -07:00
Seth Alves
3efcc3684e split out octree logging 2015-04-06 17:05:09 -07:00
Seth Alves
91861e9e5a split out octree logging 2015-04-06 17:04:49 -07:00
ZappoMan
84940d8e43 fix SVO import 2015-04-02 14:13:19 -07:00
ZappoMan
69f261ae94 tweaks to the LOD Tools UI 2015-03-23 16:44:19 -07:00
ZappoMan
8239a295cb Merge branch 'master' of https://github.com/highfidelity/hifi into LODTweaks 2015-03-18 11:54:05 -07:00
ZappoMan
e5be8d01b6 tweaks to automatic-LOD adjustments 2015-03-17 10:36:39 -07:00
Seth Alves
bed37ef49a incorporate code review feedback 2015-03-16 13:57:22 -07:00
Seth Alves
5bc2d88ea6 diff minimization 2015-03-16 12:11:41 -07:00
Seth Alves
1e50d94384 don't put arbitrarily large array on stack 2015-03-16 11:59:30 -07:00
Seth Alves
9e6c289ab8 move filename utils into shared library 2015-03-12 10:23:57 -07:00
Seth Alves
3bc85c2531 instead of a json checkbox, a dropdown to chose the file type 2015-03-12 09:34:01 -07:00
Seth Alves
ac882f86e2 backup code is now aware of possible file extension differences 2015-03-12 09:13:53 -07:00
Seth Alves
2a06816f71 added persist-as-json checkbox to domain settings. File extension of persist file is automatically adjusted when entity server saves. When loading, if both a json and svo file exist, the newer one is used. This is regardless of the persistAsJson setting 2015-03-11 23:09:15 -07:00
Seth Alves
48244840d5 merge from upstream 2015-03-10 15:43:40 -07:00
ZappoMan
b9671f3f9b CR feedback 2015-03-10 15:27:44 -07:00
ZappoMan
5facb39aa7 support for import entities from network URL 2015-03-10 12:21:37 -07:00
ZappoMan
c8298ca617 migrate SVO reading to use QDataStream in step toward reading from HTTP url 2015-03-10 10:49:53 -07:00
Seth Alves
afd2c87dfe Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-10 10:12:43 -07:00
Seth Alves
2076de9153 started on reading entities from json file 2015-03-10 10:12:29 -07:00
Seth Alves
81dc7cb8cf started on code to persist entities to file as json rather than in the wire protocol 2015-03-09 13:38:18 -07:00
Andrew Meadows
373be95297 entity cubes are in meters 2015-03-06 15:32:03 -08:00
Andrew Meadows
e4c68bf31c committing some temp debug stuff to help git diff 
(will remove this stuff later)
 2015-03-05 18:06:08 -08:00
Andrew Meadows
49eee89c19 merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-03-05 08:22:02 -08:00
Andrew Meadows
26bb677840 remove ViewFrustum::*VoxelScale() function calls 
we do our math in meters now
 2015-03-04 17:26:52 -08:00
Andrew Meadows
d7d25a6509 Octree::findCapsulePenetration() uses meters 2015-03-04 16:16:49 -08:00
Andrew Meadows
c88f236d1c get version from packet 2015-03-04 09:41:23 -08:00
Andrew Meadows
aede107058 change version of Entity update packet 2015-03-04 09:41:07 -08:00
Andrew Meadows
e1954d3e1d spherical queries into Octree use meters 2015-03-01 15:19:26 -08:00
Andrew Meadows
7836bb4dcd rayIntersection uses meters instead of tree units 2015-02-26 17:42:17 -08:00
Sam Gateau
d8ebb0c5b9 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-26 14:19:23 -08:00
Andrew Meadows
93c77d557a EntityTree::findClosestEntity() now takes meters 2015-02-26 14:14:17 -08:00
Leonardo Murillo
006b3ed0ac Merge pull request #4300 from birarda/dependencies 
NOT MERGEABLE - add some externals as cmake external projects
 2015-02-25 13:22:49 -08:00
Sam Gateau
687c76a6f8 trying to ge the shadow to render correctly 2015-02-23 13:12:29 -08:00
Sam Gateau
90bff36fd3 trying to ge the shadow to render correctly 2015-02-22 18:48:48 -08:00
Stephen Birarda
44f8e599e2 test the possibility that zlib is no longer required 2015-02-19 15:29:28 -08:00
Sam Gateau
b27b599643 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-19 09:53:18 -08:00
Sam Gateau
6070bf8a37 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-18 16:02:18 -08:00
Andrew Meadows
cf9d92abc0 fix EntityServer crash for zero view aspectRatio 2015-02-18 15:48:12 -08:00
Stephen Birarda
b2e587dbbd remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00
Stephen Birarda
c110fcbfad merge with upstream/master 2015-02-17 17:34:48 -08:00
Stephen Birarda
e99012efbb updates to build guides to remove soxr 2015-02-17 10:33:12 -08:00
Andrew Meadows
53855c89e9 Merge pull request #4289 from birarda/dependencies 
add gverb and glm as cmake external projects
 2015-02-17 10:00:29 -08:00
Sam Gateau
11247734d4 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-16 22:08:51 -08:00
Sam Gateau
23354da828 replacing the glTransform pipeline for model rendering 2015-02-16 22:08:21 -08:00
Sam Gateau
cc3cc4f96f replacing the glTransform pipeline for model rendering 2015-02-16 09:31:29 -08:00
ZappoMan
573d7971ac fix a couple of bugs in backup settings 2015-02-13 20:23:12 -08:00
Andrew Meadows
45208d468e Merge pull request #4282 from ZappoMan/bugfix 
some backup logging improvements & a bug fix
 2015-02-13 16:54:25 -08:00
Stephen Birarda
8c998a65ee use the glm find_package and check externals 2015-02-13 12:50:32 -08:00