1289 commits

Author	SHA1	Message	Date
ZappoMan	9657e7a469	add text entity editing to editModels and entityPropertyDialogBox	2014-11-14 16:28:47 -08:00
Ryan Huffman	28eebd3fa5	Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tool-properties	2014-11-14 10:53:18 -08:00
David Rowe	20fdd6d811	Disable model overlay properties example ... It causes intermittent crashes in NetworkGeometry::setTextureWithNameToURL()	2014-11-14 10:31:30 -08:00
Brad Hefta-Gaub	db2b5fc28d	Merge pull request #3791 from ctrlaltdavid/20128 ... CR for Job #20128 - Make leapHands.js compensate for avatars without wrist joints	2014-11-13 20:44:43 -08:00
Brad Hefta-Gaub	27c37f3a4e	Merge pull request #3784 from ctrlaltdavid/20157 ... CR for Job #20157 - Enable "Get Overlay properties" from javascript	2014-11-13 20:43:38 -08:00
Ryan Huffman	3658d65028	Remove grid tool from menu	2014-11-13 20:02:19 -08:00
Ryan Huffman	a6f027e33a	Fix entity edit grid not hiding when disabling tools	2014-11-13 18:31:32 -08:00
Ryan Huffman	6b2a497810	Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-grid-fixes	2014-11-13 17:48:17 -08:00
Ryan Huffman	55612cc596	Add title to WebWindowClass	2014-11-13 17:46:20 -08:00
Ryan Huffman	49563dbff7	Add entityProperties tool window	2014-11-13 17:41:51 -08:00
Ryan Huffman	4254d38cdd	Update buttons to grid tool	2014-11-13 17:40:21 -08:00
Chris Collins	c55f76d7ef	Apply alpha to text from 0 - .9 ... Apply alpha to text from 0 - .9	2014-11-13 17:27:05 -08:00
Stephen Birarda	cfa2912877	use new SoundCache across scripts	2014-11-13 15:01:45 -08:00
Stephen Birarda	de5881818b	update playSound to new sound interface	2014-11-13 14:54:48 -08:00
David Rowe	8076bfea72	Merge branch 'master' into 20157 ... Conflicts: interface/src/ui/overlays/Text3DOverlay.cpp	2014-11-13 14:53:57 -08:00
Stephen Birarda	e10d132f75	avoid Qt QTimer thread bug by putting SoundCache on same thread	2014-11-13 14:47:28 -08:00
AndrewMeadows	b797c7b38c	Merge pull request #3782 from ctrlaltdavid/20140 ... CR for Job #20140 - Add Overlays.getTextWidth	2014-11-13 13:52:53 -08:00
Philip Rosedale	9cfc95bc6a	Merge pull request #3786 from ZappoMan/animationUnification ... Animation unification	2014-11-13 10:23:36 -08:00
Stephen Birarda	42a73e280e	remove the concert camera scripts from examples	2014-11-13 09:29:37 -08:00
ZappoMan	55c177594b	only set animationIsPlaying if it changed	2014-11-13 08:37:54 -08:00
ZappoMan	ea0022501b	only set animation properties if they actually changed	2014-11-13 08:13:30 -08:00
David Rowe	9e19641a1d	Add property getting for all 3D overlays	2014-11-12 21:05:44 -08:00
ZappoMan	4077f6c2ab	Merge branch 'master' of https://github.com/highfidelity/hifi into animationUnification	2014-11-12 20:39:39 -08:00
ZappoMan	8a2e3d5045	add animationSettings property to model entities	2014-11-12 17:41:55 -08:00
David Rowe	725d56d41f	Add property getting for all 2D overlays	2014-11-12 16:50:13 -08:00
Brad Hefta-Gaub	99dd20f828	Merge pull request #3780 from ctrlaltdavid/20182 ... CR for Job #20182 - Add ability to set alpha on text overlays	2014-11-12 16:26:59 -08:00
Brad Hefta-Gaub	70c463695a	Merge pull request #3779 from PhilipRosedale/master ... Remove buckyBalls and faceshift lean-to-drive	2014-11-12 16:26:50 -08:00
David Rowe	8c3bedae9d	Add position vector and color object script value examples ... OverlayPropertyResult type is needed to successfully move QScriptValue objects from QScriptEngine in Overlays to QScriptEngine in script.	2014-11-12 14:33:52 -08:00
David Rowe	4fa5447c85	Add overlay getProperty() for text overlay "text" property	2014-11-12 12:13:57 -08:00
Philip Rosedale	6af2b7aadf	remove buckyballs and face shift lean driving (should be a script if desired)	2014-11-12 07:33:59 -08:00
Stephen Birarda	b7b371ba61	resolve conflicts on merge with upstream master	2014-11-11 20:53:24 -08:00
David Rowe	8ac3aba2bd	Make text overlays apply alpha to text as well as background	2014-11-11 17:54:02 -08:00
Stephen Birarda	9aa950e657	fix audio injector cleanup for local only injectors	2014-11-11 17:34:03 -08:00
David Rowe	f0f12b0479	Auto-size load URL and file menu items in editModels and newEditEntities ... And fix a couple of typos	2014-11-11 17:32:37 -08:00
Stephen Birarda	7f79f0946d	play a random musak song in lobby when it is shown	2014-11-11 17:10:25 -08:00
Stephen Birarda	0433586293	switch lobby noise back to drone	2014-11-11 16:59:15 -08:00
Stephen Birarda	cb5d5dd3a8	handle looping via AudioInjectorLocalBuffer	2014-11-11 16:57:25 -08:00
Stephen Birarda	a5a02b5f8a	add AudioInjectorLocalBuffer for more control	2014-11-11 16:34:00 -08:00
Stephen Birarda	0e30c65e60	handle cleanup of local injection, volume	2014-11-11 15:12:11 -08:00
Philip Rosedale	e6bbb53483	Merge pull request #3774 from ZappoMan/newEntityNotification ... implement "preload" method for entity Scripts	2014-11-11 14:46:23 -08:00
ZappoMan	8ec3f8ce99	implement support for calling preload when the script changes	2014-11-11 14:21:06 -08:00
Stephen Birarda	cd3877b584	handle local audio output via AudioInjector directly for control	2014-11-11 14:14:43 -08:00
ZappoMan	2bc7896dee	first cut at preload script behavior	2014-11-11 13:46:48 -08:00
Ryan Huffman	db9a5f2282	Add back XZ constraining to entity edit tools	2014-11-11 11:43:27 -08:00
Stephen Birarda	1f452c8baa	replace AudioInjectionOptions with hash in playSoundOnEnterOrLeave	2014-11-11 11:17:45 -08:00
Stephen Birarda	d81609f045	use hash in place of AudioInjectionOptions in other js files	2014-11-11 11:16:45 -08:00
Stephen Birarda	89ae8f53ba	use new AudioInjectionOptions format in botProceduralWayPoints	2014-11-11 11:05:35 -08:00
Stephen Birarda	bfc25767ed	repairs to bot_procedrual for hash injector options format	2014-11-11 10:57:07 -08:00
Stephen Birarda	853c0197a1	repairs to birdSongs for new hash injector format	2014-11-11 10:55:45 -08:00
Ryan Huffman	bedd9c76f2	Merge branch 'master' of github.com:highfidelity/hifi into entity-grid-tool ... Conflicts: examples/newEditEntities.js	2014-11-11 10:48:49 -08:00