70 commits

Author	SHA1	Message	Date
ZappoMan	618f538be5	mostly working, but some blinking when setting glow	2014-06-19 10:40:38 -07:00
ZappoMan	b499806ff7	first cut at new optimized store model, not quite working yet	2014-06-17 09:15:53 -07:00
ZappoMan	d7a1686022	some convenience features added to ModelItem and ModelItemID	2014-06-17 08:33:48 -07:00
ZappoMan	c53d99838d	cleanup names of findModels/findParticles in cube	2014-06-13 10:37:31 -07:00
ZappoMan	d53d241858	oops	2014-06-12 13:08:32 -07:00
ZappoMan	c87eeba9e2	update some comments	2014-06-12 13:07:30 -07:00
ZappoMan	2e5e6e3f61	get model props spanning multiple packets	2014-06-12 13:03:37 -07:00
ZappoMan	12d30e9d62	handle some models don't fit better	2014-06-11 13:25:16 -07:00
ZappoMan	6389fea320	first cut at really using partial appendElementData to make models span packets. still needs work	2014-06-10 16:51:49 -07:00
ZappoMan	66b0333dc9	more work on element append tweaks	2014-06-10 14:49:52 -07:00
ZappoMan	bc9d9d61ba	fix some bugs in models	2014-06-10 13:43:43 -07:00
ZappoMan	a0783f3f4a	try appendElementData() a different way	2014-06-10 10:43:50 -07:00
ZappoMan	c5647addf4	Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements	2014-06-09 14:10:47 -07:00
ZappoMan	6f1ec01797	rename nodeBag to elementBag in a bunch of places	2014-06-09 13:42:44 -07:00
ZappoMan	4e8e5bf53d	first cut at new ModelItem reading, repacking of ModelItem format in case PropertyFlags shrink	2014-06-09 10:39:48 -07:00
ZappoMan	12a563193f	first cut at new version of ModelItem::appendModelData	2014-06-09 08:04:41 -07:00
Atlante45	dece3ea095	Merge branch 'master' of https://github.com/highfidelity/hifi into temp_branch	2014-06-06 10:26:49 -07:00
Atlante45	4209c1102f	Revert "Models.addModel now returns a more accurate modelID" ... This reverts commit 150477eea4.	2014-06-06 10:26:08 -07:00
Atlante45	150477eea4	Models.addModel now returns a more accurate modelID	2014-06-05 15:47:25 -07:00
Atlante45	0bdd20abc9	Coding Standard	2014-06-05 15:46:07 -07:00
ZappoMan	152d99d810	removed some old debug code and updated a comment	2014-06-04 15:23:17 -07:00
ZappoMan	8d4a8f7e67	first cut at partial model elements	2014-06-04 10:22:49 -07:00
ZappoMan	b212f9edca	fix ray picking at distances	2014-05-30 15:07:54 -07:00
ZappoMan	8a4955d75b	temporarily disable the model aligned box picking	2014-05-30 11:13:37 -07:00
wangyix	c87c474877	removed debug info, cleaned code for pull req	2014-05-29 10:39:40 -07:00
wangyix	a0f9d2c106	Merge remote-tracking branch 'upstream/master'	2014-05-29 09:20:30 -07:00
wangyix	5d4b0df108	added flag,seq,st to EnvironmentData, untested ... removed/commented out debug prints	2014-05-28 17:41:38 -07:00
wangyix	c799077379	added flag,seq,ts to ParticleErase and ModelErase ... ... this fixes unreasonable flight-time issue	2014-05-28 17:20:10 -07:00
ZappoMan	574bca38e6	clean up comments and variable names	2014-05-28 12:10:51 -07:00
ZappoMan	bebfd7a301	non-aabox picking working	2014-05-28 12:02:22 -07:00
ZappoMan	6fd22856f2	hacking on non-AABox models	2014-05-28 10:24:02 -07:00
ZappoMan	c63c0c0ce3	Merge branch 'master' of https://github.com/worklist/hifi into aacube	2014-05-27 13:39:45 -07:00
ZappoMan	8ec14568fe	support ray picking against the AABB for the rotated model extents	2014-05-27 13:39:32 -07:00
Clément Brisset	6bb933996f	Merge pull request #2920 from ZappoMan/aacube ... Add RayPick support for models	2014-05-24 17:03:59 -07:00
ZappoMan	efd0580cfb	add ray picking to the model scripting interface	2014-05-23 17:09:37 -07:00
Atlante45	df68082705	Added local glow to models	2014-05-23 11:02:07 -07:00
ZappoMan	39ed7f7b65	renaming of AABox to AACube, introduction of actual AABox	2014-05-23 10:45:04 -07:00
ZappoMan	f876a72b37	fix crash in model server when you attempt to create an unreasonably small model	2014-05-21 15:12:36 -07:00
ZappoMan	412e870f98	add support for backward compatibility in old versions of models.svo	2014-05-20 15:32:50 -07:00
ZappoMan	e7425a8128	support for models in root element	2014-05-20 15:20:27 -07:00
Stephen Birarda	a9c2e3fe71	put back ssize_t definition	2014-05-20 11:56:06 -07:00
Stephen Birarda	0e7615391c	don't look for GnuTLS from cmake	2014-05-20 10:35:04 -07:00
ZappoMan	bb204154a1	tweak	2014-05-16 16:59:58 -07:00
ZappoMan	0e446d0fc5	fix two bugs in models not rendering	2014-05-16 16:53:14 -07:00
ZappoMan	f5b4e1da37	fix potential floating point error when animations have no frames	2014-05-16 10:00:35 -07:00
ZappoMan	0db242bbaa	cleanup debug	2014-05-15 00:46:09 -07:00
ZappoMan	ca2d2c751c	fixing models not rendering sometimes	2014-05-15 00:34:09 -07:00
ZappoMan	f6c1d3e635	clean up animations	2014-05-14 14:00:31 -07:00
ZappoMan	0c34d9e065	cleanup remove some debug	2014-05-14 12:59:59 -07:00
ZappoMan	18de6dddec	Merge branch 'master' of https://github.com/worklist/hifi into modelserver	2014-05-14 12:21:44 -07:00