15099 commits

Author	SHA1	Message	Date
Brad Davis	16dd24f3d8	Removing unused LGPL JS file	2015-12-18 13:02:45 -08:00
Brad Davis	5088eec2a2	Move directory web UI into the overlay	2015-12-17 12:23:39 -08:00
Brad Davis	82c865af2c	Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engine	2015-12-17 12:20:38 -08:00
Brad Davis	fa5bab08b1	Support web content inside QML	2015-12-16 16:25:38 -08:00
Anthony Thibault	0c1ae5bb61	Merge pull request #6657 from AndrewMeadows/avatar-capsule-2 ... Correct collision capsule for scaled avatars	2015-12-16 11:36:08 -08:00
Ryan Huffman	a422103e89	Merge pull request #6662 from AlessandroSigna/overlays ... Exposing emmisive property of the Image3DOverlay	2015-12-16 10:29:34 -08:00
AlessandroSigna	08f7591787	Fix misspelling	2015-12-16 10:02:47 -08:00
Brad Davis	1e5793893b	Merge pull request #6665 from ZappoMan/rightClickMenu ... fix bug in simulated left click - make qml menus work	2015-12-15 21:40:00 -08:00
Andrew Meadows	0e1e5db7eb	only need one animateScaleChanges() implementation	2015-12-15 18:18:08 -08:00
Andrew Meadows	9b0c199ed7	updateAvatarPhysicsShape-->addAvatarToSimulation	2015-12-15 18:18:08 -08:00
Andrew Meadows	c3823de353	setClampedTargetScale()-->setTargetScaleVerbose()	2015-12-15 18:18:08 -08:00
Andrew Meadows	cd1e3810ca	set the scale of avatar on login, don't animate	2015-12-15 18:18:08 -08:00
Andrew Meadows	bab07516f0	fix size of rendered bounding capsule	2015-12-15 18:18:08 -08:00
Andrew Meadows	33634cdaa1	properly delete departing avatars	2015-12-15 18:18:08 -08:00
Andrew Meadows	e9f52b1211	properly scale avatar collision shape	2015-12-15 18:18:08 -08:00
Brad Hefta-Gaub	76da3a14ac	fix bug in simulated left click - make qml menus work	2015-12-15 17:58:07 -08:00
Brad Davis	29516619ee	Merge pull request #6661 from ZappoMan/rightClickMenu ... first cut at simulating mouse/reticle behavior with input contorllers	2015-12-15 16:08:59 -08:00
AlessandroSigna	8e7a2ac536	Exposing emmisive property of the Image3DOverlay	2015-12-15 15:41:36 -08:00
Brad Hefta-Gaub	aa53900fa3	CR feedback	2015-12-15 15:40:50 -08:00
Brad Hefta-Gaub	3e1e85aa18	Merge pull request #6659 from ctrlaltdavid/20757 ... Fix signal connection to ScriptEngine::finished()	2015-12-15 14:42:24 -08:00
Brad Hefta-Gaub	7d43504c0c	Merge pull request #6615 from hyperlogic/tony/js-avatar-default-pose ... Expose Avatar default pose to JavaScript	2015-12-15 14:27:53 -08:00
Brad Hefta-Gaub	3dcdfbc0f1	first cut at simulating mouse/reticle behavior with input contorllers	2015-12-15 13:59:22 -08:00
David Rowe	541af36794	Fix signal connection to ScriptEngine::finished	2015-12-16 09:12:07 +13:00
Brad Hefta-Gaub	1bcf275b53	Merge pull request #6652 from samcake/red ... Fix Full screen mirror behavior	2015-12-14 18:12:19 -08:00
samcake	571ccb3c20	cleaning up the code	2015-12-14 17:14:45 -08:00
samcake	9f1f0798cb	cleaning up the code	2015-12-14 17:04:26 -08:00
samcake	ed2d45d0b6	HMD Mirror looks correct	2015-12-14 16:18:44 -08:00
Anthony J. Thibault	3f0cdb3c02	Merge branch 'master' into tony/js-avatar-default-pose	2015-12-14 11:19:24 -08:00
samcake	1597d3d466	Merge branch 'master' of https://github.com/highfidelity/hifi into red	2015-12-14 10:25:22 -08:00
samcake	2aad26154e	THis should fix the mirror and the skybox issue	2015-12-14 10:24:51 -08:00
samcake	e005bb7b5a	MAybe a mirror solution ?	2015-12-14 09:25:32 -08:00
Brad Hefta-Gaub	be058398a2	remove blue sphere while speaking	2015-12-13 12:02:39 -08:00
Brad Hefta-Gaub	2815cb0fef	first cut at adding advanced and developer menu groupings	2015-12-12 18:12:36 -08:00
Sam Cake	6288e99798	Playing with mirror	2015-12-11 23:28:04 -08:00
Atlante45	b8495a6912	Merge branch 'master' of https://github.com/highfidelity/hifi into warnings-win	2015-12-11 18:05:47 -08:00
samcake	1ddbc15df4	Exploring how to solve the mirror fullscreen bug	2015-12-11 17:47:33 -08:00
Clément Brisset	c160a98c5c	Merge pull request #6636 from samcake/controllers ... Fix the broken skybox and simplify a bit the vertex shader used	2015-12-11 17:06:33 -08:00
samcake	7ee066b9ed	Merge branch 'controllers' of https://github.com/samcake/hifi into red	2015-12-11 16:35:18 -08:00
Atlante45	c782b01fde	More warning fixes	2015-12-11 16:31:27 -08:00
Atlante45	8bd301e45e	More warning fixes	2015-12-11 16:31:27 -08:00
Atlante45	79fdb2e882	Fix warnings on windows 64bit	2015-12-11 16:31:27 -08:00
Atlante45	0f49653da3	More OS X warning cleanup	2015-12-11 16:31:27 -08:00
samcake	68134aafe5	Fix the broken skybox and simplify a bit the vertex shader used	2015-12-11 16:14:55 -08:00
Brad Davis	1bcf42a799	Merge pull request #6629 from ZappoMan/resetSkyBoxOnDomainChange ... reset skybox on changing domains	2015-12-11 15:48:20 -08:00
Brad Hefta-Gaub	d918eca030	reset skybox on changing domains	2015-12-11 11:36:02 -08:00
Brad Hefta-Gaub	a1a3c4470c	reload own avatar on Content Reload	2015-12-11 11:02:16 -08:00
Brad Hefta-Gaub	a7a924153a	Merge pull request #6617 from huffman/entity-query-keyhole ... Add keyhole radius to OctreeQuery	2015-12-11 09:35:46 -08:00
Brad Hefta-Gaub	a472d293bb	Merge pull request #6599 from jherico/aeryn-sdl2 ... Moving SDL2 to external plugin	2015-12-10 18:02:15 -08:00
Howard Stearns	585911fe98	Merge pull request #6612 from sethalves/no-physics-until-ready ... No physics until ready	2015-12-10 16:09:49 -08:00
Brad Davis	98263f0c0d	Moving sdl2 to external plugin	2015-12-10 14:56:41 -08:00