826 commits

Author	SHA1	Message	Date
Zach Pomerantz	4df8fa4ac3	Create Render/Scene unique_ptr without C++14 make_unique	2015-12-21 15:39:49 -08:00
Zach Pomerantz	5a86f0c23f	Nest JS props in SceneScriptingInterface	2015-12-21 14:32:06 -08:00
Brad Hefta-Gaub	111a8caa3c	Merge pull request #6701 from highfidelity/graphics ... Graphics merge into Master: Adding Gamma correction, Tone Mapping and Debugging tool	2015-12-21 13:54:50 -08:00
Brad Davis	05b7fcc957	Remove script -> qt::webchannel dependency	2015-12-21 11:19:05 -08:00
samcake	6bbc94badc	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-21 10:48:55 -08:00
Brad Davis	46a4a469e9	Merge pull request #6689 from ZappoMan/rightClickMenu ... Some early work to support hand driven reticle	2015-12-20 17:49:50 -08:00
samcake	1e8e3fec87	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-19 11:38:20 -08:00
Brad Hefta-Gaub	e929e3f789	more work on angular velocity tests	2015-12-18 19:20:32 -08:00
Brad Davis	6098c4a1d6	Revert "Revert "Migrate QML based web views to Qt WebEngine"" ... This reverts commit 1f3adeb666.	2015-12-18 17:18:46 -08:00
samcake	7e66515beb	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-18 17:13:48 -08:00
Brad Davis	1f3adeb666	Revert "Migrate QML based web views to Qt WebEngine"	2015-12-18 17:09:38 -08:00
samcake	41525a7c4d	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-18 16:20:41 -08:00
Zach Pomerantz	919a4b6728	Split global JS Scene into Render	2015-12-18 10:33:41 -08:00
Brad Davis	82c865af2c	Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engine	2015-12-17 12:20:38 -08:00
samcake	1b1365fd40	Exposing the tone curve in the js api	2015-12-16 16:32:53 -08:00
samcake	d2ebaef69e	Adding a simple manual exposure control to configure the tonemapping and expose it to js. Add a convenient way to access the Job._concept._data with template	2015-12-15 18:18:42 -08:00
samcake	3554f54e17	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-14 17:38:56 -08:00
Brad Hefta-Gaub	2815cb0fef	first cut at adding advanced and developer menu groupings	2015-12-12 18:12:36 -08:00
samcake	5d395ae54f	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-10 18:06:43 -08:00
James B. Pollack	d21e4ff5e1	Merge pull request #6592 from huffman/script-engine-fixes ... Fix concurrency issues for bools in ScriptEngine	2015-12-10 10:48:54 -08:00
Brad Davis	978d39b7f4	Moving OpenVR to external plugin and updating to latest version	2015-12-09 16:20:24 -08:00
Ryan Huffman	5f60aeef22	Update ScriptEngine::_isUserLoaded to be atomic	2015-12-09 14:50:48 -08:00
Ryan Huffman	a21e07327d	Update ScriptEngine::stop() to always run on its thread	2015-12-09 14:50:30 -08:00
Ryan Huffman	e7a1550b64	Update ScriptEngine::finished to include	2015-12-09 14:50:09 -08:00
Ryan Huffman	4dbfd3bfd9	Fix concurrency issues for bools in ScriptEngine ... Several member variables were unsafely being accessed from multiple threads. Making these variables std::atomic makes this safe.	2015-12-08 11:13:27 -08:00
samcake	83279489f3	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-08 09:46:29 -08:00
Atlante45	acb9e2774e	Basic implementation of debug zone resizing	2015-12-04 21:01:53 -08:00
samcake	119cc733b5	Merging with master	2015-12-04 17:17:33 -08:00
Atlante45	1d498af76e	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-12-04 15:18:25 -08:00
Atlante45	c27944ae28	Simple normal map debug	2015-12-04 10:44:23 -08:00
Brad Hefta-Gaub	d9a1563396	Merge pull request #6152 from sethalves/parents ... Parents	2015-12-04 10:26:57 -08:00
Brad Hefta-Gaub	46556b7fa5	Merge pull request #6513 from huffman/fix-script-race-condition ... Fix ScriptEngine setting _isFinished when it shouldn't, causing scripts to accumulate when restarting	2015-12-03 17:17:42 -08:00
Seth Alves	0595ef0938	merge from upstream	2015-12-02 09:30:19 -08:00
Ryan Huffman	4d84362757	Fix ScriptEngine setting _isFinished when it shouldn't	2015-12-01 11:30:56 -08:00
Stephen Birarda	c3f3639374	more spacing adjustments in ScriptEngine.cpp	2015-11-30 15:57:10 -08:00
Stephen Birarda	b1a69bb2cf	cleanup spacing in ScriptEngine	2015-11-30 15:52:10 -08:00
Stephen Birarda	4573e5c59e	resolve conflicts on merge with upstream/master	2015-11-30 13:32:38 -08:00
Seth Alves	ca75802b9c	unmangle merge	2015-11-26 06:43:28 -08:00
David Rowe	e25d4c17e8	Fix InputController (Leap Motion) not able to be created	2015-11-25 09:29:40 +13:00
Brad Hefta-Gaub	d32e500464	Merge pull request #6462 from jherico/rec5 ... Blendshapes and attachments in recordings, plus other minor fixes.	2015-11-24 10:01:17 -08:00
Stephen Birarda	762709748d	Merge pull request #6473 from ZappoMan/waitForScriptThreads ... change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete	2015-11-24 10:39:22 -06:00
Brad Davis	3738f21936	Fix occasional deadlock in loading recordings	2015-11-23 22:34:17 -08:00
samcake	a1668cdc73	Let the AssertClient JS interface use global vars	2015-11-23 22:28:59 -08:00
Brad Hefta-Gaub	5f88d958ab	CR feedback	2015-11-23 18:26:15 -08:00
Brad Hefta-Gaub	ce46c30647	change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete	2015-11-23 16:27:06 -08:00
Seth Alves	f013f95e9b	merge from upstream	2015-11-21 08:43:00 -08:00
Seth Alves	0b1fa4f60f	add interface for getters for specific joints	2015-11-21 08:21:10 -08:00
EdgarPironti	ebbed7c525	Save clip to asset - removing last fix	2015-11-20 18:23:36 -08:00
samcake	de56f698aa	Merge pull request #6444 from EdgarPironti/asset_branch ... Save clip to asset	2015-11-20 16:28:55 -08:00
Brad Davis	336562b894	Merge pull request #6452 from ctrlaltdavid/20732 ... Make multiline strings from JavaScript's print() readably in log file	2015-11-20 16:25:17 -08:00