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

525 commits

Author SHA1 Message Date
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
Andrew Meadows
64c28fe925 remove EntityItem::getSize() 2015-02-26 15:36:59 -08:00
Andrew Meadows
7210c7a88b added EntityTree::findEntitiesInMeters() 
progress toward conversion to meters
 2015-02-26 15:16:59 -08:00
Andrew Meadows
93c77d557a EntityTree::findClosestEntity() now takes meters 2015-02-26 14:14:17 -08:00
Andrew Meadows
8d4ea143ce easy conversions of: InDomainUnits --> InMeters 2015-02-25 14:48:06 -08:00
Andrew Meadows
2f749e3c51 merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/entities/src/TextEntityItem.h
 2015-02-25 14:40:32 -08:00
Andrew Meadows
2ffb19a0ed getPosition() --> getPositionInDomainUnits() 
and friends
 2015-02-25 14:35:04 -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
Andrew Meadows
0456cb298f lower threshold for ignoring rotation updates 
one hundred fold smaller
 2015-02-24 17:16:00 -08:00
Andrew Meadows
3cd0a70641 store shapeType whenever it is explicitly changed 2015-02-23 14:35:44 -08:00
Andrew Meadows
2e1c122915 moved ShapeType boilerplate stuff macos 2015-02-23 11:38:56 -08:00
Andrew Meadows
0fc4c732f7 use macro for copying shapeType string to script 2015-02-23 10:13:47 -08:00
Andrew Meadows
27e6f99deb use strings for shapeType for JS Entity properties 2015-02-20 16:54:58 -08:00
Stephen Birarda
6b08b2993a fix for bullet system include to silence warnings 2015-02-19 13:03:16 -08:00
Stephen Birarda
6f055ca0d7 add an external project to handle bullet 2015-02-19 12:01:40 -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
Brad Hefta-Gaub
9b6049489b Merge pull request #4280 from AndrewMeadows/inertia 
remove a couple crash modes on shutdown
 2015-02-13 17:11:56 -08:00
Andrew Meadows
cfbf8fdca7 explicit cleanup of loaded model animations 
in Application dtor
 2015-02-13 16:19:10 -08:00
ZappoMan
bc5a1477e6 added logging of edit commands in the server 2015-02-13 14:59:57 -08:00
Stephen Birarda
8c998a65ee use the glm find_package and check externals 2015-02-13 12:50:32 -08:00
Stephen Birarda
866295b09e use external project glm in entities library 2015-02-13 10:24:46 -08:00
Andrew Meadows
b4bd60e979 give TextEntityItem a box collision shape 2015-02-12 08:28:34 -08:00
Andrew Meadows
8b34283d76 fix missing comma 2015-02-11 13:21:57 -08:00
Andrew Meadows
4581802532 explicitly flag virtual functions as such 2015-02-11 13:03:22 -08:00
Andrew Meadows
bd1817817b restore order of PROP_USER_DATA 2015-02-11 12:59:59 -08:00
Andrew Meadows
ff27ab74ae expose _shapeType to script and server 2015-02-11 08:46:41 -08:00
Andrew Meadows
e6a6946027 merge upstream/master into andrew/thermonuclear 2015-02-09 12:44:52 -08:00
Andrew Meadows
12543cae75 initial add of ModelEntityItem::_shapeType 2015-02-09 12:43:56 -08:00
Andrew Meadows
13b00f3f8f forgot to add SphereEntityItem.cpp to last commit 2015-02-08 15:10:16 -08:00
Andrew Meadows
450713fdaa Entitis support new (pending) API for ShapeInfo 2015-02-08 15:08:50 -08:00
Brad Hefta-Gaub
79b397fc3f Merge pull request #4241 from birarda/master 
repairs for warnings exposed in Xcode
 2015-02-06 11:49:29 -08:00
Seth Alves
9539292c22 clarify settings explaination, coding standard 2015-02-06 10:44:35 -08:00
Stephen Birarda
c96085eb91 repairs to warnings shown in Xcode 2015-02-06 10:12:04 -08:00
Seth Alves
839b622a05 formatting 2015-02-06 09:20:16 -08:00
Seth Alves
60a4f48985 rather than a list of allowed editors, a list of allowed lockers/unlockers 2015-02-06 09:14:40 -08:00
Seth Alves
46bf6ea5da coding standard 2015-02-05 16:37:37 -08:00
Seth Alves
bad44c540a also guard deleteEntity and getEntityProperties with canEdit. make canEdit available to javascript 2015-02-05 16:22:52 -08:00
Seth Alves
80cf571d7d formatting 2015-02-05 15:43:27 -08:00
Seth Alves
485785be7f Allowed Editors setting in DomainServer; domain-list wire protocol includes "you can edit" boolean after uuid; entity server checks canEdit flag of node who sends edit requests; interface does not attempt to do edits if DomainServer sent false for "you can edit" 2015-02-05 15:37:14 -08:00
Clément Brisset
6a4577b6a5 Merge pull request #4231 from ZappoMan/crashonexit 
BUG FIXES: Crash on Exit with partially loaded scene & (near)-infinite loop in skipForward physics
 2015-02-04 16:16:56 -08:00
ZappoMan
8fd11e70cc clamp dt for skipTimeForward to prevent near infinite loops 2015-02-04 15:16:18 -08:00
Ryan Huffman
2b00e3fadc Add force option to deleteEntity 2015-02-04 10:49:49 -08:00
Andrew Meadows
547a416c3b merge upstream/master into andrew/bispinor 2015-02-03 18:33:10 -08:00
Andrew Meadows
90202591fc remove legacy shapes from EntityItem and friends 2015-02-03 10:05:39 -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