39767 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	10efbd996f	Update General Settings dialog to use new window frame style	2016-02-25 20:26:36 +13:00
David Rowe	023c04d2fe	Add optional footer to "form editor" dialogs	2016-02-25 20:25:20 +13:00
David Rowe	4cc36d1df0	Update QML UI test environment for Settings > General dialog	2016-02-25 17:13:48 +13:00
ericrius1	8f914c6673	removed query string on entity script	2016-02-24 20:08:35 -08:00
Brad Davis	ef33d297e2	Fix framebuffer behavior when changing attachments	2016-02-24 19:57:00 -08:00
ericrius1	ad49bcda72	lowered num fireworks	2016-02-24 18:29:44 -08:00
ericrius1	7cb57aa067	alpha tweaks	2016-02-24 18:15:34 -08:00
ericrius1	a1eab365ce	added name to launch pad	2016-02-24 18:11:08 -08:00
ericrius1	29c4ac83c0	can set launch position in userdata	2016-02-24 18:00:57 -08:00
ericrius1	857ccc7409	move sound with thing	2016-02-24 17:53:46 -08:00
Chris Collins	f6a6560b86	Merge pull request #7175 from sethalves/grab-clean-up-abandoned ... grab script cleans up abandoned grabs	2016-02-24 17:20:46 -08:00
Thijs Wenker	a716d971d9	Merge branch 'master' of https://github.com/highfidelity/hifi into 20774_fix	2016-02-25 02:18:40 +01:00
ericrius1	08e7adc518	tweaks	2016-02-24 17:08:12 -08:00
ericrius1	45e8287d1d	particle trail in right spot	2016-02-24 16:55:31 -08:00
ericrius1	c26ad2b9d0	relative smoke trail	2016-02-24 16:52:02 -08:00
ericrius1	fdb5d33866	MORE RANDOM YAHH	2016-02-24 16:42:24 -08:00
Brad Hefta-Gaub	8b6a445b9e	fix desktop detection when not pointing at overlay area	2016-02-24 16:42:08 -08:00
ericrius1	208096f2e0	fireworks but no smoke	2016-02-24 16:36:54 -08:00
ericrius1	769a5ecca9	tweaks	2016-02-24 16:33:28 -08:00
Stephen Birarda	f1aca57543	remove a tab in whitespace only line	2016-02-24 16:30:34 -08:00
ericrius1	0a6a35ddd8	need multiple explosions at once	2016-02-24 16:30:29 -08:00
Howard Stearns	274f72af52	Merge branch 'master' of https://github.com/highfidelity/hifi into ac-sound-searcher-update	2016-02-24 16:28:52 -08:00
Seth Alves	cfdaf643a1	Merge pull request #7181 from sethalves/fix-grab-action ... fix avatarActionHold	2016-02-24 16:28:17 -08:00
Howard Stearns	90b5cdb30f	Fix bug. Annotate.	2016-02-24 16:27:46 -08:00
Brad Hefta-Gaub	ecb03562d3	fix build buster	2016-02-24 16:24:48 -08:00
Zach Pomerantz	c2ed5e5474	Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity	2016-02-24 16:24:09 -08:00
Zach Pomerantz	20bfdba14b	Avoid light prop copies when setting globalLight	2016-02-24 16:20:59 -08:00
Brad Hefta-Gaub	f9b55c4b87	Merge pull request #7185 from ctrlaltdavid/20809 ... Fixes for new modal message dialog	2016-02-24 16:20:40 -08:00
Brad Hefta-Gaub	ca5de8d6a9	remove some unimplemented menu items	2016-02-24 16:17:11 -08:00
ericrius1	0499334938	toadd: different colors for fireworks	2016-02-24 16:14:46 -08:00
Zach Pomerantz	1817b8ef2f	Use only skyboxTexture in DeferredLightingEffect	2016-02-24 16:07:28 -08:00
Zach Pomerantz	95d98e3ed7	Wire up zone ambientURL	2016-02-24 16:07:04 -08:00
ericrius1	dea41edf9c	tweaks	2016-02-24 16:01:38 -08:00
ericrius1	e245ad93d6	smoke and fire	2016-02-24 15:58:09 -08:00
James B. Pollack	643365bc5a	new models	2016-02-24 15:42:51 -08:00
Anthony J. Thibault	62ed5333e0	AvatarActionHold: compute velocities for other avatars	2016-02-24 15:14:56 -08:00
James B. Pollack	5e57366ba7	urls	2016-02-24 15:06:57 -08:00
Anthony J. Thibault	b3b4c6473d	Merge branch 'master' into fix-grab-action	2016-02-24 14:34:23 -08:00
David Rowe	b9a1c2051b	Fix modal dialog not being opaque to mouse clicks	2016-02-25 10:52:16 +13:00
Anthony Thibault	9d9e63a947	Merge pull request #7182 from zzmp/fix/aa-shader ... Fix fxaa shader to use texture	2016-02-24 13:51:12 -08:00
Brad Hefta-Gaub	568fd3e77f	Merge pull request #7164 from ctrlaltdavid/20809 ... Restyle message box modal dialogs	2016-02-24 13:47:00 -08:00
Brad Hefta-Gaub	1699e4a396	Merge pull request #7131 from ctrlaltdavid/20805 ... Restyle the Running Scripts dialog	2016-02-24 13:45:40 -08:00
Brad Hefta-Gaub	9273238b53	Merge pull request #7178 from Nex-Pro/20807 ... CR for Job #20807 - Fix vertically mirrored particles.	2016-02-24 13:43:40 -08:00
Zach Pomerantz	124c84c8b9	Fix fxaa shader to use texture	2016-02-24 13:36:08 -08:00
Seth Alves	ea16a659b2	Merge pull request #7183 from zzmp/fix/avatar-warnings ... Fix avatar warnings	2016-02-24 13:35:54 -08:00
Zach Pomerantz	3c4ab077be	Init validOrientation for myAvatar calc	2016-02-24 13:16:45 -08:00
Zach Pomerantz	e78905a6d1	Rm previousDeltaTimeStep unused field from AvatarActionHold	2016-02-24 13:15:49 -08:00
ericrius1	5520094bac	exploding fireworks	2016-02-24 12:29:54 -08:00
David Rowe	51b41da488	Horizontally center short messages in the dialog	2016-02-25 09:15:07 +13:00
Seth Alves	e1b10e79df	don't crash when watching someone else near-grab something	2016-02-24 12:09:51 -08:00