Seth Alves
|
01659cf93b
|
try, try again
|
2016-03-11 16:21:20 -08:00 |
|
Seth Alves
|
5f05d576cc
|
move checkAndAdjustQueryAACube into SpatiallyNestable
|
2016-03-11 15:55:42 -08:00 |
|
Seth Alves
|
1e8706b1da
|
remove debug print
|
2016-03-11 14:47:53 -08:00 |
|
Seth Alves
|
2ad15f7568
|
try harder to get queryAABoxes to be correct
|
2016-03-11 14:38:31 -08:00 |
|
Seth Alves
|
7a4dad8e51
|
allow entity-server to patch up broken queryAACubes
|
2016-03-11 13:20:52 -08:00 |
|
Seth Alves
|
f611d8f747
|
if needed, set querryAACube when dimensions are updated
|
2016-03-11 12:41:18 -08:00 |
|
Philip Rosedale
|
ee1e4b898e
|
Merge pull request #7278 from AndrewMeadows/simulation-priority
adjust simulation priorities
|
2016-03-10 08:52:18 -08:00 |
|
Andrew Meadows
|
9157ff6eda
|
more correct notion of desired simulation priority
|
2016-03-09 11:02:50 -08:00 |
|
Brad Hefta-Gaub
|
1c07276501
|
fix a couple bugs
|
2016-03-09 09:45:55 -08:00 |
|
Andrew Meadows
|
99a1310711
|
change properties at 127 priority, grab at 128
|
2016-03-08 22:17:44 -08:00 |
|
Brad Hefta-Gaub
|
8d4ef28411
|
CR feedback
|
2016-03-08 15:29:04 -08:00 |
|
Brad Hefta-Gaub
|
35d6afbe77
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fixSceneNotStable
|
2016-03-08 14:53:41 -08:00 |
|
Brad Hefta-Gaub
|
6d211dd4e5
|
first cut at fixing the scene not stable bug
|
2016-03-08 14:52:21 -08:00 |
|
Seth Alves
|
dcb720a832
|
fix polyvox hull when registration changes.
|
2016-03-06 14:09:45 -08:00 |
|
Seth Alves
|
9346171695
|
if entity registration isn't default, adjust physics shapes to match
|
2016-03-04 16:47:30 -08:00 |
|
Philip Rosedale
|
3eabf0d451
|
Merge pull request #7209 from sethalves/auto-unhook-stuck-to-hand
when trigger is squeezed, check for things stuck to hand and unhook them
|
2016-02-29 12:59:02 -08:00 |
|
Clément Brisset
|
2ffaa1f2e7
|
Merge pull request #7196 from AndrewMeadows/simulation-ownership
no expiry for simulation ownership
|
2016-02-29 08:26:53 -08:00 |
|
Andrew Meadows
|
a933935e2d
|
lock mutex in clearEntitiesInernal()
|
2016-02-28 15:13:49 -08:00 |
|
Seth Alves
|
5bf8670bc2
|
fix SpatiallyNestable::getChildren
|
2016-02-28 12:16:41 -08:00 |
|
Seth Alves
|
6c9cf386a6
|
when trigger is squeezed, check for things stuck to hand and unhook them
|
2016-02-26 10:14:09 -08:00 |
|
Andrew Meadows
|
acef6642c9
|
fix logic typo
|
2016-02-25 18:09:35 -08:00 |
|
Andrew Meadows
|
5d1e283508
|
namechange TouchesKeyhole to IntersectsKeyhole
|
2016-02-25 18:09:35 -08:00 |
|
Andrew Meadows
|
dfdf375853
|
use shapeInFrustum() names again
but at the same time make the code more redable
also: add some more efficient shape-touches-view methods
and cleanup some whitespace
|
2016-02-25 18:09:35 -08:00 |
|
Brad Hefta-Gaub
|
202a456e1a
|
Merge pull request #7126 from AndrewMeadows/cleanup
cleanup ViewFrustum method names
|
2016-02-25 16:12:25 -08:00 |
|
Brad Hefta-Gaub
|
82cbf19bca
|
Merge pull request #7078 from zzmp/fix/light-intensity
Reimplement light attenuation for spot and point lights
|
2016-02-25 16:08:28 -08:00 |
|
Andrew Meadows
|
b4edfe2390
|
no expiry for simulation ownership
|
2016-02-25 12:07:20 -08:00 |
|
Zach Pomerantz
|
32ce7c6eab
|
Rename light surfaceRadius->falloffRadius
|
2016-02-25 10:02:33 -08:00 |
|
Andrew Meadows
|
9c927ea36b
|
ViewFrustum method renames and whitespace cleanup
fooInFrustum() --> computeFooViewLocation()
except pointInFrustum() --> computeFrustumLocation()
|
2016-02-25 09:11:28 -08:00 |
|
Zach Pomerantz
|
13153bcf08
|
Fix keyLight.ambientURL capitalization
|
2016-02-23 16:53:16 -08:00 |
|
Zach Pomerantz
|
1e3cfd6baf
|
Detect changes for surfaceRadius
|
2016-02-22 19:27:35 -08:00 |
|
Zach Pomerantz
|
8688bf2abb
|
Move light entity defaults to light
|
2016-02-22 15:56:10 -08:00 |
|
Zach Pomerantz
|
77ad4039bc
|
Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity
|
2016-02-22 15:11:12 -08:00 |
|
Zach Pomerantz
|
6d7bf7d423
|
Add PROP_SURFACE_RADIUS to LightEntity
|
2016-02-22 15:07:07 -08:00 |
|
Thijs Wenker
|
58539171a3
|
give particle trails a nice smooth path between frames
|
2016-02-20 22:46:19 +01:00 |
|
Seth Alves
|
af1640ac4e
|
adjust avatar-energy code to avoid editing local tree and then not telling the entity-server about it
|
2016-02-17 14:36:18 -08:00 |
|
samcake
|
545f276fdf
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-02-15 09:29:00 -08:00 |
|
Brad Hefta-Gaub
|
9160758af7
|
make sure forced reload still works
|
2016-02-12 15:09:50 -08:00 |
|
Brad Hefta-Gaub
|
550b9a98b1
|
fix error in preload logic
|
2016-02-12 14:45:55 -08:00 |
|
samcake
|
f12030c1a4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-02-11 18:41:02 -08:00 |
|
James B. Pollack
|
2889bdd8b2
|
Merge pull request #7083 from ZappoMan/fixDoublePreload
handle two corner cases where preload would get called twice
|
2016-02-11 16:08:43 -08:00 |
|
Chris Collins
|
a4afa03fe5
|
Merge pull request #7077 from sethalves/clean-up-grab-signaling
Clean up grab signaling + various fixes
|
2016-02-11 10:20:56 -08:00 |
|
samcake
|
31230e81bb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-02-11 10:05:58 -08:00 |
|
Brad Hefta-Gaub
|
a40a562db2
|
handle two conner cases where preload would get called twice
|
2016-02-11 09:33:52 -08:00 |
|
Seth Alves
|
3a2b082a7f
|
remove incorrect assert
|
2016-02-10 20:47:22 -08:00 |
|
Seth Alves
|
ffce38769f
|
properties hold local velocities, not world-frame ones
|
2016-02-10 19:16:08 -08:00 |
|
Seth Alves
|
6a646f1c24
|
put isMoving back and change all uses to isMovingRelativeToParent
|
2016-02-10 19:01:41 -08:00 |
|
Seth Alves
|
3fe01ccf10
|
cleanups
|
2016-02-10 18:32:05 -08:00 |
|
Seth Alves
|
3e71efcdbb
|
all code that asks isMoving appears to mean relative to parent
|
2016-02-10 18:21:44 -08:00 |
|
Seth Alves
|
1ae47b17f0
|
size-cull parent entities by their queryAABox rather than their dimensions to avoid having the entity-server send a child but not the parent
|
2016-02-10 16:41:35 -08:00 |
|
Seth Alves
|
49f2724608
|
don't return void
|
2016-02-10 13:49:03 -08:00 |
|