260 commits

Author	SHA1	Message	Date
ZappoMan	05fa3c89a7	Merge branch 'master' of https://github.com/highfidelity/hifi into textEntity	2014-11-15 20:38:07 -08:00
ZappoMan	28fc6d15f4	test	2014-11-14 22:53:29 -08:00
ZappoMan	f0cd258a13	test	2014-11-14 22:51:04 -08:00
ZappoMan	66f519d613	dry up EntityItemProperties with macros	2014-11-14 22:15:19 -08:00
ZappoMan	55ac9c8ef7	make sure properties include type for proper encoding	2014-11-14 21:16:50 -08:00
ZappoMan	62c64479c2	first cut at text entity	2014-11-14 15:58:12 -08:00
ZappoMan	11058355a0	implement aboutToFinish for persist thread to allow final save before shutdown	2014-11-14 09:55:32 -08:00
AndrewMeadows	edc599bc2d	Merge pull request #3792 from ZappoMan/bugFixes ... fix a couple bugs	2014-11-14 08:33:49 -08:00
ZappoMan	7b69642c67	fix bug in animation jitter on turn	2014-11-13 23:03:12 -08:00
Atlante45	f914f02a0b	Move user data to end of enum	2014-11-13 17:44:22 -08:00
Atlante45	9fc7451581	Move macros to the end	2014-11-13 17:06:57 -08:00
Atlante45	40576b3c03	moved append to the end	2014-11-13 17:02:45 -08:00
Atlante45	f8be98260c	String specific macros	2014-11-13 16:32:15 -08:00
Atlante45	f47620231e	Entities have user data	2014-11-13 16:16:20 -08:00
ZappoMan	3e521e089b	fix unix build	2014-11-13 09:48:15 -08:00
ZappoMan	8ec12ea954	add full animation settings support	2014-11-13 08:59:06 -08:00
ZappoMan	701059d797	removed some debug	2014-11-13 08:58:33 -08:00
ZappoMan	bc60c90308	only actually set the properties if they were in the buffer	2014-11-13 08:39:19 -08:00
ZappoMan	e4355cd139	calculated animationSettings property to include older properties	2014-11-13 07:34:54 -08:00
ZappoMan	c9e8c21d8d	partial work on blending of animation settings	2014-11-12 19:23:48 -08:00
ZappoMan	8a2e3d5045	add animationSettings property to model entities	2014-11-12 17:41:55 -08:00
ZappoMan	ef17659ea2	cleanup	2014-11-12 16:57:42 -08:00
ZappoMan	dd22683672	fixing up animation loop issues	2014-11-12 16:53:16 -08:00
ZappoMan	245f019836	first cut at migrating entity animation frame calculations to use AnimationLoop	2014-11-12 16:10:35 -08:00
Brad Hefta-Gaub	1d80fd7e4f	Merge pull request #3772 from PhilipRosedale/master ... Less aggressive audio muting default, entity getter returns by reference	2014-11-11 20:32:46 -08:00
ZappoMan	8ec3f8ce99	implement support for calling preload when the script changes	2014-11-11 14:21:06 -08:00
Philip Rosedale	8c35d4e3dc	remove debug line	2014-11-11 14:08:59 -08:00
ZappoMan	2bc7896dee	first cut at preload script behavior	2014-11-11 13:46:48 -08:00
Philip Rosedale	38a142eeb8	return value by reference	2014-11-10 15:23:13 -08:00
Atlante45	d0a535aee5	Switch members in EntityItemProperties to hack around corruption bug	2014-11-10 10:24:14 -08:00
Ryan Huffman	d4fa24e9b6	Fix entity item properties not marking all props changed	2014-11-07 13:56:23 -08:00
ZappoMan	53f5019ee7	rename textureNames to originalTextures	2014-11-07 10:05:36 -08:00
ZappoMan	fdc5aa1da5	include urls with texture names, make sure to wait till default textures loaded before setting new textures	2014-11-07 09:54:13 -08:00
ZappoMan	c48d79ad8b	add gettable feature which lists texture names	2014-11-07 09:05:47 -08:00
ZappoMan	542d671e54	cleanup entity scripts when changing domains or entity is deleted	2014-11-06 20:01:09 -08:00
ZappoMan	768a854b00	cleanup	2014-11-06 14:00:26 -08:00
ZappoMan	90b079d5a8	remove debug	2014-11-06 13:51:48 -08:00
ZappoMan	5333f0eb19	quiet some debug	2014-11-06 13:45:30 -08:00
ZappoMan	2b62402a57	possible fix for entities not always updating bug	2014-11-06 13:17:46 -08:00
ZappoMan	13e358549d	add periodic pruning of the octree on load and save	2014-11-05 14:56:38 -08:00
ZappoMan	e12e3b05e1	add support for enter/leave entity events for when the avatar enters or leaves the bounds of an entity	2014-11-03 15:33:01 -08:00
ZappoMan	e7722dc692	pass args to object scripts for mouse events	2014-10-31 15:20:16 -07:00
ZappoMan	a5088eece6	first cut at running scripts from entities	2014-10-31 14:03:30 -07:00
ZappoMan	277da5a24f	first cut at wiring up new entity specific UI/UX events	2014-10-31 10:23:45 -07:00
ZappoMan	6d613fba3c	removed debug	2014-10-30 11:26:48 -07:00
ZappoMan	95c5b417c9	texture support in model entities	2014-10-30 11:04:19 -07:00
ZappoMan	c650cabb5d	support for locked property, some plumbing for textures property	2014-10-30 10:05:20 -07:00
ZappoMan	ac115086cc	move float bool bugs	2014-10-30 00:26:06 -07:00
ZappoMan	1d9c4a6454	fix bug in light properties	2014-10-29 23:18:20 -07:00
ZappoMan	1dd4c4c674	move sitting points back to a contained element to fix the crash Ryan was seeing	2014-10-29 10:13:48 -07:00