Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-24 16:54:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51229 commits 25 branches 0 tags 1.1 GiB
Commit graph

2434 commits

Author SHA1 Message Date
Stephen Birarda
ab8a0a7d39 Merge pull request #30 from Atlante45/ess-pr 
Remove unnecessary const from `const bool`
 2017-01-20 14:22:11 -08:00
Stephen Birarda
5ef0bd7573 remove weird extra whitespace 2017-01-20 14:10:42 -08:00
Stephen Birarda
1e25b5012f use a static_cast to get EntityNodeData 2017-01-20 14:05:55 -08:00
Stephen Birarda
67951517b4 don't grab the JSON filters for each entity checked 2017-01-20 13:59:48 -08:00
Atlante45
8740481579 Remove unnecessary const from const bool 2017-01-20 13:54:49 -08:00
Stephen Birarda
c5140ac695 use ENTITY_ITEM_DEFAULT_SERVER_SCRIPTS in EntityItemProperties 2017-01-19 16:42:14 -08:00
Stephen Birarda
0cb14ab25c whitespace fix in EntityTreeElement 2017-01-19 16:42:14 -08:00
Stephen Birarda
a40c25ddbf fix repeated send of matching entities 2017-01-19 16:42:14 -08:00
Atlante45
20a82df9a0 Fix scripts not reloading in certain edge cases 2017-01-19 15:48:44 -08:00
Ryan Huffman
465f5c6789 Add getters to ScriptStatusRequest 2017-01-19 15:09:16 -08:00
Ryan Huffman
d45f5ade97 Update Entities.getServerScriptStatus to return more information 2017-01-19 13:27:44 -08:00
Clément Brisset
89d1242925 Merge pull request #10 from huffman/feat/entity-server-script-property 
Entity script status + reload
 2017-01-19 11:19:40 -08:00
Stephen Birarda
33cde412b1 make getJSONParameters thread-safe 2017-01-18 17:49:54 -08:00
Stephen Birarda
5fbdc94c66 pass usesFrustum down to EntityTreeElement 2017-01-18 17:49:54 -08:00
Stephen Birarda
ed41412d95 fix for unpack of OctreeQuery 2017-01-18 17:49:54 -08:00
Atlante45
cbc69fbf9e Fix script preload functions 2017-01-18 16:42:25 -08:00
Atlante45
e94cccf08d Fix server script preload funcitons 2017-01-18 16:12:41 -08:00
Stephen Birarda
112b119f17 send entities that just stopped matching filter 2017-01-18 14:58:36 -08:00
Stephen Birarda
5d1b53c600 move map population with properties back 2017-01-18 14:58:36 -08:00
Stephen Birarda
b08bfe93f4 change lastViewFrustumSent to lastQuerySent 2017-01-18 14:58:36 -08:00
Stephen Birarda
a1ad496772 handle match on non-default serverScripts property during entity send 2017-01-18 14:58:36 -08:00
Stephen Birarda
3556379034 leverage JSON filter changes to OctreeQuery in EntityServer 2017-01-18 14:58:36 -08:00
howard-stearns
90c9c5b137 logging change 2017-01-18 14:32:05 -08:00
howard-stearns
957b1d9ae4 pass just what is given to filter, more or less 2017-01-18 13:22:54 -08:00
howard-stearns
00e53c8ea6 more tractable copy semantics 2017-01-18 13:21:28 -08:00
Ryan Huffman
d85f27e992 Add Entities.getServerScriptStatus 2017-01-18 11:15:59 -08:00
Ryan Huffman
8137c59ef7 Add support for sending requests to entity script server 2017-01-18 11:15:29 -08:00
howard-stearns
60eb6dca9d remove debug dump that was printing to screeen during << operator 2017-01-18 10:29:11 -08:00
howard-stearns
2e9b26057e refactor bumpTimestamp, and fix implementation of wasChanged 2017-01-18 10:27:32 -08:00
Atlante45
20b7bb0c54 EntityScriptServer tracks server scripts 2017-01-17 16:41:56 -08:00
Ryan Huffman
812aaee48c Add Entities.reloadServerScripts 2017-01-17 14:47:57 -08:00
Ryan Huffman
b0c2a9d614 Add serverScripts entity property 2017-01-17 14:47:06 -08:00
howard-stearns
09a57efaf3 checkpoint 2017-01-16 12:47:26 -08:00
Seth Alves
3b4f5e3023 don't include overlays in results from EntityScriptingInterface::getChildrenIDsOfJoint 2017-01-15 11:27:29 -08:00
howard-stearns
121d79ef36 getting there, but not yet complete 2017-01-13 16:59:51 -08:00
howard-stearns
f6446c6806 minimum entity edit filter 2017-01-13 13:18:24 -08:00
Seth Alves
a47aaea37a don't bootstrap self with an avatar hold action 2017-01-12 10:12:45 -08:00
Seth Alves
4a29cce584 adjust when USER_COLLISION_GROUP_MY_AVATAR is auto-disabled 2017-01-10 06:17:40 -08:00
Seth Alves
35577f49d0 change the test for when MY_AVATAR collisions are short-circuited 2017-01-09 17:00:39 -08:00
Seth Alves
ad45bbf5ba set DIRTY_COLLISION_GROUP flag when parentID changes 2017-01-09 16:45:54 -08:00
Seth Alves
45a26d599f if something is a child of the local avatar, never let it collide with MY_AVATAR 2017-01-09 16:40:28 -08:00
Seth Alves
01ff3f14b6 re-evaluate an entities in-bullet status when parentID changes 2017-01-09 15:28:05 -08:00
Anthony J. Thibault
00980366d6 Merge branch 'master' into tablet-ui 2017-01-03 09:45:23 -08:00
Seth Alves
dc996bee95 merge from upstream 2016-12-20 08:06:01 -08:00
Brad Hefta-Gaub
c65471e880 Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 
Conflicts:
	libraries/script-engine/src/FileScriptingInterface.cpp
 2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
