Andrew Meadows
89a782c55a
remove functional code from inside assert
2015-01-11 13:31:37 -08:00
ZappoMan
60f55c7f3f
remove important code from assert so it still runs in release build
2015-01-11 12:07:16 -08:00
Andrew Meadows
e711b86519
scale DEFAULT_DIMENSIONS correctly
...
also remove a block of commented out cruft
2015-01-10 19:07:58 -08:00
Andrew Meadows
1184f5b668
merge upstream/master into andrew/inertia
2015-01-10 12:45:14 -08:00
Andrew Meadows
25e64d619c
move statics out of EntityItem
...
This makes for much more readable core dumps
2015-01-10 11:46:42 -08:00
Andrew Meadows
99e1fdd46e
fix for EntityServer crash
...
adding EntityItem::_element backpointer for easier add/remove logic
2015-01-10 07:44:26 -08:00
Andrew Meadows
4946ec18b6
remove some TODO comments
2015-01-09 09:28:01 -08:00
Andrew Meadows
f8c512b690
fix deleteEntity() to actually delete result
2015-01-08 12:42:16 -08:00
Andrew Meadows
b0b2eb5d38
use exact equality for filtering dimension changes
2015-01-08 11:09:32 -08:00
Andrew Meadows
c37c1515ba
EntitySimulation is lockable
...
also DeleteEntityOperator just removes the entities
and EntityTree does the actual delete
(after properly locking its _simulation)
2015-01-08 10:22:25 -08:00
Andrew Meadows
af9bafae87
fix typo
2015-01-07 12:48:16 -08:00
Andrew Meadows
1745548665
fix rapid attenuation of angular velocity
2015-01-07 12:42:50 -08:00
Philip Rosedale
413cbacbc1
Merge pull request #4043 from ZappoMan/voxelEctomy
...
more voxel-ectomy cleaning up some remaining references to voxels
2015-01-06 10:07:38 -08:00
ZappoMan
b940dcfdb3
more voxel-ectomy cleaning up some remaining references to voxels
2015-01-06 09:27:48 -08:00
Stephen Birarda
51bba4884f
resolve conflicts on merge with upstream master
2015-01-05 14:40:48 -08:00
Andrew Meadows
162854c5a5
Merge pull request #4025 from ZappoMan/voxelEctomy
...
Voxel ectomy
2015-01-05 13:20:30 -08:00
Andrew Meadows
6fb4e1f622
oops, need to update angularVelocity after damping
2015-01-05 12:23:55 -08:00
Andrew Meadows
bf6b8f9ca7
do not zero small velocities for non-bullet case
2015-01-05 12:01:09 -08:00
Andrew Meadows
3b7770f405
change meaning of damping to agree with bullet
...
0 = no damping
1 = 100% damping
The new formula is: velocity *= (1 - damping)^dt
2015-01-05 11:23:01 -08:00
Stephen Birarda
dfb02aea0c
resolve conflicts on merge, add cstring inc
2015-01-05 09:25:30 -08:00
Andrew Meadows
d032eab0de
merge upstream/master into andrew/inertia
2015-01-05 09:19:37 -08:00
Atlante45
022beff569
Initialize entities' _locked and _script
2015-01-02 12:37:00 -08:00
Andrew Meadows
0d3e78fdb8
modify extrapolation behavior when bullet enabled
...
Allows Bullet to specify an object as "at rest"
by setting velocity to zero.
Also, moved velocity damping above position integration
to get the same order of operations as Bullet.
2014-12-31 16:32:09 -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
Brad Hefta-Gaub
43e6ba77fa
Merge pull request #4007 from AndrewMeadows/inertia
...
Bullet physics part 1
2014-12-31 10:33:00 -08:00
ZappoMan
141e231958
more work on voxelEctomy
2014-12-30 18:41:56 -08:00
ZappoMan
4ea9bbc309
first major pass at voxelEctomy
2014-12-30 18:08:58 -08:00
ZappoMan
86a9d5719b
fix one more case of animaiton stutter
2014-12-30 15:12:23 -08:00
Andrew Meadows
da551a0a76
restore script change detection to what it was
2014-12-30 11:56:39 -08:00
Andrew Meadows
ba873deb49
ignore Entity updates that don't change anything
2014-12-30 11:38:24 -08:00
ZappoMan
a0ec2ddfe9
clamp frame index between 0 and 100,000
2014-12-29 21:07:04 -08:00
Andrew Meadows
97f44b64fc
assert NULL EntityItem::_physicsInfo in dtor
2014-12-29 15:27:54 -08:00
Andrew Meadows
213133c705
restoring EntityTreeElement::cleanupEntities()
2014-12-29 15:19:25 -08:00
ZappoMan
49e350fab2
Merge branch 'master' of https://github.com/highfidelity/hifi into animationFrameIndex
2014-12-29 14:01:35 -08:00
Andrew Meadows
0ec56816c0
remove unused variable cruft
2014-12-29 10:43:09 -08:00
Andrew Meadows
bef14a46ac
remove commented out cruft
2014-12-29 10:41:19 -08:00
Stephen Birarda
c7a5f3c86c
resolve conflicts and merge with upstream master
2014-12-29 10:59:42 -07: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
72cced12a6
guards for NULL collisions, possible fix to fountain crash
2014-12-23 11:30:32 -08:00
Sam Gateau
4c670ac17a
merging with upstream master and origin temp0
2014-12-22 10:38:11 -08:00
Sam Gateau
967c6dbc4b
Add the Model library
2014-12-19 16:19:06 -08:00
Stephen Birarda
114e3bb2ff
rename cmake macro to represent actual purpose
2014-12-18 16:51:20 -08:00
Stephen Birarda
2df9512dde
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-12-18 16:49:01 -08:00
Stephen Birarda
4bd3a94794
add missing avatars link to entities
2014-12-18 14:53:52 -08:00
Andrew Meadows
dab1f026d7
simpler EntityItem::simulate() bypass for bullet
2014-12-18 13:56:18 -08:00
Andrew Meadows
85fd1fc14f
merge andrew/thermonuclear into andrew/inertia
...
Conflicts:
interface/src/Application.cpp
libraries/entities/src/EntityItem.cpp
2014-12-18 13:46:06 -08:00
Andrew Meadows
b03e6c53e1
fixing derived classes to use new EntityItem API
...
remove 'forceCopy' argument in EntityItem::setProperties()
2014-12-18 11:41:20 -08:00
Andrew Meadows
28381a3b70
cleanup of EntityItem::_created timestamp logic
...
EntityItem::_created initializes to 0 in ctor
and must be set either by EntityItemProperties (via server update)
or manually whenever a script creates a fresh entity
2014-12-18 11:39:02 -08:00
Stephen Birarda
7beb3a7b62
resolve conflicts on merge with upstream master
2014-12-17 16:57:35 -08:00
Andrew Meadows
756d09d895
fix typo that broke the build
2014-12-17 16:06:15 -08:00
