34450 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	cffe4551dd	merge from upstream	2015-11-11 16:15:07 -08:00
Seth Alves	07f3d8eca0	more debugging prints	2015-11-11 16:03:08 -08:00
Brad Hefta-Gaub	2363ca044e	Merge pull request #6280 from imgntn/colorbuster ... Color Busters Game	2015-11-11 15:52:18 -08:00
samcake	e7a6c58a9a	Merge pull request #6347 from EdgarPironti/record_branch ... Set clip for ControlledAC	2015-11-11 15:33:25 -08:00
EdgarPironti	da2b49a1b0	Remove hardcoded url	2015-11-11 15:07:33 -08:00
EdgarPironti	55d386aaab	Fixes: Prompt and userData	2015-11-11 15:07:33 -08:00
EdgarPironti	0f057d7229	Set clip for ControlledAC	2015-11-11 15:07:32 -08:00
Clément Brisset	0402933c51	Merge pull request #6366 from ZappoMan/moreEraseHistory ... Left overs bug fix	2015-11-11 14:33:12 -08:00
Brad Hefta-Gaub	2f903a9513	CR feedback and some cleanup	2015-11-11 14:21:14 -08:00
samcake	e15d2e022c	Merge pull request #6369 from AlessandroSigna/controllers ... handControlledHead.js added	2015-11-11 14:20:05 -08:00
Brad Hefta-Gaub	bdfe304f7a	remove some logging	2015-11-11 14:08:15 -08:00
Brad Hefta-Gaub	040bae6014	more debugging	2015-11-11 12:31:50 -08:00
Brad Hefta-Gaub	5576cf188e	Merge branch 'master' of https://github.com/highfidelity/hifi into moreEraseHistory	2015-11-11 12:14:03 -08:00
Brad Hefta-Gaub	866116d285	more debugging	2015-11-11 12:13:47 -08:00
AlessandroSigna	e4b1b54e00	added header	2015-11-11 12:07:54 -08:00
AlessandroSigna	f40e46957b	handControlledHead.js added	2015-11-11 12:06:51 -08:00
Seth Alves	f07d5d9d3f	show network and physics status on boxes and spheres	2015-11-11 11:32:12 -08:00
Chris Collins	726d111827	Merge pull request #6371 from hyperlogic/tony/remove-cache-extract ... Remove cache-extract	2015-11-11 11:25:03 -08:00
Anthony J. Thibault	a763858080	Revert cache-extract ... This reverts these commits: * 82b26b7 Code convention fixes * 9a484ff Fixes for windows * 086b064 Dumps all urls extracted to stdout. * c002888 Added cache extractor to the tools directory	2015-11-11 11:22:05 -08:00
Anthony Thibault	820517f340	Merge pull request #6339 from hyperlogic/tony/cache-extract ... Added cache-extract to Tools	2015-11-11 09:52:53 -08:00
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
Brad Hefta-Gaub	3316b63bf6	add a fixme comment	2015-11-10 15:46:53 -08:00
Brad Hefta-Gaub	006a1d60c8	keep some additional erase entities history and send to viewers	2015-11-10 15:31:51 -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