Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-22 23:20:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36752 commits 25 branches 0 tags 1.1 GiB
Commit graph

1799 commits

Author SHA1 Message Date
Atlante45
40e802bae7 Get rid of global variable for sort 
Fix rhs/lhs
 2015-11-24 11:51:56 -08:00
Atlante45
a71ed7b166 Implement particle bounds with Extents 2015-11-24 11:51:56 -08:00
Philip Rosedale
dde01b2071 Merge pull request #6476 from AndrewMeadows/arrow 
fix for objects suffering from very small updates to physics properties
 2015-11-24 11:22:25 -08:00
Andrew Meadows
e26081e981 always update physics properties when they change 
and move activation check logic to MotionState
 2015-11-24 10:20:19 -08:00
Ryan Huffman
dac491ef41 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-24 09:59:22 -08:00
Stephen Birarda
5a7b0dd1ad put the parsed model URL in ModelEntityItem 2015-11-24 11:46:51 -06:00
ericrius1
1409ed2d18 moved logic to build vertices buffer to renderable class, recalculating vertices anytime any of the normals, point, or strokeWidths data changes 2015-11-23 12:28:44 -08:00
Anthony J. Thibault
dd3f43705c Fix for Model Entity animations. 
Because rig->setJoint* methods take parameters in geometry space
the animations preRotation has to be applied manually.
 2015-11-23 11:06:11 -08:00
Seth Alves
6f19093cb9 if an entity with an action has a motion-type of static, flag it so it gets updated in bullet 2015-11-23 10:03:35 -08:00
Seth Alves
a0c1f9a1f9 progress toward having things be children of specific joints rather than just of other objects 2015-11-22 13:11:37 -08:00
Seth Alves
4646c0c103 unmangle merge 2015-11-21 10:49:31 -08:00
Seth Alves
f013f95e9b merge from upstream 2015-11-21 08:43:00 -08:00
Brad Hefta-Gaub
c7673aad4a Merge pull request #6447 from huffman/polyline-texture 
Add texture property to polyline entity type
 2015-11-20 13:31:34 -08:00
Ryan Huffman
9e31614fce Fix textures property not being sent for polyline 2015-11-19 15:16:46 -08:00
Ryan Huffman
2a416ebc61 Merge branch 'master' of https://github.com/highfidelity/hifi into received-message 2015-11-18 16:52:23 -08:00
Brad Hefta-Gaub
2f3cf82202 don't apply out of order edits to entities that have been deleted 2015-11-18 14:26:18 -08:00
Ryan Huffman
2fe9af54d4 Add textures property to polyline 2015-11-18 13:59:32 -08:00
Philip Rosedale
5b853ddf57 Merge pull request #6402 from sethalves/grab-equip 
grab script bumper is an equip toggle
 2015-11-17 20:15:26 -08:00
Philip Rosedale
450608bf5b Merge pull request #6390 from sethalves/average-near-holds 
Average near holds
 2015-11-17 20:01:46 -08:00
