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
Ryan Huffman
eff02d3e3a
Fix Agents bidding on simulation ownership
2016-02-02 10:47:51 -08:00
Stephen Birarda
095f0b9349
rename canAdjustLocks to isAllowedEditor for multi-purpose
2016-02-01 16:46:11 -08:00
Babiuch, Ryan Nicholas
47f7d55e2c
Working energy usage for entity manipulation.
...
- Working example in examples/example/ui/MyEnergyBar.js
2016-02-01 08:32:52 -06:00
Brad Hefta-Gaub
49bbf42995
Merge pull request #6960 from sethalves/fix-adjust-edit-packet-for-clock-skew
...
don't adjust a time of '0 usecs since epoch' with clock skew in edit packets
2016-01-28 12:31:27 -08:00
Howard Stearns
33226796ff
Merge pull request #6964 from ericrius1/editHref
...
Validate href entity property (hifi:// only)
2016-01-28 12:29:18 -08:00
Andrew Meadows
3e35a5fc2d
Merge pull request #6937 from ctrlaltdavid/20790
...
Make entity properties be undefined after entity is unloaded
2016-01-28 11:59:01 -08:00
ericrius1
cd5e81de36
Validating href for edit.js
2016-01-27 16:02:02 -08:00
Seth Alves
f2ea73d646
don't adjust a time of '0 usecs since epoch' with clock skew in edit packets
2016-01-27 14:12:03 -08:00
Seth Alves
1cc0aa18bb
Merge branch 'master' of github.com:highfidelity/hifi into avatar-updates-query-cube
2016-01-26 13:31:07 -08:00
David Rowe
956e70e415
Make entity properties return undefined value after entity is deleted
2016-01-26 22:07:05 +13:00
Brad Hefta-Gaub
1ef01d670d
Revert "Make entity properties be undefined after entity is unloaded"
2016-01-25 18:07:14 -08:00
James B. Pollack
4cff1ab9df
Merge pull request #6919 from ctrlaltdavid/20790
...
Make entity properties be undefined after entity is unloaded
2016-01-25 15:12:10 -08:00
David Rowe
8a8e14f54a
Rework initializers
2016-01-25 11:22:31 +13:00
Brad Davis
a843331626
Still trying to kill OSX warning
2016-01-23 22:07:00 -08:00
David Rowe
840bf7cfb4
Fix OSX and Linux build warning
...
And a typo noticed in passing.
2016-01-24 10:53:40 +13:00
David Rowe
d020114e59
Make entity properties return undefined value after entity is deleted
2016-01-24 08:39:49 +13:00
Andrew Meadows
200676ac68
Merge pull request #6896 from AndrewMeadows/another-crash-fix
...
fix crash when deleting entities quickly
2016-01-22 14:04:46 -08:00
Seth Alves
b6af8ee0cc
Merge branch 'master' of github.com:highfidelity/hifi into avatar-updates-query-cube
2016-01-22 11:46:17 -08:00
Seth Alves
7a3401a8d7
Merge pull request #6867 from AndrewMeadows/collision-group-prep
...
cleanup in preparation for smarter collision grouping
2016-01-22 11:45:42 -08:00
Andrew Meadows
d8fb61e820
fix crash when deleting entities quickly
2016-01-22 10:25:10 -08:00
Brad Hefta-Gaub
b41301d226
Merge pull request #6879 from sethalves/fix-aa-cube-bug
...
fix query-cube vs lod bug
2016-01-21 21:02:42 -08:00
Seth Alves
cbed542682
MyAvatar updates the entity-server about queryAACubes of children entities
2016-01-21 15:53:19 -08:00
Brad Davis
47a1c16430
Resolving warnings
2016-01-21 15:15:18 -08:00
Brad Davis
f9f9ddd8bd
Yet more atmosphere removal
2016-01-21 15:15:17 -08:00
Brad Davis
ae6cba85e8
More atmosphere removal
2016-01-21 15:15:16 -08:00
Brad Davis
b8109af196
Ignite the atmosphere
2016-01-21 15:15:15 -08:00
Seth Alves
5027157575
for LOD, allow entity-server to use getAABox if it can, but fall back to queryAABox if it can't
2016-01-21 09:31:51 -08:00
Seth Alves
729998bbf3
Merge branch 'master' of github.com:highfidelity/hifi into fix-aa-cube-bug
2016-01-21 09:19:47 -08:00
Seth Alves
311e0cee67
Merge pull request #6820 from AndrewMeadows/collision-mask
...
use "collidesWith" instead of "collisionMask"
2016-01-21 09:13:34 -08:00
Seth Alves
1fef78f60f
fix bug where entities that were children of avatars wouldn't be included in entity-server packets to interfaces
2016-01-20 19:03:41 -08:00
Andrew Meadows
19d24293e1
Merge pull request #6855 from sethalves/clean-up-entities-with-bad-parent
...
don't persist entites with invalid parentIDs
2016-01-20 10:38:26 -08:00
Andrew Meadows
a92c512c17
move collision group/mask calculus into EntityItem
2016-01-19 19:52:08 -08:00
Seth Alves
28d673cb97
try again to make this thread safe
2016-01-19 16:00:02 -08:00
Seth Alves
0064ee6ab2
try again to make this thread safe
2016-01-19 15:55:56 -08:00
Seth Alves
edea0320e6
try again to make this thread safe
2016-01-19 15:44:22 -08:00
Seth Alves
f265656e74
expose getJointNames for entities to js
2016-01-19 12:55:17 -08:00
Andrew Meadows
db77f22a61
use "collidesWith" instead of "collisionMask"
...
but make "collisionMask" work for those who want it
2016-01-19 11:41:22 -08:00
Seth Alves
8ba800fda8
Merge pull request #6851 from AndrewMeadows/collisionless2
...
namechange "ignoreForCollisions" to "collisionless"
2016-01-19 11:33:55 -08:00
Brad Hefta-Gaub
e15c7f089e
Merge pull request #6850 from sethalves/various-fixes
...
Various fixes
2016-01-19 10:15:46 -08:00
Andrew Meadows
7fb145e819
namechange ignoreForCollisions --> collisionless
2016-01-19 09:06:17 -08:00
Seth Alves
e365d93ed9
don't save entites with invalid parentIDs (or with IDs that indicates an avatar) to the persist file
2016-01-18 16:50:26 -08:00
Howard Stearns
5caf10beed
Merge pull request #6848 from ZappoMan/entityServerSideSizeCheck
...
Include checking the angular size of entities on the server side for LOD support
2016-01-18 14:13:34 -08:00
