2501 commits

Author	SHA1	Message	Date
SamGondelman	0c8a4cc81e	merge with master	2018-08-28 17:31:51 -07:00
SamGondelman	aae06e8f49	faster aabox ray intersection and pre-computed inverse direction	2018-08-27 15:40:33 -07:00
danteruiz	e2cd695dfb	PR code clean up	2018-08-27 11:01:29 -07:00
Sam Gondelman	6730635931	Merge branch 'master' into scriptvec3	2018-08-27 10:43:52 -07:00
danteruiz	e4293d9ad5	fixing some entity visual problems	2018-08-26 21:50:01 -07:00
Dante Ruiz	92acaade2b	trying to fix problems	2018-08-24 17:13:57 -07:00
Dante Ruiz	af19849a75	fixing merge conflict	2018-08-24 15:48:42 -07:00
Dante Ruiz	3796675123	script update and visuallyReady entities	2018-08-24 15:46:39 -07:00
John Conklin II	fcdbc6c6d2	Merge pull request #13778 from SamGondelman/bloom ... Enable bloom in zone properties	2018-08-24 14:46:31 -07:00
SamGondelman	b5b7167644	add to stats	2018-08-23 17:56:24 -07:00
Andrew Meadows	3c01433e12	stub for avatars changing workload regions	2018-08-23 12:59:28 -07:00
SamGondelman	283c0c0311	s i m p l i f y	2018-08-23 11:47:56 -07:00
SamGondelman	5c0b12abf6	ordered ray/parabola intersection code	2018-08-22 16:29:17 -07:00
Wayne Chen	acc7d493ec	Merge pull request #13812 from SimonWalton-HiFi/safe-landing ... Safe landing client-side improvements	2018-08-20 20:36:17 -07:00
John Conklin II	b28aa3951f	Merge pull request #13802 from jherico/feature/scribe_programs ... Migrating to scribe program descriptors	2018-08-20 14:48:54 -07:00
Sam Gondelman	f0986a7f5a	Merge branch 'master' into scriptvec3	2018-08-20 10:56:45 -07:00
Simon Walton	3c665b7de8	Don't delete sequence numbers outside of range as range may change	2018-08-10 14:40:08 -07:00
SamGondelman	15070f6374	fixing fading	2018-08-10 10:52:58 -07:00
Brad Davis	f03370c826	Migrating to scribe program descriptors	2018-08-09 17:58:34 -07:00
SamGondelman	bd4a3a5b32	remove unused uniform buffer from polylines	2018-08-09 12:20:36 -07:00
SamGondelman	a0c3c09b05	Merge remote-tracking branch 'upstream/master' into bloom	2018-08-08 14:44:02 -07:00
Sam Gondelman	16b483b338	Merge pull request #13766 from SamGondelman/shaders ... Miscellaneous shader fixes	2018-08-08 11:34:36 -07:00
SamGondelman	0dd8d2d3d4	working on enabling bloom	2018-08-07 18:18:58 -07:00
SamGondelman	de10dfb032	don't bind materials during shadow pass	2018-08-07 11:17:18 -07:00
SamGondelman	82029b4cb0	fix v1 and transparent procedurals	2018-08-07 09:28:40 -07:00
Sam Gateau	00c5b6f5f4	Merge pull request #13743 from SamGondelman/transparent ... Fix primitives always drawing as transparents	2018-08-06 16:28:30 -07:00
SamGondelman	a7dec8fb75	parabola and particle shader fixes	2018-08-06 15:49:52 -07:00
Brad Davis	ae8f841912	Shader refactoring for explicit bindings	2018-08-03 14:58:11 -07:00
Brad Davis	04e84f1d23	Moving to cmake time shader compiling	2018-08-03 14:58:11 -07:00
Sam Gondelman	7772e8adf2	Merge branch 'master' into scriptvec3	2018-08-03 14:57:49 -07:00
SamGondelman	2f358f3380	fix shapes always drawing as transparents	2018-08-02 12:16:01 -07:00
John Conklin II	7a635b6a57	Merge pull request #13709 from thoys/fix/require-load-queue ... MS17041: Fix for require fail when the same script loaded simultaneously from another entity script	2018-08-01 11:15:32 -07:00
Thijs Wenker	003e826d60	move over definition so it could be linked in the assignment-client too	2018-08-01 00:23:34 +02:00
SamGondelman	7c8d080050	Merge remote-tracking branch 'upstream/master' into scriptvec3	2018-07-31 14:04:23 -07:00
Thijs Wenker	74343c71d8	CR fixes	2018-07-31 22:29:53 +02:00
Seth Alves	4ff9252b47	Merge pull request #13718 from jherico/fix/fb15963 ... Support rendering of 'about' URLs in web entities	2018-07-31 09:44:31 -07:00
SamGondelman	2ca217eb4a	merge with master	2018-07-30 17:43:15 -07:00
Brad Davis	c991053c93	Support rendering of 'about' URLs in web entities	2018-07-30 11:56:31 -07:00
Seth Alves	a6aaa71d02	Revert "Allow empty web entities to be rendered"	2018-07-30 11:54:52 -07:00
Sam Gondelman	8201997a16	Merge pull request #13660 from SamGondelman/parabolic ... Parabolic Picking + Pointers	2018-07-30 10:49:02 -07:00
Seth Alves	32ec984f82	Merge pull request #13577 from dback2/invisibleWebEntities ... Allow empty web entities to be rendered	2018-07-30 10:12:32 -07:00
John Conklin II	fc88165e23	Merge pull request #13696 from SamGondelman/particleRot ... Particles don't spin with head roll, new spin + rotateWithEntity properties	2018-07-27 14:54:48 -07:00
Sam Gateau	a95ddb0492	Merge pull request #13616 from AndrewMeadows/remove-cruft-001 ... remove cruft for rendering collision shapes	2018-07-27 19:19:44 +02:00
SamGondelman	1c1b68ee66	emitterShouldTrail fix, review comments, rotateWithEntity	2018-07-26 11:41:16 -07:00
SamGondelman	4750611af9	particles don't spin with head roll, add particle spin properties, negative emitSpeed	2018-07-24 23:47:58 -07:00
SamGondelman	318ef907b8	parabola/polyvox, fixing some bugs	2018-07-24 10:08:35 -07:00
SamGondelman	956c1511b6	Merge remote-tracking branch 'upstream/master' into parabolic	2018-07-19 15:23:25 -07:00
Andrew Meadows	207aea8712	remove cruft from rendering collision shapes	2018-07-16 10:29:34 -07:00
SamGondelman	f9cdfbad7c	cleanup	2018-07-12 17:59:57 -07:00
SamGondelman	16ad9cb5d3	xcolor/rgbcolor conversion	2018-07-11 18:06:06 -07:00
SamGondelman	9929529f30	vec3 conversion	2018-07-11 14:18:22 -07:00
SamGondelman	5bbd5b9e52	vec2 conversion	2018-07-10 16:32:49 -07:00
David Back	c4236d7442	allow rendering empty web entity	2018-07-10 13:53:18 -07:00
SamGondelman	ca5ce888f4	parabola triangle intersection	2018-07-09 18:11:57 -07:00
Dante Ruiz	ae03dcb57a	fix parent grab dropping and cullig flickering	2018-07-06 15:42:21 -07:00
SamGondelman	7130b5aa7f	fixing findRayIntersection bugs	2018-07-05 10:27:12 -07:00
SamGondelman	90091d11e4	parabola picks, started implementing math	2018-07-03 09:47:31 -07:00
John Conklin II	e7d5ea561b	Merge pull request #13469 from hyperlogic/safeLandingFix4 ... Fix for landing on the roof of some domains.	2018-06-27 10:23:35 -07:00
Dante Ruiz	d8834af749	make requested changes	2018-06-26 11:53:45 -07:00
Dante Ruiz	17f4a27ceb	Merge branch 'master' of github.com:highfidelity/hifi into fix-entity-lag-2	2018-06-26 10:55:27 -07:00
Anthony J. Thibault	328a485ad1	Prevent ray-picks against ModelEntity bounding boxes when loading has not yet completed.	2018-06-25 10:38:53 -07:00
Sam Gondelman	850e2d5cf5	Merge branch 'master' into particleFix	2018-06-21 17:32:24 -07:00
Sam Gondelman	afc64a18a1	Merge pull request #13362 from SamGondelman/modelTextures ... Fix transparent textures rendering wrong sometimes	2018-06-21 14:23:49 -07:00
SamGondelman	8f411ad6c8	CR	2018-06-20 16:13:10 -07:00
Dante Ruiz	f891c37ac8	fix particle entity	2018-06-20 10:59:19 -07:00
Dante Ruiz	3d4f164a9f	fixing web entity and whitespace cleanup	2018-06-19 16:53:36 -07:00
Dante Ruiz	694c272424	fixed text entity	2018-06-19 16:27:10 -07:00
Dante Ruiz	568ba6f777	fixing shape entity	2018-06-19 14:14:16 -07:00
Andrew Meadows	6d422e4678	Merge 'master' into 'workload'	2018-06-18 10:30:13 -07:00
SamGondelman	7771661948	fix particle spread properties	2018-06-15 17:35:49 -07:00
SamGondelman	9ea65950d5	particles: threadsafe, cleanup, rework initialized logic	2018-06-15 15:45:06 -07:00
SamGondelman	0b79e9f6c7	whoops	2018-06-15 15:13:29 -07:00
Sam Gondelman	225a98129a	Merge branch 'master' into modelTextures	2018-06-15 15:09:32 -07:00
John Conklin II	2483c45f40	Merge pull request #13350 from sabrina-shanman/bulletcollisionrenderonly ... Remove functionality for rendering collision models directly in the Model class	2018-06-15 14:46:40 -07:00
sabrina-shanman	b2ec7f78c1	Remove signaling and render code for collision models in RenderableModelEntityItem and EntityTreeRenderer	2018-06-14 15:49:40 -07:00
SamGondelman	5ac7ced306	cleanup renderable model entity item, fix crash on reload, fix different transparent bug	2018-06-13 17:14:52 -07:00
Ryan Huffman	a558f71fcd	Fix resoruces path URLs not working with Script.resolvePath ... Depending on the context, "/~/" means different things. The ScriptEngine resolves this path to `/scripts`, but everywhere else it resolves to `/resources`. This change forces us to expand those paths instead of storing the "/~/" path, which will be incorrectly resolved once the ScriptEnging is using it.	2018-06-12 16:55:31 -07:00
sabrina-shanman	4c39d08358	Remove "Draw Collision Shapes" option from developer physics menu	2018-06-11 11:03:57 -07:00
sabrina-shanman	440c77905a	Remove functionality for rendering collision meshes directly in the Model class	2018-06-11 11:03:57 -07:00
Brad Davis	380137a660	Fix particle entity shader	2018-06-10 12:15:00 -07:00
SamGondelman	c18602d22e	fix models starting as green boxes	2018-06-07 13:03:56 -07:00
Andrew Meadows	4329ea5240	Merge master' into 'workload'	2018-06-04 16:11:25 -07:00
SamGondelman	86ee5c12d8	merge and update based on sam's changes	2018-05-31 17:53:36 -07:00
samcake	386c0f9ab2	Re review adjustments	2018-05-31 12:16:57 -07:00
Sam Gateau	513acc529e	INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine	2018-05-30 23:31:54 -07:00
samcake	2e9076c71e	Clean up and trying to get ready for merge	2018-05-30 11:14:49 -07:00
Sam Gateau	678effdb48	Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey	2018-05-26 23:28:59 -07:00
SamGondelman	e6741a363e	add local-only isVisibleInSecondaryCamera flag to entities	2018-05-23 16:35:21 -07:00
Andrew Meadows	a23126a6b2	Merge 'master' into 'workload'	2018-05-18 07:38:02 -07:00
John Conklin II	a6cda2166a	Merge pull request #13158 from highfidelity/stable ... RC67.1 stable mergeback to master	2018-05-15 14:01:06 -07:00
Andrew Meadows	c7c4324b3c	Merge 'master' into 'workload'	2018-05-15 10:22:50 -07:00
SamGondelman	de4a2ca3b2	update procedural skybox on user data change	2018-05-10 18:44:53 -07:00
Clément Brisset	39e2a78b1a	Merge pull request #13074 from Atlante45/fix/spec-cam-punchlist ... Multifrustum queries punchlist	2018-05-04 15:50:44 -07:00
John Conklin II	32086def18	Merge pull request #13091 from samcake/blue ... Master: Fixing the strobing light effect, aka Translucent lighting by ponctual lights	2018-05-04 10:25:57 -07:00
Clement	27c471ee97	Move all wire frustums to conical frustums	2018-05-03 18:19:29 -07:00
samcake	767e6b15f3	Fixing the local lighting on translucents bug	2018-05-03 11:42:06 -07:00
samcake	60a49c3f7c	applying the local lights on translucent fix	2018-05-03 10:37:29 -07:00
Andrew Meadows	99a75c5a87	Merge 'master' into 'workload'	2018-05-02 17:28:36 -07:00
Clement	538f24162f	Define ViewFrustums type alias	2018-05-01 18:03:21 -07:00
Clement	21213e81f4	Multiview support for priority queue	2018-05-01 18:03:21 -07:00