7436 commits

Author	SHA1	Message	Date
Seth Alves	6772847d0b	make it so I don't have to count	2015-03-07 07:52:39 -08:00
Seth Alves	8a4339e57f	stray control-Ms	2015-03-07 07:52:20 -08:00
Seth Alves	591edc0527	_mesh instance variable doesn't appear to be in use.	2015-03-07 07:51:47 -08:00
Seth Alves	6e79fc8b68	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-06 18:46:13 -08:00
samcake	174e359c50	Merge pull request #4387 from ZappoMan/fbxFixes ... tweaks to hacks for detecting mixamo files	2015-03-06 17:25:19 -08:00
ZappoMan	ffab6ffe48	tweaks to hacks for detecting mixamo files	2015-03-06 15:11:02 -08:00
Seth Alves	858d15d0ba	obj reader sort-of works	2015-03-06 13:15:53 -08:00
Ryan Huffman	2c68d56059	Update Entity::sendEntities to return new entity ids	2015-03-05 12:34:05 -08:00
Seth Alves	034ceab4d3	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-05 06:39:03 -08:00
Seth Alves	ac0c4e8512	cap max speed at MAX_WALKING_SPEED	2015-03-04 19:57:06 -08:00
Seth Alves	ef66182ce7	Merge pull request #4379 from AndrewMeadows/thermonuclear ... fix dark lighting and missing avatars on linux	2015-03-04 19:00:54 -08:00
Seth Alves	7df877ced7	Merge branch 'thermonuclear' of github.com:AndrewMeadows/hifi into avatars-can-collide	2015-03-04 16:56:59 -08:00
Andrew Meadows	c3a4e5d94b	fix dark lighting and missing avatars on linux	2015-03-04 16:52:27 -08:00
ZappoMan	e99ffb8307	fix bug in export	2015-03-04 16:29:34 -08:00
Seth Alves	a8b688d540	move _velocity into base class. walking on a cube works	2015-03-04 15:26:02 -08:00
Seth Alves	910c8da046	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-04 14:19:12 -08:00
Clément Brisset	da6db93508	Merge pull request #4375 from ctrlaltdavid/20370 ... More parentheses to address Xcode compiler warnings	2015-03-04 10:06:54 -08:00
David Rowe	4c959e8d82	More parentheses to address Xcode compiler warnings	2015-03-04 09:17:19 -08:00
Seth Alves	15609a80ec	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-04 08:48:54 -08:00
Seth Alves	b4998e9c53	falling onto an object works	2015-03-04 08:48:48 -08:00
Stephen Birarda	3005f74411	fix localhost port check to not kill user lookup	2015-03-03 23:11:02 -08:00
Seth Alves	a254f017cc	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-03 18:37:40 -08:00
Seth Alves	8eec66c066	merge upstream, avatar can now fall onto a cube	2015-03-03 18:37:16 -08:00
samcake	6b1f42df83	Merge pull request #4366 from ZappoMan/removeMetavoxels ... remove metavoxels	2015-03-03 15:50:53 -08:00
Brad Hefta-Gaub	9649ed9936	Merge pull request #4371 from huffman/light-radius ... Update Light to set direction when setting orientation	2015-03-03 15:50:04 -08:00
Seth Alves	7e4b597ca3	keep physics specific code in PhysicsEngine	2015-03-03 15:45:10 -08:00
Seth Alves	5d4ef8d5b8	initial flailing	2015-03-03 14:30:26 -08:00
Ryan Huffman	3fef8a1622	Update Light to set direction when setting orientation	2015-03-03 12:41:51 -08:00
Brad Hefta-Gaub	b118912708	Merge pull request #4361 from samcake/temp0 ... evolve the Transform stack away from the legacy GL to the brand new shader way	2015-03-03 11:43:01 -08:00
Brad Hefta-Gaub	29340b6586	Merge pull request #4369 from ctrlaltdavid/20370 ... CR for Job #20370 - Talk bubble fix - from a suggestion in https://worklist.net/20361	2015-03-03 11:17:31 -08:00
Sam Gateau	cad2184927	FIxing the compilation issue for linux	2015-03-03 11:09:11 -08:00
Brad Hefta-Gaub	b88d52a310	Merge pull request #4363 from huffman/block-restricted-users ... Add permission-checking to edit entities	2015-03-03 11:04:46 -08:00
Sam Gateau	598b791aee	FIxing the compilation issue for linux	2015-03-03 11:01:47 -08:00
Sam Gateau	4619ba1f5b	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-03-03 10:56:04 -08:00
Stephen Birarda	eb8e8e9a62	Merge pull request #4356 from sethalves/domain-server-http-port-in-shmem ... pass more localhost ports via shared memory	2015-03-03 10:05:24 -08:00
Philip Rosedale	c9f97b312e	Merge pull request #4365 from sethalves/log-only-once ... Log message type just once	2015-03-02 20:38:54 -08:00
ZappoMan	5c3c94a618	remove metavoxels	2015-03-02 17:21:43 -08:00
Ryan Huffman	b370e025c9	Move EntityScriptingInterface instance to DependencyManager	2015-03-02 15:05:31 -08:00
Ryan Huffman	98e0f235cc	Merge branch 'master' of git://github.com/highfidelity/hifi into block-restricted-users	2015-03-02 14:47:26 -08:00
Seth Alves	bb7b132b78	Add a way to indicate that a specific message of a certain form should only be printed once. Different messages that match the same form will each be printed once.	2015-03-02 14:18:26 -08:00
Brad Hefta-Gaub	6d8ccfbc2a	Merge pull request #4357 from huffman/update-light-entity-properties ... Update light entity properties	2015-03-02 13:51:48 -08:00
Ryan Huffman	38a361dcf0	Remove class scope on _entityScriptingInterface property references	2015-03-02 11:32:07 -08:00
Ryan Huffman	75a943386b	Remove nullptr comparison	2015-03-02 10:44:32 -08:00
Ryan Huffman	a443157dd7	Update ScriptEngine::entityScriptingInterface to be static pointer ... Statically allocating the EntityScriptingInterface means we can't make sure it is initialized AFTER NodeList has been initialized	2015-03-02 10:40:46 -08:00
Ryan Huffman	9a302eebed	Add Entities.canAdjustLocksChanged	2015-03-02 10:40:29 -08:00
Ryan Huffman	64cb517856	Add LimitedNodeList::canAdjustLocksChanged signal	2015-03-02 10:40:11 -08:00
Ryan Huffman	1a3eb68e2d	Update lightEntityItem old version handling to be more clear	2015-03-02 09:25:18 -08:00
Brad Hefta-Gaub	a2d8f89426	Merge pull request #4358 from huffman/handle-sigint ... Add SIGINT handling to assignment-client	2015-02-27 22:13:10 -08:00
Sam Gateau	5652852d1a	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-02-27 17:35:59 -08:00
Sam Gateau	5ab3cbb7ec	Fixed the 2 remianing issues before PR, the shadow program needed to have the binding assigned and the Head of the avatar isn't getting it's BBox evaluated	2015-02-27 17:11:16 -08:00