Zach Pomerantz
32ce7c6eab
Rename light surfaceRadius->falloffRadius
2016-02-25 10:02:33 -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
samcake
51bacdebdd
Trying to notify the entity changes to the render item correctly, need more work
2016-02-10 11:52:37 -08:00
Seth Alves
9d21c3d549
Merge branch 'master' of github.com:highfidelity/hifi into grab-then-equip
2016-02-10 11:35:25 -08:00
Anthony J. Thibault
727e289ecd
SpatiallyNestable: bug fixes for kinematic entities
...
* Kinematic entities were being simulated with position in the local frame but velocity in the global frame.
* Also, because getVelocity() was returning non-zero values when the parent was moving, kinematic objects were being simulated even if they should have been at rest.
* Bug fix for calculating velocity direction was incorrect, if the parent frame was rotated.
2016-02-09 17:58:54 -08:00
Seth Alves
251810edc5
only suppress location edits when they arrive over the network -- script can still update
2016-02-09 15:03:36 -08:00
Seth Alves
43592fd699
Merge pull request #7048 from hyperlogic/tony/avatar-on-moving-platform
...
Better avatar animation when attached to a moving entity
2016-02-09 14:30:02 -08:00
Anthony J. Thibault
072172b1a2
SpatiallyNestable: now with velocity support!
...
Moved velocity and angularVelocity into the SpatiallyNestable base class.
Entity velocity and angularVelocity properties are now relative to their parent, similar to the way position and orientation work for entities.
MyAvatar rig animations now use SpatiallyNestable to convert velocity into local frame to drive the animation state machine.
2016-02-08 19:43:23 -08:00
Seth Alves
d5f3447fbc
when updating queryAACubes for children, use the lastEdited from the parent's properties
2016-02-08 16:22:41 -08:00
Seth Alves
4f8a7a080f
remove debugging print
2016-02-08 15:33:03 -08:00
Seth Alves
82fcfc1d64
don't apply clock-skew to a lastEdited of 0
2016-02-08 15:31:32 -08:00
Seth Alves
e2098038f1
only setLastEdited on properties to be sent
2016-02-08 15:16:15 -08:00
Seth Alves
92d016f03a
debugging prints for queryAACube
2016-02-08 15:09:34 -08:00
Seth Alves
44ddfb8039
set last-edited when updating a child's queryAACube
2016-02-08 15:08:58 -08:00
Brad Hefta-Gaub
3f0ebf7732
Merge pull request #7031 from AndrewMeadows/simulation-ownership
...
server can clear simulation ownership
2016-02-06 19:19:39 -08:00
Andrew Meadows
2da46ff26a
server-side release ownership
2016-02-04 13:26:07 -08:00
Andrew Meadows
959f924b1d
flag entity as changed when changing simulatorID
2016-02-04 13:26:07 -08:00
Andrew Meadows
381049acb3
clear simulation ownership when owners vanish
2016-02-04 13:26:06 -08:00
Andrew Meadows
05fb866bb5
fix spelling typo in comment
2016-02-04 13:26:06 -08:00
Andrew Meadows
e3351c05a2
make some methods const
2016-02-04 13:26:06 -08:00
Babiuch, Ryan Nicholas
0069849da3
Consider existing velocity in calculating energy costs when editing entities.
2016-02-04 08:55:23 -06:00
Babiuch, Ryan Nicholas
dca7ff967c
Conform to coding standard.
2016-02-04 08:26:56 -06:00
Babiuch, Ryan Nicholas
142ec76600
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-04 08:18:47 -06:00
Andrew Meadows
63df34541d
Merge pull request #6802 from huffman/agent-simulation
...
Fix Agents bidding on simulation ownership
2016-02-03 13:45:12 -08:00
Babiuch, Ryan Nicholas
786400eb53
Merge branch 'WorkingEnergy'
2016-02-03 14:53:28 -06:00
Babiuch, Ryan Nicholas
3d727d76c2
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-03 13:39:13 -06:00
Babiuch, Ryan Nicholas
3cb2f9c4b7
Exposed energy cost multiplier to scripting.
...
- field: costMultiplier
2016-02-03 13:29:42 -06:00
Ryan Huffman
963c71a476
Fix ES rejecting unowned entity physics updates
2016-02-03 09:28:49 -08:00
Babiuch, Ryan Nicholas
7dd5bca17f
Bug fixes and debt reductions on energy calculations.
...
- removed superfluous code interfacing with scripts
- favor floats over doubles in cost calculations
- default avatar energy is maximum float value for cases where energy script is not loaded in order to still manipulate entities.
2016-02-03 10:46:28 -06:00
Ryan Huffman
25632b63b7
Adjust Entities.addEntity to not bid on simulation from AC Script
2016-02-02 13:00:35 -08:00
