34418 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	31ebe5dba1	terse logging for sim ownership	2015-11-11 08:51:10 -08:00
Seth Alves	c2b0ccd6b3	show simulation ownership with status icons	2015-11-11 08:30:04 -08:00
Seth Alves	b38c1cb30f	add icons	2015-11-11 08:01:21 -08:00
Seth Alves	4cf84a4e5b	use makeEntityItemStatusGetters from more entity types	2015-11-10 17:14:09 -08:00
Seth Alves	7b4dd9a908	Merge branch 'rework-visual-physics-debug' of github.com:sethalves/hifi into rework-visual-physics-debug	2015-11-10 17:06:16 -08:00
Seth Alves	39b92d2b52	terse log when ownership changes	2015-11-10 17:06:12 -08:00
Seth Alves	66387c4530	use icons to show network and physics status	2015-11-10 17:02:57 -08:00
Seth Alves	774e2ab6d6	adjust how EntityMotionState updates its idea of what the server knows about an entity	2015-11-10 15:13:07 -08:00
Seth Alves	97fec5b814	adjust how EntityMotionState updates its idea of what the server knows about an entity	2015-11-10 15:09:53 -08:00
Seth Alves	df5d161721	adjust how EntityMotionState updates its idea of what the server knows about an entity	2015-11-10 15:02:17 -08:00
Seth Alves	4df65e4c11	Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug	2015-11-10 15:02:07 -08:00
Seth Alves	e067195dfe	adjust how EntityMotionState updates its idea of what the server knows about an entity	2015-11-10 14:42:40 -08:00
Seth Alves	82bd506086	adjust how EntityMotionState updates its idea of what the server knows about an entity	2015-11-10 14:32:57 -08:00
Eric Levin	a2abc11df1	Merge pull request #6351 from huffman/script-path-resolution ... Update script engine path resolution behavior to behave consistently	2015-11-10 14:10:42 -08:00
Seth Alves	5e4f30b2bb	improve terse entity logging. change how action data sending is triggered	2015-11-10 13:58:09 -08:00
James B. Pollack	4ded489d23	Merge pull request #6362 from ericrius1/helicopter ... Added scripts for helicopter	2015-11-10 13:53:30 -08:00
ericrius1	bf0677a0ce	Moved helicopter scripts into drylake folder	2015-11-10 13:42:15 -08:00
James B. Pollack	ff87a6ce6f	Merge pull request #6355 from sethalves/dont-neargrab-nonphysical ... don't attempt to near-grab things that aren't physical	2015-11-10 13:11:50 -08:00
Brad Hefta-Gaub	aea911ebc2	Merge pull request #6360 from samcake/controllers ... Recording and playback of the Avatar animation update but not quite over	2015-11-10 12:24:29 -08:00
samcake	d3d5d3a19e	Removing useless code	2015-11-10 12:02:20 -08:00
Ryan Huffman	08c2759947	Remove unused include in createTargets.js	2015-11-10 11:39:50 -08:00
Ryan Huffman	031a93cb0e	Fix utils include in createPingPongGun.js	2015-11-10 11:39:31 -08:00
Ryan Huffman	5f084730d9	Remove old includes in doll.js	2015-11-10 11:39:12 -08:00
Ryan Huffman	a264ed4795	Remove old includes in bubblewand	2015-11-10 11:38:57 -08:00
Ryan Huffman	a6bc1a2b5b	Fix closePaint.js Script.include	2015-11-10 11:38:36 -08:00
Ryan Huffman	90a1fbe04e	Fix magBalls.js resolvePath calls	2015-11-10 11:38:16 -08:00
Ryan Huffman	2a349620ee	Fix walkSettings.js resolvePath calls	2015-11-10 11:37:59 -08:00
Ryan Huffman	e7e6c63c64	Fix edit.js resolvePath calls	2015-11-10 11:36:53 -08:00
Seth Alves	d043011a11	Merge branch 'render-debug-fixup' of github.com:sethalves/hifi into rework-visual-physics-debug	2015-11-10 10:16:02 -08:00
Seth Alves	8e466190e0	working toward display icons for debug/status display	2015-11-10 10:15:58 -08:00
Seth Alves	b9ca509f07	Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup	2015-11-10 09:50:12 -08:00
Seth Alves	d535109caf	attempt to fix render-collision hull feature	2015-11-10 09:49:31 -08:00
Ryan Huffman	6577c7a13c	Fix magBalls include paths	2015-11-10 09:38:52 -08:00
Ryan Huffman	2ad4c5b9e2	Fix walkApi include paths	2015-11-10 09:38:40 -08:00
Ryan Huffman	29fd352169	Fix omniTool test module include path	2015-11-10 09:38:21 -08:00
Ryan Huffman	37d9d98594	Fix breakdance include paths	2015-11-10 09:37:53 -08:00
Ryan Huffman	b802da4fef	Fix include in satellite.js	2015-11-10 09:37:36 -08:00
ericrius1	f5308530e6	Removed commented out line	2015-11-10 09:35:35 -08:00
ericrius1	df5353dc16	Merge branch 'refs/heads/master' into helicopter	2015-11-10 09:33:04 -08:00
samcake	2cf2257783	Fix warning	2015-11-10 09:20:43 -08:00
samcake	d1df6854ac	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-10 09:16:28 -08:00
Andrew Meadows	649f2d1d1d	Merge pull request #6361 from ZappoMan/fixWarnings ... fix various warnings	2015-11-10 09:10:55 -08:00
Ryan Huffman	53ca4c857d	Fix relative include path in entityCameraTool.js	2015-11-10 08:52:37 -08:00
Brad Hefta-Gaub	4a0a481ac6	more fixes	2015-11-10 08:44:51 -08:00
Brad Hefta-Gaub	0ea901fd72	fix various warnings	2015-11-10 08:34:58 -08:00
Brad Hefta-Gaub	fce6fdcc5e	Merge pull request #6356 from Atlante45/master ... Fix warnings on OS X	2015-11-10 08:15:19 -08:00
Sam Gateau	06a87012ad	Removing the setJointTranslations which is not helping...	2015-11-09 23:38:51 -08:00
Sam Gateau	b47c5dbff2	Cleaning the code to remove the old rec format and the use of separate joint Rotationns/Translations arrays	2015-11-09 23:12:04 -08:00
samcake	77e21b7190	Trying to fix the animation recording and playback, but still not good	2015-11-09 18:18:30 -08:00
Brad Davis	1d693ffd66	Merge pull request #6359 from ZappoMan/fixRenderItemLeak ... fix render item leak on Model::reset()	2015-11-09 17:34:18 -08:00