34839 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
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
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
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
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
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
samcake	301f0ba145	Trying to instenciate the AssetCLient in the Agent	2015-11-23 11:48:02 -08:00
samcake	5f2944c41e	Merge pull request #6445 from AlessandroSigna/groupRecording ... DO NOT MERGE Group recording - upload performance file on asset	2015-11-23 11:25:02 -08:00
Seth Alves	c3821d7202	avoid deadlock	2015-11-23 11:24:56 -08:00
Seth Alves	5612174894	call activateBody when a hold action is deserialized	2015-11-23 11:02:41 -08:00
Seth Alves	6f19093cb9	if an entity with an action has a motion-type of static, flag it so it gets updated in bullet	2015-11-23 10:03:35 -08:00
AlessandroSigna	05d311cff3	remove Windows.prompt cause of crash	2015-11-20 18:58:49 -08:00
AlessandroSigna	a1053ee5a0	pop up a prompt with url	2015-11-20 18:58:47 -08:00
AlessandroSigna	7069f7d6ab	added clip load to asset + clean code	2015-11-20 18:58:46 -08:00
AlessandroSigna	a306e8d5b1	master can upload performance file on asset	2015-11-20 18:58:45 -08:00
samcake	eecb5b91b2	Merge pull request #6460 from EdgarPironti/asset_branch ... Save clip to asset - removing last fix	2015-11-20 18:52:18 -08:00
EdgarPironti	ebbed7c525	Save clip to asset - removing last fix	2015-11-20 18:23:36 -08:00
Clément Brisset	22287cb022	Merge pull request #6459 from samcake/controllers ... Playback: Clean up a bit of the playbackAgent script	2015-11-20 18:20:12 -08:00
samcake	6e9e53bd0c	Clean up a bit of the playbackAgent script	2015-11-20 18:17:53 -08:00
samcake	de56f698aa	Merge pull request #6444 from EdgarPironti/asset_branch ... Save clip to asset	2015-11-20 16:28:55 -08:00
Brad Davis	336562b894	Merge pull request #6452 from ctrlaltdavid/20732 ... Make multiline strings from JavaScript's print() readably in log file	2015-11-20 16:25:17 -08:00
samcake	5d17fa0b34	Merge pull request #6458 from ZappoMan/acPlayback ... allow playbackAgents to auto-register	2015-11-20 16:25:02 -08:00
Philip Rosedale	ba0f30a487	Merge pull request #6457 from imgntn/damping ... Rename linearDamping to damping in scripts	2015-11-20 16:08:16 -08:00
EdgarPironti	df2153186d	Fixes	2015-11-20 16:07:31 -08:00
EdgarPironti	e70f6855aa	Fixes	2015-11-20 16:07:30 -08:00
EdgarPironti	35365f9157	Fixes	2015-11-20 16:07:30 -08:00
EdgarPironti	1db6d0e3c1	Upload QByteArray	2015-11-20 16:07:29 -08:00
EdgarPironti	1b18d3656f	Save clip to asset	2015-11-20 16:07:29 -08:00
Brad Hefta-Gaub	a7d5ca92ca	Merge pull request #6456 from EdgarPironti/record_branch ... Playback Agents/Master fixes	2015-11-20 16:03:09 -08:00
Brad Hefta-Gaub	985fcf7c4b	remove unneeded example	2015-11-20 16:02:01 -08:00
Brad Hefta-Gaub	f56d2fba7f	allow playbackAgents to auto-register	2015-11-20 16:00:43 -08:00
EdgarPironti	46bb45cee9	Agents/Master upgrading	2015-11-20 15:51:16 -08:00
Philip Rosedale	fbbb7104a0	Merge pull request #6454 from howard-stearns/remove-obsolete-bot_procedural.js ... Remove obsolete script bot_procedural.js	2015-11-20 15:50:00 -08:00
James B. Pollack	aba65bd9b8	rename linearDamping to damping	2015-11-20 15:45:08 -08:00
Leonardo Murillo	5d2700309d	Merge branch 'master' of github.com:highfidelity/hifi into stack-manager	2015-11-20 17:43:25 -06:00
Brad Davis	f45eff3df9	Merge pull request #6455 from samcake/controllers ... Recording playback the skeleton animation correctly for agents	2015-11-20 15:35:53 -08:00
samcake	0dc551409d	Fixing a comment	2015-11-20 15:22:01 -08:00
samcake	e97e864de7	Getting the animation playback to work	2015-11-20 15:05:17 -08:00
Howard Stearns	a43b0e0ed8	Remove obsolete script (superseed by animatedAvatarAgent.js), per https://app.asana.com/0/26225263936266/55964805077915/f ... (This PR does _not_ remove proceduralAnimationAPI.js that it includes, as the api is included in other scripts. Nor does this PR remove other scripts.)	2015-11-20 15:03:31 -08:00