Commit graph

542 commits

Author SHA1 Message Date
Sam Gateau
b339aa683a adding caps for opaque and transparent draw jobs and the ui in js so we can debug the rendered items 2015-06-03 11:25:45 -07:00
ZappoMan
7c40b666e8 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-06-03 09:52:40 -07:00
Sam Gateau
640071dd35 Avoiding any setVIewTransform in payloadREnder and introducing monitoring values 2015-06-02 18:23:53 -07:00
Sam Gateau
903837ab4f exposing some controls on the engine to js for debugging 2015-06-02 15:57:37 -07:00
Seth Alves
a96520ca74 set up EntityItemPropertiesFromScript to either ignore or honor read-only properties 2015-05-29 13:43:18 -07:00
Howard Stearns
3a7a290094 Uglify conditional returns. :-) 2015-05-26 11:38:36 -07:00
Howard Stearns
5608892a15 Remove obsolete comment. 2015-05-26 11:16:11 -07:00
Howard Stearns
bbdf9f1d9f Remove changingEntityID. 2015-05-26 11:14:23 -07:00
Howard Stearns
069e6237cc Noop change with more declarations, in hopes of convincing MSVS how lambdas work.
(Hey, it's worth a try...)
2015-05-25 16:52:14 -07:00
Howard Stearns
4266a99d78 Put the javascript methods on Script, not Entities, and other minimum-diff cleanup. 2015-05-25 11:28:33 -07:00
Howard Stearns
a0d09c0a6d Mulitple independent handlers for same entity/event. 2015-05-24 11:48:11 -07:00
Howard Stearns
b884d3cf90 Handle all the signals. 2015-05-24 09:57:12 -07:00
Howard Stearns
1dd2b7275e Simpler and more uniform version that handles all the standard entity-script events. 2015-05-23 18:11:05 -07:00
Howard Stearns
277f5ef3a4 Working experimental first version. 2015-05-23 13:35:35 -07:00
Seth Alves
124ff68cee make EntityItemID a subclass of QUuid 2015-05-20 14:22:08 -07:00
Seth Alves
f9d46b0cb5 interface decides on entityIDs rather than bouncing a temporary id through the entity server 2015-05-19 14:25:23 -07:00
Stephen Birarda
e462617a6b add error log debug for script fail 2015-05-15 10:29:24 -07:00
Brad Davis
6a5c7b8b42 Merge remote-tracking branch 'upstream/master' into plugins_pt2
Conflicts:
	libraries/script-engine/src/MenuItemProperties.cpp
2015-05-11 12:40:17 -07:00
Brad Davis
e5dc3908ba Merge pull request #4825 from Nex-Pro/Non-JSON-Menu-Items-Fix
Fix for addMenuItem separator boolean
2015-05-11 12:27:11 -07:00
Nex Pro
fb9ff6e016 In some cases when the addMenuItem function was called the separator boolean was true by default.
This fix addresses this issue by setting it to false.
2015-05-11 18:50:54 +01:00
Clément Brisset
421ebeb3d7 Merge pull request #4795 from birarda/sequence-numbers
add sequence number support to NL, don't double send data from AvatarMixer
2015-05-11 19:23:33 +02:00
Bradley Austin Davis
03bd17ed49 Rebasing onto scale changes 2015-05-08 15:09:46 -07:00
Sam Gateau
653d2e72b1 Skybox kind of working 2015-05-07 11:23:11 -07:00
Stephen Birarda
6b3cf1ba4a remove dependency of PacketHeaders on NodeList 2015-05-05 12:19:42 -07:00
Eric Levin
6a987fdaf5 now conforming to coding standards 2015-05-04 16:40:04 -07:00
Eric Levin
e097950277 added axis and angle helper methods to Quat class- script user can now get normalized axis and scalar angle from a quaternion 2015-05-04 15:22:10 -07:00
Stephen Birarda
a039d5f28c Merge pull request #4753 from samcake/orange
Introducing UserInputMapper
2015-05-04 14:26:51 -04:00
Sam Gateau
c9b296693c bringing the UserInputMapper to the application 2015-05-03 15:45:19 -07:00
Stephen Birarda
94739cf8d3 move number constants out of SharedUtil to NumericalConstants 2015-05-01 10:26:53 -07:00
Brad Hefta-Gaub
7414201845 Merge pull request #4721 from ctrlaltdavid/20514
DO NOT MERGE - QA for 20514 - Move "Stereo Audio" option into developerMenu.js
2015-04-28 20:44:09 -07:00
David Rowe
9576ad19a7 Move "Stereo Audio" option into developerMenu.js
And rename it "Stereo Input" to better relect what it does.
2015-04-28 14:14:10 -07:00
Brad Davis
2575352485 Attempting to resolve possible crash case for scripts playing sounds 2015-04-28 12:51:01 -07:00
Sam Gateau
f54821f996 more details in the comments 2015-04-21 11:12:01 -07:00
Sam Gateau
48364cb598 refined the names of the key light porperties in Stage 2015-04-21 11:04:14 -07:00
Sam Gateau
687ca7fee5 Update the cookies.js to be able to edit and test direction and color, validate that the SunDirection and color and on/off is working 2015-04-17 19:00:40 -07:00
Sam Gateau
f1e0d5855e Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-17 11:33:39 -07:00
Clément Brisset
516acee1c7 Merge pull request #4647 from huffman/fix-multiple-scripts-on-restart
Fix stop/reload all scripts affecting already-stopped scripts
2015-04-17 16:29:23 +02:00
Sam Gateau
b5b146b81b Training Team: improving the sun lighting interface to javascript to enable / disable the earthSkyModel, assign explicitely the SUnDirection and getter, and expose a AmbientINtensity to control the amount of the ambient lighting contribution
Expose these to javascript
2015-04-16 17:35:37 -07:00
Ryan Huffman
2e61ef01da Update ScriptEngin::stop to only take effect when not finished 2015-04-15 09:55:36 -07:00
Atlante45
b1cfd33438 Add generated audio controls to scripting interface 2015-04-15 15:49:47 +02:00
Seth Alves
ef5dffecf6 fix filenames in comments 2015-04-07 10:03:14 -07:00
Seth Alves
9014397167 try again without macro 2015-04-07 09:59:04 -07:00
Seth Alves
7af32bd67a put audio and script-engine logging into their own QLoggingCategory 2015-04-06 15:57:18 -07:00
Stephen Birarda
b27a86fb25 always render yourself, handle change of render values elsewhere 2015-04-01 17:36:43 -07:00
Stephen Birarda
ee088e12f3 leverage scene scripting values to toggle rendering 2015-04-01 17:06:06 -07:00
Stephen Birarda
3f4a9c64f9 add render bools to the scene scripting interface 2015-04-01 16:53:17 -07:00
Ryan Huffman
f0dd20b21e Merge pull request #4570 from samcake/orange
Clean up the sunLightExample.js and create the cookies.js
2015-04-01 13:55:03 -07:00
Brad Hefta-Gaub
1de1527414 Merge pull request #4569 from ctrlaltdavid/20431
CR for Job #20431 - Remove XMLHttpRequest file reading and model uploading
2015-04-01 13:00:16 -07:00
Sam Gateau
3b92910a91 Adding the cookies sciprt that provide a simple ui useful for debug and exemple, complete the interface on the scene script interface to provide the getters 2015-04-01 12:22:35 -07:00
David Rowe
0a55bcb0c5 Remove XMLHttpRequest's facility to read local files 2015-03-31 16:56:04 -07:00