Seth Alves
1d4e1eabcb Merge branch 'master' of github.com:highfidelity/hifi into grab-equip 2015-11-17 11:01:22 -08:00
Seth Alves
b062d23f61 bumper is now an equip toggle 2015-11-17 09:51:52 -08:00
David Rowe
b3b73e8cd1 Fix particle aging 2015-11-17 12:02:35 +13:00
Seth Alves
b567a4846d Merge branch 'master' of github.com:highfidelity/hifi into average-near-holds 2015-11-16 10:08:01 -08:00
Seth Alves
89ed3751ae Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug 2015-11-14 14:00:20 -08:00
Seth Alves
b0d24be58f add a way to get a list of all actions of a certain type from an entity. hold actions average their positional targets. 2015-11-13 16:02:39 -08:00
Stephen Birarda
e263453acb Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-13 14:48:26 -08:00
Seth Alves
3746920655 allow action updates from others when we are the simulation owner 2015-11-13 13:56:30 -08:00
Seth Alves
6ec5b12081 send to network when an action is deleted, also 2015-11-13 09:52:35 -08:00
Seth Alves
3f7f5a2bbd send to network when an action is deleted, also 2015-11-13 09:49:31 -08:00
Seth Alves
5acbb74362 send to network when an action is deleted, also 2015-11-13 09:45:06 -08:00
Seth Alves
7979fb38cf don't always send actiondata along with other physics related properties 2015-11-13 09:25:17 -08:00
Seth Alves
dbaea5770a include action data in properties suppressed by non-simulation ownership 2015-11-12 18:28:26 -08:00
Brad Hefta-Gaub
ecaa50c0ff fix for infinite loop in erase entities special packet 2015-11-12 18:25:18 -08:00
Seth Alves
d7be1699a7 adjust how the decision to send action changes over the wire is made 2015-11-12 15:27:10 -08:00
Seth Alves
a8cd891e48 adjust how the decision to send action changes over the wire is made 2015-11-12 14:19:23 -08:00
Stephen Birarda
ef778c554c Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-12 10:40:51 -08:00
Seth Alves
cffe4551dd merge from upstream 2015-11-11 16:15:07 -08:00
Seth Alves
07f3d8eca0 more debugging prints 2015-11-11 16:03:08 -08:00
Brad Hefta-Gaub
2f903a9513 CR feedback and some cleanup 2015-11-11 14:21:14 -08:00
Brad Hefta-Gaub
bdfe304f7a remove some logging 2015-11-11 14:08:15 -08:00
Brad Hefta-Gaub
040bae6014 more debugging 2015-11-11 12:31:50 -08:00
Brad Hefta-Gaub
866116d285 more debugging 2015-11-11 12:13:47 -08:00
Seth Alves
31ebe5dba1 terse logging for sim ownership 2015-11-11 08:51:10 -08:00
Seth Alves
39b92d2b52 terse log when ownership changes 2015-11-10 17:06:12 -08:00
Brad Hefta-Gaub
3316b63bf6 add a fixme comment 2015-11-10 15:46:53 -08:00
Brad Hefta-Gaub
006a1d60c8 keep some additional erase entities history and send to viewers 2015-11-10 15:31:51 -08:00
Seth Alves
df5d161721 adjust how EntityMotionState updates its idea of what the server knows about an entity 2015-11-10 15:02:17 -08:00
Seth Alves
82bd506086 adjust how EntityMotionState updates its idea of what the server knows about an entity 2015-11-10 14:32:57 -08:00
Seth Alves
5e4f30b2bb improve terse entity logging. change how action data sending is triggered 2015-11-10 13:58:09 -08:00
Atlante45
b15054c1fb Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-09 13:41:06 -08:00
Atlante45
6a53021818 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-09 13:23:31 -08:00
Eric Levin
7700e67734 Merge pull request #6326 from imgntn/entity_params 
Add Ability to Pass Parameters When Calling Methods on Entities
 2015-11-09 12:17:58 -08:00
James B. Pollack
1812444614 Merge pull request #6278 from ericrius1/particleSorting 
Added additiveBlending property to particle effect entity
 2015-11-09 11:32:44 -08:00
