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

2275 commits

Author SHA1 Message Date
Dante Ruiz
66ff81f450 Another function name change 2016-11-16 22:32:15 +00:00
Dante Ruiz
9c4ae9df5a function name change 2016-11-16 22:09:22 +00:00
Dante Ruiz
ff7c11d48c Fixed avatar parent delete issue 2016-11-16 13:03:34 -08:00
Brad Hefta-Gaub
84573d373b Merge pull request #9070 from huffman/fix/docs 
Add jsdoc to Camera
 2016-11-15 13:46:16 -08:00
Ryan Huffman
5fd1ae64b0 Begin adding entities jsdoc 2016-11-14 16:54:55 -08:00
Seth Alves
15c247fc5e quiet warnings 2016-11-11 06:37:22 -08:00
Seth Alves
899dec8b10 Merge branch 'master' of github.com:highfidelity/hifi into last-edited-by 2016-11-11 06:11:49 -08:00
Seth Alves
850361f222 lastEditedBy property for entities 2016-11-10 15:26:28 -08:00
Chris Collins
5b91c8f32b Merge pull request #8984 from sethalves/fix-setLocalJointRotation-name 
fix names of model-entity joint setters
 2016-11-10 13:39:14 -08:00
Brad Hefta-Gaub
8758e4a9ba add support for whitelist entity scripts 2016-11-09 19:17:24 -08:00
Seth Alves
51f6b5af78 code review 2016-11-05 10:35:21 -07:00
Seth Alves
339d6a55cf getLocalJointRotation getLocalJointTranslation, started on getLocalJointTranslation getLocalJointRotation 2016-11-03 10:06:07 -07:00
Seth Alves
844cc03dcb fix names of model-entity joint setters 2016-11-02 10:24:01 -07:00
Seth Alves
9b7086b1fb added EntityItemProperties.merge function. when sending edits for avatar-entities, don't call setProperties on the entity. Fix currentFrame bug in AnimationPropertyGroup::copyToScriptValue 2016-10-17 16:11:37 -07:00
Seth Alves
fe09a1a57c make sure interface accepts server adjustment to lifetime, even for imported entities 2016-10-13 16:45:37 -07:00
Seth Alves
01c1cb328f don't change UNKNOWN_CREATED_TIME to 1 during addition of LAST_EDITED_SERVERSIDE_BUMP 2016-10-13 15:05:13 -07:00
Ryan Downe Karpf
ed2571704f Merge pull request #8735 from huffman/feat/teleport-improvements 
Update teleport.js to ignore invisible or collisionless objects and disallow teleporting to  certain surfaces
 2016-10-07 09:56:30 -07:00
Chris Collins
583332d502 Merge pull request #8734 from huffman/feat/allow-editing-unknown-entities 
Update entity scripting interface to allow modifications to unknown e…
 2016-10-06 09:51:35 -07:00
Clément Brisset
d18394f249 Merge pull request #8596 from huffman/feat/my-avatar-self-id 
Add ability to parent overlays to MyAvatar for use across servers
 2016-10-05 12:03:01 -07:00
Ryan Huffman
16d535c495 Move EntityTree RayArgs back to header 2016-10-04 20:20:48 -07:00
Ryan Huffman
ee50469213 Add collidableOnly arg to findRayIntersection 2016-10-04 20:19:54 -07:00
Ryan Huffman
da6afb605b Fix default findRayIntersection surfaceNormal to be in world space 2016-10-04 20:19:54 -07:00
Ryan Huffman
b0c7e91737 Disable ray picking against invisible objects in far grab and teleport 2016-10-04 20:19:51 -07:00
Ryan Huffman
17c63eb722 Add the ability to ignore invisible entities in findRayIntersection 2016-10-04 20:19:32 -07:00
Seth Alves
90adb5f67e fix an AC script's ability to delete entities 2016-09-26 17:14:45 -07:00
Ryan Huffman
5e8c8f84b5 Handle edge cases of AVATAR_SELF_ID being used with entities 2016-09-13 16:34:05 -07:00
David Rowe
fe8b3b4d0d Merge branch 'master' into 21040 2016-09-13 09:12:47 +12:00
David Rowe
68499f49ad Fix count of textures 2016-09-10 10:15:13 +12:00
Brad Davis
ecfe56085d GLM update and GLI integration 2016-09-09 10:18:15 -07:00
David Rowe
38c2efa22f Implement Entities.findInFrustum() method 2016-09-09 18:57:48 +12:00
David Rowe
28cfca993f Add and wire up "search in view" JavaScript API stub 2016-09-08 14:58:48 +12:00
Anthony J. Thibault
dc0d0c2d5c Merge branch 'master' into feature/tablet-ui-foundation 2016-09-07 09:49:55 -07:00
David Rowe
f83599f855 Merge branch 'master' into 21040 2016-09-07 10:08:51 +12:00
David Rowe
17d30796cc Use count of textures actually rendered 
Textures specified in model may be invalid and so not actually rendered.
 2016-09-03 13:07:00 +12:00
Seth Alves
b8b1127d55 merge from upstream 2016-09-02 15:11:21 -07:00
Anthony J. Thibault
0128d7c61b Merge branch 'master' into feature/tablet-ui-foundation 2016-09-02 12:16:25 -07:00
Anthony J. Thibault
21bf931559 eventBridge for web entities. 2016-09-01 16:32:06 -07:00
Brad Hefta-Gaub
e1845e2c3f add support for renderInfo properties to model entities 2016-08-31 15:00:21 -07:00
Seth Alves
3fb10d0eea action for arrow flight, etc 2016-08-28 19:08:13 -07:00
Andrew Meadows
19cd4648ad scale collision render mesh correctly 2016-08-24 22:26:56 -07:00
Andrew Meadows
acaa77b75a remove cruft from debug efforts 2016-08-24 22:26:56 -07:00
Andrew Meadows
b0a0293e6e move compoundResource out of Model class 2016-08-24 22:26:56 -07:00
Andrew Meadows
3b772d2fe6 fallback to SIMPLE_COMPOUND when can't do COMPOUND 2016-08-24 22:26:56 -07:00
Andrew Meadows
b2dfa49a6f stubbery for alerting entity that shape changed 2016-08-24 22:25:45 -07:00
Anthony J. Thibault
31ed378dbf Added dpi entity property for web-entities 2016-08-23 10:10:26 -07:00
Anthony J. Thibault
6704ae9ad4 Added dpi parameter to userData (this is temporary) 2016-08-23 10:09:17 -07:00
Anthony J. Thibault
d015c5cfb5 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-22 14:13:17 -07:00
Seth Alves
9bcda1bb45 merge from upstream 2016-08-20 15:25:04 -07:00
Anthony J. Thibault
8bb6bb7c6f generalized keyboard focus interface 
Removed dynamic casts to RenderableWebEntityItem, instead
virtual methods were added to EntityItem to facilitate this.

* bool wantsKeyboardFocus()
* void setProxyWindow()
* QObject* getEventHandler()
 2016-08-19 10:56:52 -07:00
James B. Pollack
98f0290565 Merge pull request #8436 from huffman/feat/more-user-activity-data 
Add more user activity data
 2016-08-19 10:48:28 -07:00