Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 12:40:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
53526 commits 75 branches 59 tags 1.2 GiB
Commit graph

2528 commits

Author SHA1 Message Date
Seth Alves
21ca767b7c remove setPosition and setRotation for actions because they were never finished and never used. 2017-04-18 11:59:16 -07:00
Seth Alves
b1dc5be316 make far-grab it's own action (which is just like spring) in order to avoid bootstrapping own avatar 2017-04-14 11:48:06 -07:00
Seth Alves
2dab3069da fix bug that was causing spring action to cause constant re-insertion of its rigidbody into bullet. store UUIDs rather than shared pointers in _objectDynamicsByBody so that refcounting works right and actions get their destructors called. 2017-04-14 11:06:40 -07:00
Seth Alves
afa8fc161b allow hinge constraint between two entities 2017-04-13 15:37:28 -07:00
Seth Alves
9b12956909 formatting 2017-04-12 16:34:34 -07:00
Seth Alves
507f658a5f update comment 2017-04-12 07:37:41 -07:00
Seth Alves
74c0a70cb0 rename base action classes to dynamics, start on constraints 2017-04-11 20:39:13 -07:00
Stephen Birarda
602d65a71a Merge pull request #10001 from birarda/cleanup-ebp 
cleanup EncodeBitstreamParams to use nodeData when possible
 2017-04-10 15:54:30 -07:00
Brad Hefta-Gaub
0d4649ded8 Merge pull request #10079 from jherico/entity_thread_safety 
Thread safety for property getter/setters on entities
 2017-04-07 19:01:07 -07:00
Andrew Meadows
b9c7d6351f Merge pull request #10135 from samcake/ambient 
Rename render::PendingChanges to render::Transaction
 2017-04-07 09:54:10 -07:00
samcake
6122155880 Renaming the PendingCHanges class to Transaction 2017-04-05 13:10:31 -07:00
Brad Davis
15f7e895aa More thread safety 2017-04-04 15:09:21 -07:00
Brad Davis
cd7c1643a3 More thread safety 2017-04-04 14:03:30 -07:00
Brad Davis
54200c03a7 Fixing deadlock 2017-04-04 13:53:49 -07:00
Brad Davis
fe84232ab4 More work on thread safety 2017-04-04 10:50:56 -07:00
Brad Davis
03c6275268 more thread safety 2017-04-04 10:50:54 -07:00
Brad Davis
172fab6789 Thread safety for property getter/setters on entities 2017-04-04 10:50:53 -07:00
Ryan Huffman
b9fffc10f8 Fix entity "unlock" edits not being propagated to clients 
The lastEditedBy property was not being updated when changing the locked
property of entities from true to false.
 2017-04-03 15:51:19 -07:00
David Kelly
348674a267 Merge pull request #10034 from davidkelly/dk/avatarEntityIssue 
bad serialization of Avatar Entity parentID
 2017-03-30 10:12:19 -07:00
David Kelly
4b40633104 oops damn space 2017-03-28 11:22:18 -07:00
David Kelly
e119c38748 bad serialization of parentID 2017-03-28 09:26:40 -07:00
Seth Alves
651d87dc2a move Qt-related stuff out of model and into model-networking 2017-03-28 07:53:25 -07:00
Seth Alves
8da91695df Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2 2017-03-27 20:15:54 -07:00
Seth Alves
5ed0ff729b cleanups 2017-03-27 07:25:40 -07:00
Stephen Birarda
53e6a77fcc cleanup EncodeBitstreamParams to use nodeData when possible 2017-03-24 13:41:36 -07:00
ZappoMan
246f377a07 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-23 10:40:37 -07:00
Seth Alves
ce9bb439b3 change Model api in anticipation of more than just PolyVox being able to give meshes to javascript 2017-03-23 09:55:30 -07:00
Seth Alves
048da6e6cb Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2 2017-03-21 09:52:15 -07:00
Brad Hefta-Gaub
ac309df3d1 Merge pull request #9946 from sethalves/model-scripting-1 
Model scripting
 2017-03-21 09:26:32 -07:00
Atlante45
73dd2abdaf Delete old sitting points code 2017-03-20 17:29:44 -07:00
Seth Alves
d5ea69d81d Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2 2017-03-20 14:06:00 -07:00
Brad Hefta-Gaub
bc5d7d8698 Merge pull request #9851 from AndrewMeadows/simulation-ownership-2 
zero velocity of deactivated dynamic entities
 2017-03-20 10:20:11 -07:00
Seth Alves
67507f1f05 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2 2017-03-20 09:37:53 -07:00
Seth Alves
98cae8d152 added EntityScriptingInterface::getEntityLocalTransform. try harder to make sure polyvox mesh is ready before giving it to javascript 2017-03-20 09:37:46 -07:00
Chris Collins
308c134119 Merge pull request #9686 from humbletim/21114-part3 
CR 21114 -- Implement modules/require support into hifi
 2017-03-20 06:22:35 -07:00
Seth Alves
b876d22e46 fix handling of normals. don't crash when extracting a mesh from a polyvox with no 'on' voxels 2017-03-18 22:36:24 -07:00
Seth Alves
b3603ce8b3 Entities.voxelsToMesh, Model.transformMesh, Model.appendMeshes, Model.meshToOBJ appear to work now 2017-03-17 16:52:56 -07:00
Seth Alves
bbad6a0eb7 mesh-append works, mesh-transform doesn't? 2017-03-16 17:26:07 -07:00
humbletim
52a571558c * changes per CR feedback 
* revert JSON content-type workaround
* add specific error check / advice for unanchored module ids
* update unit tests
 2017-03-16 01:23:23 -04:00
Seth Alves
1eedce9825 unmangle merge 2017-03-13 18:18:26 -07:00
Seth Alves
e8a9ff867d merge from upstream 2017-03-13 17:57:01 -07:00
humbletim
db73c80ba1 remove unused meta property adapter 2017-03-13 19:16:00 -04:00
Andrew Meadows
a16760278e remove debug code 2017-03-09 17:58:53 -08:00
Andrew Meadows
8ddcae2a15 restore transform of deactivated entities 2017-03-09 17:26:53 -08:00
Andrew Meadows
d4abdcb6c8 comments, namechange, and temporary debug code 2017-03-09 17:26:53 -08:00
humbletim
5e5bba5aad Separate EntityPropertyMetadataRequest for easier documentation and testing 2017-03-07 16:41:19 -05:00
humbletim
40ba8185a0 * Update per 21114-part2 changes. 
* Add explicit thread safety guards.
* Add Entities.queryPropertyMetdata for unit testing Entity script module support.
* Cleanup / commenting pass.
 2017-03-07 16:36:07 -05:00
Andrew Meadows
10b3e7fc67 sphere shapeType for models means 'sphere' 2017-03-06 15:14:51 -08:00
ZappoMan
9e71801ae1 remove properties from RayToEntityIntersectionResult 2017-03-01 18:21:04 -08:00
Seth Alves
3b669089e4 Merge branch 'master' of github.com:highfidelity/hifi into voxel-paint-opti 2017-02-27 20:56:16 -08:00