Andrew Meadows
e418872f7b
namechanges: setFooInMeters() --> setFoo()
...
also fixed some warnings, made code abide to standard,
and moved some variables to be closer to where they're used
2015-03-09 09:56:15 -07:00
Andrew Meadows
51d05cc43e
merge upstream/master into andrew/isentropic
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
2015-03-09 08:51:49 -07:00
Jason
0fd9540bc3
Sync to upstream
...
Did "fetch upstream", "merge upstream/master", and resolved one
conflict.
2015-03-07 21:40:06 -08:00
Andrew Meadows
ba6e66f169
merge upstream/master into andrew/isentropic
2015-03-07 18:03:49 -08:00
Andrew Meadows
f5352333f0
entities use radians per second for angular velocity
2015-03-06 16:42:06 -08:00
Jason
7a5669f14e
Interview project updates.
...
Tried to address all of Brad's notes, most of which were related to
matching the coding style for the project. Also used GeometryCache
instead of making direct calls to OpenGL to do drawing, took a different
approach to seeding rand(), updated the packet version, and fixed a bug
that I noticed in the setting of the dimensions for the particle effect
entity.
2015-03-06 15:52:21 -08:00
Andrew Meadows
95c7bcb5f8
whoops -- remove last *InTreeUnits() calls
2015-03-06 15:34:35 -08:00
Andrew Meadows
c4dafc74ad
whoops, remove last bestFitBoundsInMeters() call
2015-03-06 15:33:15 -08: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
Ryan Huffman
2c68d56059
Update Entity::sendEntities to return new entity ids
2015-03-05 12:34:05 -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
59a70b5b5f
remove cruft and fix default entity dimensions
2015-03-04 17:32:46 -08:00
ZappoMan
e99ffb8307
fix bug in export
2015-03-04 16:29:34 -08:00
Andrew Meadows
d7d25a6509
Octree::findCapsulePenetration() uses meters
2015-03-04 16:16:49 -08:00
Jason
3522357c8c
High Fidelity interview project -- Jason Rickwald
...
For my project, I decided to add a new entity -- a Particle Effect.
This is really rudimentary to start out with, but you could see where
it's headed.
2015-03-04 16:06:06 -08:00
Andrew Meadows
ca1c9b4105
EntityItem::findEntities() uses meters
2015-03-04 16:05:29 -08:00
Andrew Meadows
b9cbd1ea6e
witch internal EntityItem data to use meters
2015-03-04 09:38:37 -08:00
Ryan Huffman
b370e025c9
Move EntityScriptingInterface instance to DependencyManager
2015-03-02 15:05:31 -08:00
Ryan Huffman
98e0f235cc
Merge branch 'master' of git://github.com/highfidelity/hifi into block-restricted-users
2015-03-02 14:47:26 -08:00
Ryan Huffman
9a302eebed
Add Entities.canAdjustLocksChanged
2015-03-02 10:40:29 -08:00
Ryan Huffman
1a3eb68e2d
Update lightEntityItem old version handling to be more clear
2015-03-02 09:25:18 -08:00
Andrew Meadows
90b69b1ee0
replace some "InDomainUnits" calls with "InMeters"
2015-03-01 15:58:10 -08:00
Andrew Meadows
c2e78931c6
revert namechange: use compiler find all instances
2015-03-01 15:21:01 -08:00
Andrew Meadows
e1954d3e1d
spherical queries into Octree use meters
2015-03-01 15:19:26 -08:00
Ryan Huffman
84691f922c
Remove old light color properties
2015-02-27 14:04:56 -08:00
Ryan Huffman
61bc32493f
Fix entity version name in LightEntityItem
2015-02-27 13:49:17 -08:00
Ryan Huffman
093e5db90d
Update entity light properties to use new model
...
Rename constantAttenuation -> intensity
Rename diffuseColor -> color
Remove remaining attenuation and colors
2015-02-27 13:42:56 -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
