35278 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
James B. Pollack	52edc3b701	cleanup beamdisabler	2015-11-24 10:43:33 -08:00
James B. Pollack	13e1042bfa	use messages instead of hidden entities to disable beams	2015-11-24 10:37:08 -08:00
James B. Pollack	fd26427390	add pullback / pushfwd	2015-11-24 10:23:29 -08:00
Andrew Meadows	e26081e981	always update physics properties when they change ... and move activation check logic to MotionState	2015-11-24 10:20:19 -08:00
Andrew Meadows	5135c9dded	whitespace cleanup	2015-11-24 10:20:19 -08:00
Brad Hefta-Gaub	d32e500464	Merge pull request #6462 from jherico/rec5 ... Blendshapes and attachments in recordings, plus other minor fixes.	2015-11-24 10:01:17 -08:00
Stephen Birarda	5a7b0dd1ad	put the parsed model URL in ModelEntityItem	2015-11-24 11:46:51 -06:00
Stephen Birarda	0d6b919448	cleanup printing of updated model URL	2015-11-24 11:22:30 -06:00
Stephen Birarda	0e19e50047	cleaner handling for QString/QUrl conversion/comparison	2015-11-24 11:17:46 -06:00
Stephen Birarda	762709748d	Merge pull request #6473 from ZappoMan/waitForScriptThreads ... change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete	2015-11-24 10:39:22 -06:00
Clément Brisset	28435b6d43	Merge pull request #6478 from samcake/controllers ... Let the AssertClient JS interface use global vars	2015-11-23 22:43:07 -08:00
Brad Davis	5c2b980a45	Fixing avatar facial blendshapes and attachments in recordings	2015-11-23 22:36:07 -08:00
Brad Davis	bc84265e99	Additional checking when serializing transforms to json	2015-11-23 22:35:12 -08:00
Brad Davis	3738f21936	Fix occasional deadlock in loading recordings	2015-11-23 22:34:17 -08:00
samcake	a1668cdc73	Let the AssertClient JS interface use global vars	2015-11-23 22:28:59 -08:00
Brad Hefta-Gaub	1d8e2edafb	Merge pull request #6464 from ericrius1/whiteboardFix ... updated whiteboard to use new controller approach	2015-11-23 19:44:28 -08:00
Brad Hefta-Gaub	eaa6d6ae28	Merge pull request #6477 from murillodigital/server-manager ... Using http for quazip external	2015-11-23 19:38:16 -08:00
Brad Hefta-Gaub	5f88d958ab	CR feedback	2015-11-23 18:26:15 -08:00
James B. Pollack	5ffc1f150d	Merge pull request #6467 from ctrlaltdavid/20742 ... Fix avatar rotation with keyboard depending on frame rate	2015-11-23 18:19:46 -08:00
Leonardo Murillo	388157d432	Typo	2015-11-23 20:16:18 -06:00
Leonardo Murillo	55649717c5	Using http for quazip external	2015-11-23 20:10:32 -06:00
samcake	8bf5e3b429	Merge pull request #6469 from AlessandroSigna/groupRecording ... Group recording - overlay added	2015-11-23 18:06:20 -08:00
AlessandroSigna	70cf5c6726	fixed icon position	2015-11-23 17:59:31 -08:00
AlessandroSigna	489cde7269	removed the local save of the recording	2015-11-23 17:51:58 -08:00
Eric Levin	40be9ae121	Commented out whiteboard cleanup	2015-11-23 17:15:26 -08:00
AlessandroSigna	44c95c13fb	further UI fixes	2015-11-23 16:57:24 -08:00
Brad Hefta-Gaub	82ff0af05c	Merge pull request #6472 from murillodigital/stack-manager ... Stack manager - integration checkpoint	2015-11-23 16:53:53 -08:00
Leonardo Murillo	f759fa2cfa	Ubuntu fixes	2015-11-23 18:30:40 -06:00
Brad Hefta-Gaub	ce46c30647	change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete	2015-11-23 16:27:06 -08:00
Leonardo Murillo	d58b11f0a2	Ubuntu fix - case sensitivity¨	2015-11-23 18:13:41 -06:00
Leonardo Murillo	66803ce356	Ubuntu fix - case sensitivity¨	2015-11-23 18:04:36 -06:00
Leonardo Murillo	fee50a56e5	Ubuntu fix - case sensitivity	2015-11-23 18:02:20 -06:00
Stephen Birarda	6339c2c48f	fix for unnecessary model URL updating	2015-11-23 17:25:31 -06:00
Philip Rosedale	5c390473e7	Merge pull request #6470 from birarda/ghost-avatar ... use MIN_AVATAR_SCALE to ensure avatar fades complete	2015-11-23 15:04:59 -08:00
Stephen Birarda	905e11faa3	use MIN_AVATAR_SCALE to ensure avatar fades complete	2015-11-23 16:54:17 -06:00
AlessandroSigna	8f1ce6e1fb	overlay added - waiting for official logos ... missing null assignment	2015-11-23 14:52:16 -08:00
Leonardo Murillo	b83e466767	Removing comments	2015-11-23 16:31:29 -06:00
Clément Brisset	a261b240aa	Merge pull request #6466 from samcake/controllers ... Adding the AssetClient to the Agent	2015-11-23 13:35:50 -08:00
Andrew Meadows	865729ef26	Merge pull request #6463 from sethalves/fix-observers-dont-see-equip-motion ... fix bug where observers don't see a held/equipped object moving	2015-11-23 13:17:29 -08:00
Leonardo Murillo	8b573cebfb	Successfull windows build given any build type checkpoint	2015-11-23 15:16:48 -06:00
James B. Pollack	0fd389b02f	remove arrowTest	2015-11-23 12:53:58 -08:00
David Rowe	d73e3a5490	Fix avatar pitch rate depending on FPS	2015-11-24 09:48:37 +13:00
David Rowe	f5d66bbf2e	Fix avatar rotation rate depending on FPS	2015-11-24 09:42:12 +13:00
James B. Pollack	c22a07bba7	bow collisions, etc	2015-11-23 12:36:39 -08:00
samcake	25654824a2	Copy pasting the code that Stephen did and also adding the AssetServer to the list of dependent nodes for the agent	2015-11-23 12:32:27 -08:00
ericrius1	1409ed2d18	moved logic to build vertices buffer to renderable class, recalculating vertices anytime any of the normals, point, or strokeWidths data changes	2015-11-23 12:28:44 -08:00
Leonardo Murillo	ec6be93938	Merge branch 'master' of https://github.com/highfidelity/hifi into stack-manager	2015-11-23 14:22:05 -06:00
Leonardo Murillo	8e12e32dd2	Checkpoint - Windows specifics	2015-11-23 14:21:06 -06:00
Seth Alves	d4937071e1	rather than activating rigid body and forcing non-static on deserialize, just force non-static	2015-11-23 12:17:15 -08:00
Eric Levin	7e8b692499	Update whiteboardEntityScript.js ... Removed logging	2015-11-23 12:04:13 -08:00