James B. Pollack
e928c8278b overload a single function and cleanup, add examples 2015-11-06 11:48:51 -08:00
Seth Alves
4ed8a1e5d1 changes to send an update to entity-server when AvatarActionHold releases an entity 2015-11-06 09:25:53 -08:00
James B. Pollack
3cee569bae pass parameters to entities 2015-11-05 16:57:39 -08:00
James Pollack
b229b5289c entity call params 2015-11-05 14:24:21 -08:00
James Pollack
751d51ee72 entity call params 2015-11-05 14:19:11 -08:00
ericrius1
4e5b806934 particle effect entities no longer intersect with rays 2015-11-04 16:05:29 -08:00
Seth Alves
9b3708ea66 use parentChanged to recalculate entity bounding boxes 2015-11-04 09:27:57 -08:00
Atlante45
55894f2eee Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-03 17:46:24 -08:00
ericrius1
31fe5fa953 Bump version num, use different shader for additive blending effect 2015-11-03 17:15:10 -08:00
Seth Alves
ffb0317a50 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-11-03 16:53:00 -08:00
Seth Alves
60824a1fb0 back out some off-brand changes. add parentChanged call 2015-11-03 16:07:28 -08:00
ericrius1
a722ad46f6 Merge branch 'master' into particleSorting 2015-11-03 15:47:44 -08:00
Seth Alves
f60b1d9bd7 unmangle merge 2015-11-03 13:50:35 -08:00
ericrius1
777fbe6d83 moved additive_blending flag to proper location 2015-11-03 12:43:41 -08:00
ericrius1
0ed868077d Added additive blending as option for particle effect 2015-11-03 10:02:51 -08:00
Ryan Huffman
f4531759be Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-02 12:27:08 -08:00
Ryan Huffman
7f4a8e9d7d Merge branch 'master' of github.com:Atlante45/hifi into baseball 2015-11-02 12:25:51 -08:00
Seth Alves
3ac0fef1ea merge from upstream 2015-11-01 15:22:57 -08:00
Howard Stearns
79f05c63e5 Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds 2015-10-31 11:23:18 -07:00
Bradley Austin Davis
46d87dda5a Fixing paths for SDL2 and Sixense libs 2015-10-30 19:00:26 -07:00
Howard Stearns
28246c1951 Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds 2015-10-30 13:21:56 -07:00
samcake
393f6a4c76 Fixing a bad field ID for keyLight.AmbientURL and bumping the domain version 2015-10-30 11:35:50 -07:00
Howard Stearns
ce1d0fe07c Git rid of unused (un-emitted and intended to be removed long ago) script signal. 2015-10-30 11:25:54 -07:00
Stephen Birarda
fb55f0becb guard timeElapsed for simulateKinematicMotion to max 1s 2015-10-29 12:50:34 -07:00
Brad Hefta-Gaub
3bbba99e2b Merge pull request #6178 from samcake/color 
Refactor the KeyLIght properties in their own group
 2015-10-29 10:44:44 -07:00
Andrew Meadows
f9012d5051 Merge pull request #6187 from sethalves/fix-actions-ttl 
fix actions bug
 2015-10-29 09:30:21 -07:00
