34858 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
samcake	bad01d02f8	building the master/agent api	2015-11-24 18:31:28 -08:00
samcake	bba5bf7a21	Trying to get the Agent to Mater more reliable	2015-11-24 11:28:00 -08: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
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
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
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
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
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
Eric Levin	7e8b692499	Update whiteboardEntityScript.js ... Removed logging	2015-11-23 12:04:13 -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
ericrius1	08a64f6a6b	updated whiteboard to use new controller approach'	2015-11-23 10:08:23 -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