1724 commits

Author	SHA1	Message	Date
howard-stearns	3d4f9be05b	fix teleport vs stuck-in-floor work	2017-06-12 17:01:13 -07:00
howard-stearns	fa74daf875	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-06-07 16:43:25 -07:00
Brad Davis	171d3212fe	Merge pull request #10623 from jherico/qml_engine_singleton ... Migrate to single QML engine	2017-06-06 15:00:43 -07:00
Bradley Austin Davis	995fe11c05	Migrate to single QML engine	2017-06-05 15:14:44 -07:00
Howard Stearns	3d62900daf	When we do precision detailed picking on a model, check the back faces, too. In other words, precision picking from inside a model works.	2017-06-03 16:49:16 -07:00
samcake	14f9a9848e	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-06-01 18:05:47 -07:00
samcake	9c1e99fe3f	Removing cruft and organizing the stencil config	2017-06-01 13:06:22 -07:00
Sam Cake	d19956f93c	Fixing warnings	2017-05-31 22:02:47 -07:00
samcake	882df7391b	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-26 16:47:49 -07:00
samcake	cba913c068	Fixing the case when the bound changes without the rest of the properties	2017-05-25 13:01:54 -07:00
Zach Fox	f2fab57187	Update conditional to handle 'other unowned' case	2017-05-25 13:01:40 -07:00
Zach Fox	be39874999	Changes after discussion with Brad	2017-05-25 13:01:40 -07:00
Zach Fox	f6195cdb1e	Committing checkpoint changes, then testing	2017-05-25 13:01:40 -07:00
Zach Fox	4d791211ee	Make the changes - big thanks to Andrew!	2017-05-25 13:01:40 -07:00
Sam Cake	3eb95d2d19	cleaning the commented code	2017-05-25 01:16:45 -07:00
samcake	575d4abdf7	bad include fixed maybe	2017-05-24 17:25:21 -07:00
samcake	c256893575	some clean up:	2017-05-23 18:00:22 -07:00
samcake	e7b808cbc1	Merging with upstream	2017-05-23 12:12:31 -07:00
Sam Gateau	589bcc19ce	Refining the shader for key and testing removing completely the code dealing with Zone lighting in the ENtityTreeREnderer	2017-05-19 17:50:19 -07:00
Andrew Meadows	f80e7a3743	less obfuscation	2017-05-19 15:58:54 -07:00
Andrew Meadows	bb4d366c40	use SmartPointer for Zone _model	2017-05-19 15:33:23 -07:00
Andrew Meadows	7b879a7964	Model has a Rig rather than a RigPointer	2017-05-19 13:24:16 -07:00
samcake	2cd2c95940	Adding more debugging tool	2017-05-16 16:12:31 -07:00
samcake	db4387e55d	Trying to mess with the defautl texture for skybox	2017-05-15 17:31:29 -07:00
samcake	8626e1f3d1	Keep fixing the cascading behavior to the zone render item	2017-05-15 17:19:46 -07:00
samcake	bc41be7ec1	Introucing the BackgroundStage to manage the background / skybox in one place	2017-05-09 17:10:05 -07:00
samcake	bbb513220b	Moving forward	2017-05-08 17:33:24 -07:00
Sam Cake	d3724116d9	Using the items to pick the key light!	2017-05-08 00:20:20 -07:00
samcake	b6c966ef39	Keep iterating on the zones	2017-05-05 18:07:21 -07:00
Sam Cake	db3d634840	Adding the change notifications	2017-05-05 00:11:22 -07:00
samcake	df2c5b8c23	adding the notification for keyLight changes modifying the KeyLIghtPayoad	2017-05-04 18:28:12 -07:00
samcake	64317f5fd0	Adding a light item per zone	2017-05-04 16:47:03 -07:00
Andrew Meadows	ac6d4969d6	Merge pull request #10270 from Atlante45/fix/unload ... Fix entity script unloads	2017-04-26 11:42:14 -07:00
Atlante45	33f58f99d1	CR	2017-04-25 16:09:31 -07:00
Atlante45	ad16a935e9	Texture::create returns shared pointer	2017-04-25 15:56:23 -07:00
Atlante45	a450f52427	Start to setup image library	2017-04-25 15:56:22 -07:00
Atlante45	24f4107c92	Unload script when replaced with empty URL	2017-04-24 15:56:37 -07:00
Atlante45	d292451f91	Remove unnecessary const	2017-04-24 15:43:36 -07:00
Andrew Meadows	31bfc98b87	use const reference for ScenePointer when possible	2017-04-18 11:52:22 -07:00
samcake	79bcf95792	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis	2017-04-11 10:00:34 -07:00
Seth Alves	b99959c73d	munge collision-hull at last minute rather than store munged url as a property	2017-04-11 07:00:22 -07:00
Seth Alves	8a3a52cbcf	make getCollisionGeometryResource a separate call from getGeometryResource rather than passing a bool	2017-04-10 13:54:24 -07:00
Seth Alves	6bd841857f	added a comment	2017-04-10 13:50:36 -07:00
Seth Alves	717436e0fd	use QUrl rather than just munging the url with a string-append	2017-04-10 10:54:30 -07:00
Seth Alves	554b23357c	add combineParts flag to getGeometryResource. append ?collsion-hull to urls that are used as compound collision hulls	2017-04-10 10:14:36 -07:00
samcake	16e6f0900d	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis	2017-04-10 10:12:23 -07:00
Sam Cake	b65448bcbe	Trying to improve the Job/Task classes and testing it with the ZoneRenderer	2017-04-09 11:08:35 -07:00
Brad Hefta-Gaub	0d4649ded8	Merge pull request #10079 from jherico/entity_thread_safety ... Thread safety for property getter/setters on entities	2017-04-07 19:01:07 -07:00
Seth Alves	03065ee6c8	Merge pull request #9938 from kunalgosar/jsRenderBug ... Stop WebEntities Running Files and Commands	2017-04-07 13:44:03 -07:00
samcake	6fc965072c	Adding the Selection, and not the Tag concept fro real, and beeing able to reset it from the Transaction and simply communicating the ranked zones to the engine through a selection, ready to be used by the ZOneREnderer	2017-04-06 15:19:55 -07:00