samcake
e4aab4bd97 Merge branch 'master' of https://github.com/highfidelity/hifi into color 2015-10-28 15:32:13 -07:00
Seth Alves
22d6b6df34 make withWriteLock and withTryWriteLock const 2015-10-28 13:49:52 -07:00
Seth Alves
a1096510e8 put some useless consts back 2015-10-28 10:52:01 -07:00
Seth Alves
f6a0004f26 get rid of some useless consts 2015-10-28 10:45:24 -07:00
Seth Alves
08a0bf33a4 avoid unneeded read-lock if action-data was dirty 2015-10-28 09:55:55 -07:00
Seth Alves
d504f449e4 undo last commit -- avoid unneeded read-lock if action-data was dirty 2015-10-28 09:55:11 -07:00
Seth Alves
2b5b4f1118 avoid unneeded read-lock if action-data was dirty 2015-10-28 09:54:16 -07:00
Seth Alves
f91dc93620 adjust locking in EntityItem::getActionDataInternal 2015-10-28 08:40:38 -07:00
Seth Alves
8d0aaed41a fix bug that was deleting actions with 0 ttl. in js interface, action parameter 'lifetime' is now called 'ttl' 2015-10-26 13:50:21 -07:00
samcake
ca30ce1ff0 Move the keyLIght properties in their own group and add the ambientURL in 2015-10-26 10:08:16 -07:00
samcake
bc7ad9d3f7 Move the keyLIght properties in their own group and add the ambientURL in 2015-10-26 09:27:06 -07:00
samcake
42ac8c5769 Stariting to reorganize the keyLight porperties of the Zone Entity 2015-10-23 18:15:19 -07:00
Seth Alves
f3c61a823e try harder to get children flags right when something moves. added worldToLocal methods 2015-10-23 16:58:09 -07:00
Seth Alves
61269c3ce8 fix up entity constructors so that setProperties isn't called during the constructor 2015-10-23 13:52:50 -07:00
Seth Alves
22af5b27ab avoid shared_from_this while constructing 2015-10-23 12:55:48 -07:00
Seth Alves
bf290c35be when an entity gets a physics flag set, set the same flag in any children 2015-10-23 09:46:57 -07:00
Seth Alves
7f6ac0207d Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-10-22 19:35:27 -07:00
Seth Alves
7b08d047b1 when EntityTree::updateEntityWithElement is called on an entity, call it on all the children of that entity 2015-10-22 16:59:56 -07:00
Stephen Birarda
1d5d655814 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-10-22 16:29:44 -07:00
Stephen Birarda
4f6da68a1f add getJointPosition and getJointRotation for entities 2015-10-22 16:25:28 -07:00
Seth Alves
d86d69aeba keep track of children. use local position and orientation on the wire. 2015-10-22 15:36:03 -07:00
Seth Alves
778dc8dc15 add parentID and parentJointIndex EntityItemProperties 2015-10-22 11:52:56 -07:00
Seth Alves
264b658132 hook up entities and avatars to SpatialParentFinder 2015-10-22 11:05:48 -07:00
Brad Hefta-Gaub
856af8c764 fix EntityItemID dependency 2015-10-21 14:33:12 -07:00
Seth Alves
3944d7be0f Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-10-21 13:50:17 -07:00
Brad Hefta-Gaub
246e46b69a implement improvement in sphere test 2015-10-21 10:46:50 -07:00
Seth Alves
7d8dca4edb Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-10-21 09:55:21 -07:00
Brad Hefta-Gaub
954afe45d3 Merge pull request #6112 from ericrius1/rayPickAdditions 
Moved whitelist and raypicking code out of octree, fixed small bug with polylines
 2015-10-21 09:08:56 -07:00
Brad Hefta-Gaub
d34ad2af42 improved findEntities(sphere) to check against Non-AABBox of entities 2015-10-20 21:01:20 -07:00
Seth Alves
6cb195b335 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-10-20 15:53:56 -07:00
Stephen Birarda
14aab4871d Merge pull request #6119 from Atlante45/baseball 
Fix autoresizing log spam
 2015-10-20 13:45:50 -07:00