dbbed462b4 cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
David Rowe
9459b967be Merge branch 'master' into 21089 2016-12-16 20:02:43 +13:00
Anthony J. Thibault
8b99fa90e8 Merge branch 'master' into tablet-ui 2016-12-15 13:28:23 -08:00
David Rowe
be00730073 Add canWriteAssets method and signal to Entities API 2016-12-14 14:27:55 +13:00
Seth Alves
d97be52542 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2016-12-12 16:24:17 -08:00
Seth Alves
6fe35ac0da use smart pointers to avoid leaking EntityTreeElementExtraEncodeData 2016-12-12 16:04:41 -08:00
David Rowe
c87149cfc2 Tidying 2016-12-10 12:59:01 +13:00
Seth Alves
6c99b5e9ca code review 2016-12-09 06:50:10 -08:00
Seth Alves
369f61e172 bring over some previous tablet-ui work 2016-12-08 16:54:39 -08:00
Faye Li Si Fi
9289dd36d4 Merge remote-tracking branch 'refs/remotes/highfidelity/master' into last-edited-property 2016-12-08 10:50:00 -08:00
Faye Li Si Fi
1fde68c86e better code style 2016-12-07 16:10:03 -08:00
Faye Li Si Fi
b6798adb5c yay 2016-12-07 15:40:37 -08:00
Faye Li Si Fi
0556661d13 getting rid of uneccessary flag, fix formatting, and getting it to work yay 2016-12-07 15:40:21 -08:00
Faye Li Si Fi
0fcb8803b6 attempt to expose last edited property to script 2016-12-07 12:27:31 -08:00
Brad Davis
5cbf7588ac Fixes for building on MSVC 2015 / Qt 5.8 2016-12-02 14:58:09 -08:00
Seth Alves
d2b32c3084 Merge pull request #9057 from druiz17/childParent 
fixed children of parent object not being added back when performing an undo
 2016-12-01 16:59:06 -08:00
