17387 commits

Author	SHA1	Message	Date
Seth Alves	8c278563f5	allow scripts on the web to refer to interface-local javascript libraries	2016-04-28 13:41:50 -07:00
Andrew Meadows	b95c81d0ba	Merge pull request #7763 from huffman/fix/gpu-ident-debug ... Fix assert crash in GPUIdent	2016-04-28 08:02:11 -07:00
Andrew Meadows	8a691cf449	Merge pull request #7765 from hyperlogic/tony/cone-sphere-angle ... Improve eye tracking when face to face	2016-04-27 16:54:07 -07:00
Andrew Meadows	4160e0c1df	Merge pull request #7773 from imgntn/defaultScripts ... change path for defaultscripts.js in scriptengine	2016-04-27 16:35:51 -07:00
James B. Pollack	bced3c2c3c	change path for defaultscripts.js in scriptengine	2016-04-27 13:34:42 -07:00
Andrew Meadows	5042561e80	Merge pull request #7730 from imgntn/defaultScripts ... /scripts for launch	2016-04-27 11:36:20 -07:00
Andrew Meadows	f6aa0a11a8	Merge pull request #7766 from ZappoMan/fixAutoResize ... fix auto resize of models on import	2016-04-27 10:03:18 -07:00
Andrew Meadows	93f4bc759d	Merge pull request #7743 from samcake/color ... group several separate glUniform parameters into a single Uniform Buffer	2016-04-27 10:02:56 -07:00
Brad Hefta-Gaub	19416fe722	Merge pull request #7761 from samcake/lemon ... Add support for equi-rectangular skymaps (2 by 1)	2016-04-26 17:15:24 -07:00
James B. Pollack	afb2342781	Merge remote-tracking branch 'upstream/master' into defaultScripts	2016-04-26 16:16:56 -07:00
James B. Pollack	37fa703279	use system path instead of default for loading scripts	2016-04-26 15:50:45 -07:00
Brad Hefta-Gaub	b597f7001b	fix auto resize	2016-04-26 15:13:11 -07:00
Anthony J. Thibault	d9063b199e	GeometryUtils: coneSphereAngle test	2016-04-26 13:31:06 -07:00
Brad Hefta-Gaub	ee277dcf9d	Merge branch 'master' of https://github.com/highfidelity/hifi into qmlWindowFixes	2016-04-26 11:44:51 -07:00
Andrew Meadows	3d1abf8fb1	use the new JS script location	2016-04-26 11:20:08 -07:00
Ryan Huffman	e5f2658fd9	Update GPUIdent to take address of spInstance directly	2016-04-26 09:23:08 -07:00
Brad Hefta-Gaub	4ab7b660d4	fix a bunch of bugs in qml window placement	2016-04-25 20:19:54 -07:00
samcake	91bed86b32	ANd one more warning	2016-04-25 19:04:02 -07:00
samcake	5cb346330b	Merging with master	2016-04-25 18:48:58 -07:00
samcake	8f2435daf0	No more warnings ?	2016-04-25 18:39:37 -07:00
samcake	e8691c2f20	Fixing comments, code style and constnats	2016-04-25 18:15:52 -07:00
samcake	0e13b1623b	Adding support for Equirectangular skymaps	2016-04-25 15:55:12 -07:00
Seth Alves	16bf59f8a6	fix a crash in RenderableModelEntityItem::getModel	2016-04-25 10:26:32 -07:00
samcake	dd189747f5	Merge branch 'master' of https://github.com/highfidelity/hifi into lemon	2016-04-25 09:41:44 -07:00
Brad Hefta-Gaub	8c7ef31636	Merge pull request #7746 from AndrewMeadows/supress-spurious-logs ... reduce warnings about truncated kinematic timesteps	2016-04-23 09:34:45 -07:00
Brad Hefta-Gaub	04dab65b59	Merge pull request #7727 from ZappoMan/supportLargeClockSkew ... support for larger than 35 minute clock skew	2016-04-23 08:42:38 -07:00
samcake	f587398ca3	Adding support for plate carree	2016-04-22 18:00:22 -07:00
Andrew Meadows	d984ce4792	properly update _lastSimulated for kinematic objs	2016-04-22 17:19:00 -07:00
Brad Hefta-Gaub	f1f9c6740d	Merge pull request #7745 from jherico/mac_texture_fix ... Fixing texture storage allocation on OSX/GL 4.1	2016-04-22 17:07:12 -07:00
Bradley Austin Davis	d87c92baee	Fixing memory detection on OSX	2016-04-22 16:30:36 -07:00
Bradley Austin Davis	472d3dc45f	Still working on mac breakage	2016-04-22 16:25:23 -07:00
Bradley Austin Davis	407e0c0dd7	Fixing texture storage allocation on OSX/GL 4.1	2016-04-22 15:48:18 -07:00
Chris Collins	9bd9de5710	Merge pull request #7636 from samcake/red ... Stereo drawcall amplification	2016-04-22 15:46:18 -07:00
Brad Hefta-Gaub	79a1e6264e	Merge pull request #7714 from hyperlogic/tony/default-anims-are-local ... Avatar animations are now stored locally	2016-04-22 13:44:30 -07:00
Brad Hefta-Gaub	c962cfbda3	Merge pull request #7712 from zzmp/guard/obj-access ... Guard OBJ at operators	2016-04-22 13:43:59 -07:00
Brad Hefta-Gaub	410bf3c95a	Merge pull request #7711 from AndrewMeadows/faster-kinematics ... faster hifi kinematic motion calculations take-4	2016-04-22 13:41:02 -07:00
Brad Hefta-Gaub	c410242fb2	Merge pull request #7688 from jherico/texture_derez ... Reducing GPU texture memory footprint	2016-04-22 13:20:54 -07:00
Andrew Meadows	34d622e498	add warning about truncated kinematic timestep	2016-04-22 13:10:23 -07:00
Brad Hefta-Gaub	de17834dd1	Merge pull request #7740 from ctrlaltdavid/20887 ... Don't display "Reveal Scripts Folder" control in HMD mode	2016-04-22 13:04:07 -07:00
Brad Hefta-Gaub	f0659a985c	Merge pull request #7726 from Atlante45/fix/pmtu-disc-fail ... Fix for path MTU discovery fail	2016-04-22 12:24:44 -07:00
Seth Alves	e827a99222	Merge pull request #7732 from Atlante45/fix/settings-crash ... Fix crash on exit in Settings	2016-04-22 11:46:30 -07:00
Seth Alves	4561962db1	Merge pull request #7736 from huffman/fix/asset-request-crash ... Fix AssetClient not properly cleaning up canceled requests	2016-04-22 11:45:26 -07:00
samcake	43caca901f	Merge branch 'master' of https://github.com/highfidelity/hifi into color	2016-04-22 10:57:14 -07:00
samcake	fd3efa37e3	Cleanup the shaders to avoid any uniform in genral, fixed a bug woith the emissive params applied twice for model_lightmap.slf	2016-04-22 10:56:21 -07:00
Ryan Huffman	3b5b6a2609	Merge branch 'master' of https://github.com/highfidelity/hifi into fix/asset-request-crash	2016-04-22 10:02:21 -07:00
Ryan Huffman	1416e397e4	Merge branch 'playEntityCollisionSound-crash' of github.com:sethalves/hifi into fix/asset-request-crash	2016-04-22 10:02:00 -07:00
Andrew Meadows	2bd83764e7	remove some debug cruft	2016-04-22 09:38:43 -07:00
Andrew Meadows	872622c6f7	fix acceleration of for server-side kinematics	2016-04-22 09:38:43 -07:00
Andrew Meadows	14abb15216	set kinematic accel before stepping	2016-04-22 09:38:43 -07:00
Andrew Meadows	8efb07cfd8	correctg measured acceleration for kinematics	2016-04-22 09:38:43 -07:00