1558 commits

Author	SHA1	Message	Date
Ryan Huffman	aca7ad27c6	Fix ktx dependencies	2017-04-26 10:47:32 -07:00
Ryan Huffman	105d17e85e	Add byte range support to HTTPResourceRequest	2017-04-26 10:45:14 -07:00
David Rowe	4a5f84f4b9	Merge branch 'master' into 21249 ... # Conflicts: # libraries/audio-client/src/AudioClient.cpp	2017-04-26 13:24:18 +12:00
Atlante45	33f58f99d1	CR	2017-04-25 16:09:31 -07:00
David Rowe	4c30c0d722	Make UserActivityLogger available to AC scripts	2017-04-25 13:42:12 +12:00
Atlante45	41cd0d79b2	Set max packet per second on the agent	2017-04-24 10:56:57 -07:00
Dante Ruiz	cbd2a532a8	remove debug statments	2017-04-20 23:28:41 +01:00
Dante Ruiz	1ec4081a99	crash fix	2017-04-20 21:38:20 +01:00
David Rowe	2108300272	Merge branch 'master' into 21249	2017-04-20 08:43:00 +12:00
Dante Ruiz	b2a11aa9ab	check for null when we dont	2017-04-19 21:30:43 +01:00
Dante Ruiz	ce8dba21a0	fix tablet proxy choosing wrong root	2017-04-18 22:49:43 +01:00
Anthony J. Thibault	d3b4a2c08d	better "auto" configuration	2017-04-14 17:00:47 -07:00
David Rowe	2731c13a5c	Merge remote-tracking branch 'upstream/master' into 21249	2017-04-15 09:51:16 +12:00
Thijs Wenker	6f58e91d76	Merge pull request #10121 from birarda/bug/recording-cache ... cleanup Agent RSI handling, make loadRecording async	2017-04-14 21:35:51 +02:00
Stephen Birarda	7b48feca66	address code review comments	2017-04-14 11:53:53 -07:00
David Rowe	0d9e0ebfec	Merge branch 'master' into 21249	2017-04-12 08:45:01 +12:00
Chris Collins	b07ed13023	Merge pull request #10184 from druiz17/snapshot-fix ... snapshot bug fixes	2017-04-11 13:00:46 -07:00
Chris Collins	3a603e7ced	Merge pull request #10193 from sethalves/fix-dont-delete-tablet-qobject ... change handling of life-time of TabletProxy QObjects	2017-04-11 11:53:47 -07:00
Seth Alves	077a4fe4ae	change handling of life-time of TabletProxy QObjects	2017-04-11 10:56:47 -07:00
Stephen Birarda	84a5807ff1	return ScriptAvatarData raw pointer from getAvatar	2017-04-10 22:15:45 -07:00
Stephen Birarda	6c49db0f1b	add missing include for qScriptRegisterMetaType in Agent	2017-04-10 22:15:45 -07:00
Stephen Birarda	42a406e90a	add ScriptAvatar for std::shared_ptr<Avatar> passing to scripts	2017-04-10 22:15:45 -07:00
Zach Fox	0aa1e633fe	Fix overrides and warnings (finally?)	2017-04-10 22:15:45 -07:00
Zach Fox	2561d38d93	Fix GCC warning	2017-04-10 22:15:45 -07:00
Zach Fox	04792bf3bc	Typo fix.	2017-04-10 22:15:45 -07:00
Zach Fox	16be0ca70c	Birarda's CR changes	2017-04-10 22:15:44 -07:00
Zach Fox	1984d5bc0c	Cleanup	2017-04-10 22:15:44 -07:00
Zach Fox	3832abffee	Almost theregit add -A	2017-04-10 22:15:44 -07:00
Zach Fox	4489c34e84	I'm on fire	2017-04-10 22:15:44 -07:00
Zach Fox	5edd5d2b30	It's working...it's workinggit add -A!	2017-04-10 22:15:44 -07:00
Zach Fox	a16e261735	Checkpoint before a number of confusing changes	2017-04-10 22:15:44 -07:00
Stephen Birarda	4ed22ad7ac	move audio loudness to AvatarData, change AvatarData to ScriptOwnership	2017-04-10 22:15:44 -07:00
Dante Ruiz	e0f19944bc	Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix	2017-04-10 20:58:46 +01:00
Dante Ruiz	4e94aaa9e8	finished allowing to go back to previous app	2017-04-10 20:58:10 +01:00
David Rowe	6896fe3ac6	Merge branch 'master' into 21249	2017-04-10 09:05:57 +12:00
Dante Ruiz	86c67a3017	tablet pages	2017-04-08 02:01:21 +01:00
Chris Collins	8e12f62cbb	Merge pull request #10153 from druiz17/goto-fix ... Ability to toggle goto with the crt-l and enter keys	2017-04-07 16:36:41 -07:00
David Rowe	ebe3561582	Merge branch 'master' into 21249	2017-04-08 10:46:16 +12:00
Dante Ruiz	22521526ec	removed stray space	2017-04-06 23:41:30 +01:00
David Rowe	0400e5a1f2	Report error status in setMapping() callback	2017-04-07 10:31:52 +12:00
Dante Ruiz	52fd446d4d	toggle goto in tablet	2017-04-06 22:27:37 +01:00
David Rowe	5676364aec	Fix missing return value in Recording.saveRecordingToAsset()	2017-04-06 18:50:15 +12:00
Dante Ruiz	90f5d02c99	goto toggle option	2017-04-06 00:13:53 +01:00
samcake	6122155880	Renaming the PendingCHanges class to Transaction	2017-04-05 13:10:31 -07:00
Stephen Birarda	c7a28a527a	cleanup Agent recording handling, make loadRecording async	2017-04-04 10:56:25 -07:00
Seth Alves	b0b214012c	Merge pull request #10118 from hyperlogic/bug-fix/tablet-restart-scripts ... Fix broken eventBridge on tablet after Reload All Scripts.	2017-04-04 10:45:08 -07:00
Anthony J. Thibault	8ff457a1b6	Fix broken eventBridge on tablet after Reload All Scripts. ... The main issue here was the "webEventReceived" connection between the OffscreenQMLSurface and the TabletProxy object. For whatever reason, if this is not a direct Signal to Slot connection, the webEventReceived event does not propagate.	2017-04-03 16:03:55 -07:00
Seth Alves	43e1cec8a3	merge from upstream	2017-04-03 06:28:59 -07:00
Chris Collins	6fe210da66	Merge pull request #10094 from sethalves/tablet-ui-fix-hmd-login ... fix login-screen for hmd+tablet	2017-03-31 17:17:30 -07:00
Seth Alves	3cd134d138	fix login-screen for hmd+tablet	2017-03-31 16:41:21 -07:00
Seth Alves	c62b07d26f	add setLandscape call to tablet	2017-03-30 11:36:21 -07:00
Zach Fox	1b74576259	Fix tablet-close behavior for PAL; remove users-tablet.js	2017-03-29 14:53:45 -07:00
Seth Alves	371df35013	remove code related to tablet being a model rather than an overlay. start on landscape mode	2017-03-29 14:16:14 -07:00
Zach Fox	b776f25b3b	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-28 18:09:17 -07:00
Zach Fox	81264c998b	Revert "Merge from upstream/master" ... This reverts commit b5ba4a109d.	2017-03-28 17:39:45 -07:00
Zach Fox	b5ba4a109d	Merge from upstream/master	2017-03-28 17:37:34 -07:00
Seth Alves	4516ddf855	Merge pull request #9847 from highfidelity/tablet-ui ... Tablet ui	2017-03-28 14:48:02 -07:00
Seth Alves	651d87dc2a	move Qt-related stuff out of model and into model-networking	2017-03-28 07:53:25 -07:00
Dante Ruiz	f4255735a9	make login screen show up on the tablet on startup	2017-03-27 18:03:38 +01:00
Zach Fox	e1a880a5d4	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 09:10:12 -07:00
Zach Fox	e88895935b	Revert "Actually merge from master" ... This reverts commit 056d6fbe4f.	2017-03-24 17:56:48 -07:00
Seth Alves	59da607d07	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-24 15:08:23 -07:00
Seth Alves	8f7f5efade	new javascript call: Model.newMesh()	2017-03-24 12:51:00 -07:00
Zach Fox	056d6fbe4f	Actually merge from master	2017-03-24 10:10:17 -07:00
Zach Fox	915ace0087	Revert "Merge from Master" ... This reverts commit e48123b5bb.	2017-03-24 10:04:51 -07:00
Seth Alves	902e3d41d6	merge from upstream	2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub	9a38b36f59	Merge pull request #9970 from Triplelexx/21223 ... 21223 - Quat functions have naming inconsistencies	2017-03-24 08:12:11 -07:00
Seth Alves	ce9bb439b3	change Model api in anticipation of more than just PolyVox being able to give meshes to javascript	2017-03-23 09:55:30 -07:00
Zach Fox	e48123b5bb	Merge from Master	2017-03-23 09:54:14 -07:00
Dante Ruiz	af97c7275e	Use loadQMlSource if no stack is aviable	2017-03-23 17:03:24 +01:00
Triplelexx	6e740a5fbb	change Mat4 getFront to getForward	2017-03-21 22:33:37 +00:00
Triplelexx	248c932d50	inline getFront	2017-03-21 22:11:18 +00:00
Seth Alves	91cac892d2	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 14:04:58 -07:00
Triplelexx	6d664fd668	add getForward, getFront returns getForward ... getForward better describes the returned vector as a direction	2017-03-21 19:54:32 +00:00
Chris Collins	4c789c44aa	Merge pull request #9922 from birarda/bug/stuck-ess ... fix a couple of ESS issues during ES/ESS restart	2017-03-21 12:44:53 -07:00
Seth Alves	cc4ddd1387	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 08:43:35 -08:00
Brad Hefta-Gaub	ac309df3d1	Merge pull request #9946 from sethalves/model-scripting-1 ... Model scripting	2017-03-21 09:26:32 -07:00
Stephen Birarda	c63a2c9cda	remove requirement of ScriptEngine in ScriptEngines slots	2017-03-20 13:40:15 -07:00
Stephen Birarda	a4d72c4e67	make AudioScriptingInterface a Dependency	2017-03-20 13:40:15 -07:00
Chris Collins	308c134119	Merge pull request #9686 from humbletim/21114-part3 ... CR 21114 -- Implement modules/require support into hifi	2017-03-20 06:22:35 -07:00
Seth Alves	424af2255b	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-19 21:17:30 -08:00
Seth Alves	b876d22e46	fix handling of normals. don't crash when extracting a mesh from a polyvox with no 'on' voxels	2017-03-18 22:36:24 -07:00
Seth Alves	488ed081dd	Mesh::forEach and Mesh::map	2017-03-18 10:18:04 -07:00
Seth Alves	b3603ce8b3	Entities.voxelsToMesh, Model.transformMesh, Model.appendMeshes, Model.meshToOBJ appear to work now	2017-03-17 16:52:56 -07:00
Brad Hefta-Gaub	a75acd139b	Merge pull request #9885 from sethalves/model-scripting ... Model scripting	2017-03-17 13:13:17 -07:00
Seth Alves	16c3eb62b1	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-1	2017-03-17 08:54:32 -07:00
Seth Alves	df84ff27e9	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui	2017-03-17 07:52:22 -07:00
Seth Alves	bbad6a0eb7	mesh-append works, mesh-transform doesn't?	2017-03-16 17:26:07 -07:00
Seth Alves	a5d19439f9	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-16 16:32:07 -07:00
Seth Alves	200550aba9	ModelScriptingInterface::appendMeshes	2017-03-16 15:22:34 -07:00
humbletim	87d62ad1eb	Merge branch 'master' into 21114-part3	2017-03-16 16:39:37 -04:00
Stephen Birarda	a69cf76d06	Merge pull request #9879 from birarda/bug/no-unload ... make sure deleted entities are unloaded first	2017-03-16 13:29:36 -07:00
humbletim	758c07c7d4	Merge branch 'master' into 21114-part3	2017-03-16 14:29:17 -04:00
humbletim	52a571558c	* changes per CR feedback ... * revert JSON content-type workaround * add specific error check / advice for unanchored module ids * update unit tests	2017-03-16 01:23:23 -04:00
Seth Alves	693aee0628	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting	2017-03-15 16:54:40 -07:00
howard-stearns	f662571cab	send credentials to private data-webs as well	2017-03-15 15:46:25 -07:00
Dante Ruiz	dac16af1df	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-notifcation	2017-03-15 19:27:11 +01:00
Dante Ruiz	4bc050e583	added tablet notification	2017-03-15 19:26:50 +01:00
Stephen Birarda	0c657a1d55	add parameter to unload to remove entityID from map	2017-03-15 10:57:12 -07:00
Seth Alves	ec5acf6035	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-15 09:36:39 -08:00
Seth Alves	dc82895feb	Merge pull request #9870 from Atlante45/fix/js-exceptions ... Fix JS exception messages formatting	2017-03-15 09:32:04 -08:00
Seth Alves	b5919d89a5	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-15 08:26:10 -08:00
Seth Alves	08ad56d254	quiet warnings	2017-03-14 18:05:53 -07:00
Seth Alves	40b87171a9	quiet warnings	2017-03-14 17:49:39 -07:00
Seth Alves	4a1be69be4	writeOBJToString	2017-03-14 07:11:38 -07:00
Seth Alves	e8a9ff867d	merge from upstream	2017-03-13 17:57:01 -07:00
humbletim	075574b428	log cleanup per CR; add more specific hints (instead of relying on __FUNCTION__)	2017-03-13 16:33:42 -04:00
Atlante45	b67b17d3c0	Fix JS exception messages formatting	2017-03-13 09:11:20 -08:00
Brad Hefta-Gaub	eaea718de1	add various scriping interfaces for managing the audio scope and detecting noise gate transitions	2017-03-10 17:08:19 -08:00
Dante Ruiz	2cd194104f	force on to home screen	2017-03-10 20:46:01 +00:00
Seth Alves	2068b93ccc	Merge pull request #9817 from druiz17/goto-home-bug ... cant call gotohomescreen when tablet is closed	2017-03-10 10:17:23 -08:00
Dante Ruiz	e9086460e3	changed function names	2017-03-08 18:14:32 +00:00
Dante Ruiz	6acf2340a2	better way to determine if we can go to the homescreen	2017-03-08 17:42:24 +00:00
Seth Alves	509ce3f2d2	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 18:41:36 -08:00
Dante Ruiz	656720ae36	Merge branch 'master' of github.com:highfidelity/hifi into goto-home-bug	2017-03-07 22:22:46 +00:00
humbletim	8582c7af7b	Use specific debug name literal instead of __FUNCTION__ from within lambda	2017-03-07 16:41:20 -05:00
humbletim	d93047f9e2	Switch to READONLY_PROP_FLAGS for require.cache/require.resolve properties	2017-03-07 16:41:19 -05:00
humbletim	40ba8185a0	* Update per 21114-part2 changes. ... * Add explicit thread safety guards. * Add Entities.queryPropertyMetdata for unit testing Entity script module support. * Cleanup / commenting pass.	2017-03-07 16:36:07 -05:00
humbletim	9b09651337	Move BaseScriptEngine from script-engine to shared.	2017-03-07 16:34:24 -05:00
humbletim	e91de1775e	use a fully-qualified initializer when constructing BatchLoader	2017-03-07 16:34:24 -05:00
humbletim	32e450e6c2	* rework _requireResolve error throws (to avoid using lambda w/default args -- which vc++ didn't care for) ... * add ExceptionEmitters to require/resolve so errors get logged even if invoked indpendently from a script	2017-03-07 16:34:24 -05:00
humbletim	efc61c25ad	* use explicit int's for moduleId constants ... * maxTestConstructorValueSize was already limiting debug output size -- adopt its strategy, use shared MAX_DEBUG_VALUE_LENGTH const	2017-03-07 16:34:24 -05:00
humbletim	9d860a8e81	merge require/module changes into clean branch	2017-03-07 16:34:24 -05:00
Ryan Huffman	a744e0d11c	Merge pull request #9685 from humbletim/21114-part2 ... CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions	2017-03-07 13:25:25 -08:00
Dante Ruiz	5156564f04	cant call gotohomescreen when tablet is closed	2017-03-07 00:53:36 +00:00
Seth Alves	08e2e421e4	Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js	2017-03-06 11:08:27 -08:00
Seth Alves	93246b24b0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-06 08:54:49 -08:00
Anthony J. Thibault	45febe8565	Merge branch 'master' into feature/fingers-on-tablet	2017-03-03 09:04:43 -08:00
Seth Alves	cf37845f9e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-02 10:06:38 -08:00
Dante Ruiz	58c1a2fb99	Merge branch 'master' into menuFix	2017-03-02 00:55:18 +00:00
Anthony J. Thibault	01abb4bdb6	Exposed DebugDraw interface to Java Script	2017-03-01 13:14:29 -08:00
Dante Ruiz	e2479a78bd	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-03-01 16:04:12 +00:00
David Kelly	c10b0389de	Add a getAvatarGain method to NodeList and UsersScriptingInterface	2017-02-28 14:45:34 -07:00
Dante Ruiz	f0f2b8c4da	fix comboBox and PushOntoStack	2017-02-28 21:30:25 +00:00
humbletim	2505a89b5e	Per CR feedback bump to strong ref	2017-02-28 00:41:35 -05:00
humbletim	654c72fb7e	Add weakRef guard to detect ScriptEngine deletion during ScriptCache::getScriptContents	2017-02-27 22:58:59 -05:00
humbletim	5b11c0e00a	remove unused consts	2017-02-24 20:45:12 -05:00
Dante Ruiz	73c337efd0	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-25 00:42:22 +00:00
Dante Ruiz	835b23832f	some modal clean up	2017-02-25 00:40:38 +00:00
humbletim	731c01985b	switch from autos	2017-02-24 19:21:17 -05:00
humbletim	cdbb13ecff	Log cleanup	2017-02-24 17:40:06 -05:00
Seth Alves	fcd3c09404	Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js-tablet-as-overlay	2017-02-24 14:27:30 -08:00
humbletim	3ac116545e	* Switch trigger for deferred loads from timer to using leading entity completion ... * Bring back notion of tracking "bad scripts" to fail stampeding entities as a set * Update stampede JS tests to highlight/troubleshoot preexisting unload issue	2017-02-24 16:05:11 -05:00
Howard Stearns	a9b8045697	Merge pull request #9720 from howard-stearns/filter-pal-by-view-distance ... Filter pal by view distance	2017-02-24 11:10:13 -08:00
humbletim	c89d203f94	Adapt from std::map locks to simple QHash for flagging busy scriptURLs	2017-02-24 12:27:33 -05:00
Dante Ruiz	89f5e5112f	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-24 15:25:32 +00:00
Seth Alves	610c20e01a	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-23 17:41:38 -08:00
humbletim	3ad3fd472e	* Inline / duplicate exception checking per CR feedback ... * Coding standards	2017-02-23 19:46:28 -05:00
humbletim	1eeb25a9eb	Increase deferred batch processing.	2017-02-23 19:09:27 -05:00
humbletim	f82a0196a8	Always consume exceptions thrown by include's	2017-02-23 18:12:12 -05:00