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

627 commits

Author SHA1 Message Date
ZappoMan
1ef58139a4 fix bug in parsing root element data 2015-04-27 15:07:32 -07:00
Seth Alves
2cdbe8bf7b merge from upstream 2015-04-27 09:57:36 -07:00
Seth Alves
e007617112 hook up menu-items to control debug rendering of collision hulls and owned simulations 2015-04-27 09:56:24 -07:00
Seth Alves
0fb1a83e3b quiet compiler, remove some trailing control-Ms 2015-04-25 09:20:00 -07:00
Seth Alves
c69aaa806b if a uuid is null, don't send a uuid of all zeros 2015-04-17 09:55:49 -07:00
Seth Alves
f48f9caea4 cut back on debuging prints 2015-04-16 16:18:13 -07:00
Seth Alves
3b2a15f76a more debugging 2015-04-16 15:52:48 -07:00
Seth Alves
d7059d8f2d add code for uuids in wire protocol. some debugging prints 2015-04-16 14:46:38 -07:00
David Rowe
76d6c6cac5 Delete char* items properly 2015-04-08 20:03:42 -07:00
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
Stephen Birarda
8994cc0268 use external project glm for octree library 2015-02-13 10:32:27 -08:00
ZappoMan
f1a5865201 added more logging to persist and backup, fixed bug in start up case for no models.svo and backup 2015-02-12 15:17:48 -08:00
Andrew Meadows
e6a6946027 merge upstream/master into andrew/thermonuclear 2015-02-09 12:44:52 -08:00
Stephen Birarda
11f3161029 resolve conflicts on merge with upstream/master 2015-02-04 10:38:05 -08:00
Atlante45
7a03daa76f Inline setFieldOfView 2015-02-03 18:51:26 -08:00
Atlante45
27459ba861 Settings update 2015-02-03 12:27:30 -08:00
Andrew Meadows
0b78156956 remove unnecessary #includes 2015-02-02 16:45:51 -08:00
Andrew Meadows
156c4fcc9f removing legacy collision detection code in Octree 2015-02-02 16:42:05 -08:00
Atlante45
4ef87b9919 Merge branch 'master' of https://github.com/highfidelity/hifi into android 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/ui/PreferencesDialog.cpp
	interface/src/ui/Stats.cpp
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
 2015-01-28 13:13:32 -08:00
Atlante45
4eac6cd410 Moved IDENTITY_FRONT/UP/RIGHT to GLMHelpers 2015-01-23 13:19:03 -08:00
Atlante45
850f92eae3 Don't call Settings::set when you don't need too. 2015-01-20 17:54:11 -08:00
Atlante45
8d37f5ae00 More setting handles 2015-01-20 15:35:22 -08:00
Atlante45
967028e5cf Removed more QSettings references 2015-01-18 19:29:27 -08:00
Atlante45
e8a396b08b Moved Octree max pps out of Menu 
Moved it to OctreeQuery
 2015-01-17 23:31:38 -08:00
Atlante45
bfceaf2838 Moved FieldOfView related members out of Menu 
Moved them to ViewFrustum
 2015-01-17 22:37:02 -08:00
Atlante45
f77fab2fe0 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 20:38:52 -08:00
ZappoMan
0e19e1f8a5 cleanup some dead code 2015-01-13 13:48:28 -08:00
ZappoMan
60aec8ac00 add support for multiple backup rules 2015-01-13 13:41:32 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
 2015-01-13 11:03:14 -08:00
ZappoMan
ea3a5b7fcd use last backup files timestamp as last backup time. 2015-01-12 17:29:10 -08:00
ZappoMan
7b65c75414 first cut at restoreFromMostRecentBackup 2015-01-12 14:32:13 -08:00
ZappoMan
1562aab6da intitial pass at lock file 2015-01-12 12:35:17 -08:00
ZappoMan
9630279459 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 
Conflicts:
	examples/editVoxels.js
	examples/fallingSand.js
	examples/growTrees.js
	interface/src/Application.cpp
	interface/src/Application.h
	libraries/avatars/CMakeLists.txt
	libraries/entities/src/EntityItem.h
 2014-12-31 10:50:53 -08:00
ZappoMan
67595ea571 more voxelEctomy 2014-12-30 20:35:21 -08:00
ZappoMan
5cef7d0e9d more voxelEctomy 2014-12-30 20:24:27 -08:00
ZappoMan
278ed96f14 more work on voxelEctomy 2014-12-30 18:54:53 -08:00
ZappoMan
141e231958 more work on voxelEctomy 2014-12-30 18:41:56 -08:00
Andrew Meadows
9b7e50858a merge upstream/master into andrew/inertia 
Conflicts:
	libraries/avatars/CMakeLists.txt
	libraries/entities/CMakeLists.txt
 2014-12-29 09:15:49 -08:00
ZappoMan
17ed92cf7e fix runaway backup bug 2014-12-23 10:11:08 -08:00
Atlante45
327daacecd Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	libraries/networking/src/NodeList.cpp
 2014-12-22 13:34:18 -08:00
Stephen Birarda
114e3bb2ff rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
Andrew Meadows
11f01e1859 merge upstream/master into andrew/inertia 2014-12-18 15:01:08 -08:00
Atlante45
990362b8ff Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11 2014-12-18 14:18:21 -08:00
Stephen Birarda
b326ab9839 remove quotes from library links for debug/optimized 2014-12-18 09:38:48 -08:00
Stephen Birarda
d38c78f2c3 remove bubbling of linked libraries, cmake does it 2014-12-18 09:34:04 -08:00
Atlante45
0bd9ed469e Changed NodeList::getInstance() calls to use the DM 2014-12-17 15:28:25 -08:00
Andrew Meadows
67c3a25475 Merge branch 'master' of ssh://github.com/highfidelity/hifi into inertia 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityItem.h
 2014-12-15 14:46:46 -08:00
Stephen Birarda
8549e9cb53 resolve conflicts on merge with upstream master 2014-12-15 09:36:17 -08:00
ZappoMan
f2ed1337b5 fix ray picking output distance to be meters 2014-12-10 11:04:32 -08:00
Andrew Meadows
3fd2f12a73 merge upstream/master into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItem.h
	libraries/entities/src/EntitySimulation.h
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/entities/src/SimpleEntitySimulation.cpp
	libraries/entities/src/SimpleEntitySimulation.h
	libraries/entities/src/SphereEntityItem.cpp
 2014-12-09 12:41:53 -08:00
Atlante45
eaaaa0687c spacing 2014-12-09 11:53:14 -08:00