Dante Ruiz
348c0c95e5 conforming to coding standard and better variable naming 2016-12-01 22:22:17 +00:00
Chris Collins
942850293e Merge pull request #9105 from druiz17/teleportBug 
Fix for unable to teleport to areas that you should
 2016-12-01 11:35:06 -08:00
Dante Ruiz
0c9cd5803a added descendant checking 2016-12-01 10:54:26 -08:00
Dante Ruiz
c52f893273 isChildOfParent 2016-12-01 10:54:26 -08:00
Dante Ruiz
1b20cc8bd0 more clean up 2016-11-30 18:28:50 +00:00
Dante Ruiz
104cbbff7e clean up 2016-11-30 18:26:06 +00:00
Dante Ruiz
34d24b947e better implementation 2016-11-30 18:03:11 +00:00
Dante Ruiz
daf12047ca removed unnessary comments 2016-11-22 18:55:20 +00:00
Dante Ruiz
2dfb745443 made some chnages 2016-11-22 18:53:03 +00:00
samcake
dfc0b7beac adressed reveiw comments 2016-11-22 10:15:49 -08:00
Dante Ruiz
a176c624ab fixed teleport bug 2016-11-21 23:04:07 +00:00
Dante Ruiz
1ba769b0ef teleportBug 2016-11-21 10:38:20 -08:00
samcake
9031e65aa5 Merge and fix the bug!!! 2016-11-16 19:12:56 -08:00
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
samcake
982664dac5 Merging with upstream 2016-11-15 18:14:25 -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
samcake
a05e42138c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-14 09:58:12 -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
samcake
00addcad9e Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-10 17:57:34 -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
samcake
784a0540ed Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-10 10:05:03 -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
samcake
6926cd274c Merge with upstream 2016-11-02 18:15:08 -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
samcake
8a44140e6b cleaning up the comments from review and trying something to adress the issue that showed up on i5 2016-10-07 16:04:19 -07:00
samcake
92d71a2e37 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-07 10:13:24 -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
samcake
56eb322b7d Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-06 15:14:31 -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
samcake
6f7f949343 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-06 09:35:48 -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
samcake
81e0266e7e Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-28 09:34:29 -07:00
Seth Alves
90adb5f67e fix an AC script's ability to delete entities 2016-09-26 17:14:45 -07:00
samcake
11c6bb7d80 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-13 17:44:42 -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
samcake
3bcea4310d Fixing the vizualisation shader for world to cluster space 2016-09-10 10:41:18 -07:00
samcake
108910052a Adding the reverse transformation 2016-09-09 19:00:54 -07: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
sam
248f172832 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-06 23:37:16 -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
samcake
7b68f1439f Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-02 09:28:35 -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
samcake
b563e280e4 Commuting the LIghtEntityItem changes correctly to the LightRenderItem 2016-08-31 13:55:41 -07:00
samcake
3755a3fc32 Add batch timing information vs gpu 2016-08-29 17:54:17 -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
Brad Hefta-Gaub
1cec7b2db0 Merge pull request #8429 from SamGondelman/loadingFade2 
Don't do fade effect once physics kick in
 2016-08-18 12:46:24 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
Ryan Huffman
d46af500c1 Fix wrong property name in entity activity tracking 2016-08-17 17:00:56 -07:00
Ryan Huffman
25b9d756ca Update entity edit tracking to track count rather than bool 2016-08-17 16:54:04 -07:00
Anthony J. Thibault
7b248b440a Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-17 13:55:12 -07:00
Anthony J. Thibault
d4e1f53581 Fix for inconsistent override warning in WebEntityItem.h 2016-08-16 17:48:28 -07:00
Anthony J. Thibault
7de8cc6422 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-16 16:49:57 -07:00
Seth Alves
7bc1235c54 local velocity and angular velocity in scripts is now handled the way local position and rotation are 2016-08-16 16:47:13 -07:00
Anthony J. Thibault
36d87ddd7c Added EntityItem::wantsHandControllerPointerEvents method 2016-08-16 16:23:45 -07:00