Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 11:14:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49714 commits 25 branches 0 tags 1.1 GiB
Commit graph

2351 commits

Author SHA1 Message Date
Stephen Birarda
67a3d97f81 cleanup includeThisEntity check 2017-01-24 16:41:20 -08:00
Stephen Birarda
543d0ce77e add a comment about usesFrustum check in EntityTreeElement 2017-01-24 16:36:44 -08:00
Stephen Birarda
33378ede5c force full scene send if json parameters changed 2017-01-24 16:34:57 -08:00
Clément Brisset
95f07f3917 Merge pull request #32 from huffman/feat/entity-server-script-property 
PR FIxes
 2017-01-20 15:39:22 -08:00
Ryan Huffman
4e358f76fe Remove trailing whitespace from EntityItemProperties.cpp 2017-01-20 14:36:45 -08:00
Ryan Huffman
ee8898568d Remove const from getScript & getServerScripts 2017-01-20 14:36:01 -08:00
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
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
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
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
David Rowe
be00730073 Add canWriteAssets method and signal to Entities API 2016-12-14 14:27:55 +13: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
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