ericrius1
0373a481f8 Using EntityItemIDs instead of QUuids 2015-10-20 09:22:16 -07:00
Atlante45
1c46f2aa75 Fix autoresizing log spam 2015-10-19 18:22:44 -07:00
Seth Alves
bddbe89c86 don't accept incoming location edits if an entity is being controlled by a shouldSuppressLocationEdits action 2015-10-19 16:13:53 -07:00
Seth Alves
9e24542c0b don't accept incoming location edits if an entity is being controlled by a shouldSuppressLocationEdits action 2015-10-19 16:05:56 -07:00
Seth Alves
00594f0cce don't accept incoming location edits if an entity is being controlled by a shouldSuppressLocationEdits action 2015-10-19 16:05:10 -07:00
Seth Alves
a1cfebc173 don't accept incoming location edits if an entity is being controlled by a shouldSuppressLocationEdits action 2015-10-19 15:57:15 -07:00
ericrius1
dcb37ccd73 Removed whitelist and raypicking code from octree, fixed a small bug with polylines 2015-10-19 13:14:19 -07:00
ericrius1
8c229d88a8 moving whitelist code out of octree 2015-10-19 11:59:44 -07:00
Seth Alves
46e5bf0435 take entity-server clock-skew into account when handling action expiration times 2015-10-19 11:59:03 -07:00
Seth Alves
5c031a38c7 try another way of fixing held object snagging at slow velocity 2015-10-19 10:29:30 -07:00
Seth Alves
c5a5f26e6a try another way of fixing held object snagging at slow velocity 2015-10-19 10:27:35 -07:00
Seth Alves
37923e81bb make SpatiallyNestable::_transform private 2015-10-18 08:18:10 -07:00
Seth Alves
275e77d29e remove old-style avatar referentials 2015-10-18 07:51:00 -07:00
Seth Alves
353f92f1ba Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-17 13:09:52 -07:00
Atlante45
1da68e0214 Fix particle bug by having lifetimes increase 2015-10-16 18:11:22 -07:00
Seth Alves
937959c1c1 cleanups 2015-10-16 09:57:27 -07:00
Seth Alves
d2b7e5c4eb Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-16 09:54:26 -07:00
Ryan Huffman
9ddcfdf94d Cleanup PacketReceier and ReceivedMessage 2015-10-16 09:21:10 -07:00
Seth Alves
8338491c3b Merge pull request #6095 from Atlante45/master 
Fix export bug
 2015-10-16 07:32:56 -07:00
Seth Alves
b18bb1e076 Merge pull request #6084 from AndrewMeadows/physics-cleanup 
move DIRTY_FLAGS out of EntityItem namespace
 2015-10-16 07:22:40 -07:00
Seth Alves
359a318568 fold kinematic hold into normal hold (disabled by default, an argument enables) 2015-10-15 20:23:06 -07:00
Atlante45
a84fdecec9 Fix export bug 2015-10-15 18:43:32 -07:00
Brad Hefta-Gaub
26f82e899e Merge pull request #6079 from ericrius1/whiteboard 
Entity whitelist for raypicking and whiteboard painting example
 2015-10-15 17:50:35 -07:00
Stephen Birarda
e5825daa57 Merge pull request #6090 from ZappoMan/fixStat 
Add some additional stats for debugging edit lags
 2015-10-15 16:00:29 -07:00
Ryan Huffman
7682ab00e3 Add ReceivedMessage and receive progress 2015-10-15 14:09:53 -07:00
Brad Hefta-Gaub
93113af2d2 improve server error message for failed edit 2015-10-15 11:55:20 -07:00
Andrew Meadows
fa17b77d70 move DIRTY_FLAGS out of EntityItem namespace 2015-10-15 09:34:09 -07:00
ericrius1
cfca0fe8c0 Adding a color indicator to whiteboard 2015-10-14 15:58:18 -07:00
Seth Alves
9937b6a3ef quiet some debugging 2015-10-14 13:12:11 -07:00
Seth Alves
07a4dc3a7f more lock fixing 2015-10-14 12:49:06 -07:00
Seth Alves
fa2bf2b2d9 tighten up locking in actions 2015-10-14 11:43:03 -07:00
Seth Alves
9a9e5b962e make edit logging terse vs not a domain-server setting 2015-10-14 09:45:35 -07:00
Seth Alves
77bb11675d terse entity-edit logging 2015-10-14 09:31:44 -07:00
Seth Alves
742cc0f511 rename a function 2015-10-14 06:17:55 -07:00
Seth Alves
f61a005ebc cleanups 2015-10-13 17:47:41 -07:00
Seth Alves
644076214e fix hang 2015-10-13 16:55:04 -07:00
Seth Alves
4402242c3c allow an action to suppress sending of physics related edits to the entity-server 2015-10-13 16:27:40 -07:00
Seth Alves
2ecb7e8d29 fix bug that was making action deletes fail 2015-10-13 16:19:12 -07:00
Seth Alves
fcbb107bc0 tweak 2015-10-13 14:13:53 -07:00
Seth Alves
54eac099b9 tweak 2015-10-13 12:52:53 -07:00