7949 commits

Author	SHA1	Message	Date
Andrew Meadows	223c62c6f9	Merge pull request #4587 from jherico/warnings ... Working on removing some of the warnings in the xcode build	2015-04-03 09:31:36 -07:00
Clément Brisset	7bd6d5ca5b	Merge pull request #4588 from ZappoMan/svoImportFixes ... add logging for delete operations in the server	2015-04-03 17:51:36 +02:00
ZappoMan	45ab438339	add logging for delete operations in the server	2015-04-02 16:44:04 -07:00
Bradley Austin Davis	44c9d4a742	Working on removing some of the warnings in the xcode build	2015-04-02 16:12:44 -07:00
Seth Alves	cc7cda39f1	Merge pull request #4586 from ZappoMan/svoImportFixes ... BUG FIX - Import entities sometimes fails	2015-04-02 14:30:06 -07:00
ZappoMan	84940d8e43	fix SVO import	2015-04-02 14:13:19 -07:00
Clément Brisset	c7540af787	Merge pull request #4585 from birarda/no-gpu-link ... fix for resampled stereo audio array size	2015-04-02 21:31:53 +02:00
Stephen Birarda	3f079e10aa	user AudioConstants for size of int16_t	2015-04-02 11:35:23 -07:00
Stephen Birarda	41290dd3e3	push data pointer for recursive read from front	2015-04-02 11:34:39 -07:00
Stephen Birarda	164c06a190	fix resampled stereo audio array size	2015-04-02 10:41:52 -07:00
Andrew Meadows	a824403132	Merge pull request #4582 from sethalves/island ... Comma toggles rendering of collision hulls; more changes to vhacd stuff	2015-04-02 10:37:17 -07:00
Seth Alves	41ec2fdbe3	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-04-02 09:19:54 -07:00
Andrew Meadows	fc4e6e9355	merge upstream/master into andrew/bispinor	2015-04-02 09:04:15 -07:00
Andrew Meadows	f4f219ca36	tweak jump velocity and hover transition	2015-04-02 09:03:33 -07:00
Andrew Meadows	f804b2311d	remove hover-friendly behavior	2015-04-02 08:40:47 -07:00
Clément Brisset	01dc1b058c	Merge pull request #4580 from birarda/master ... use non-persistent settings to avoid lobby crash confusion	2015-04-02 17:37:24 +02:00
Seth Alves	57a4f3abe3	clear _saveNonCollisionGeometry when it's not needed, remove some debug prints	2015-04-02 06:57:27 -07:00
Seth Alves	abf83bcf9e	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-04-01 18:26:26 -07:00
Seth Alves	eb78fa0f85	if switching to the mode where collision hulls are drawn, updateGeometry and simulate	2015-04-01 18:24:25 -07:00
Seth Alves	997f7251c7	dont need _collisionGeometryScale	2015-04-01 18:23:43 -07:00
Seth Alves	78af7f900e	don't need _collisionGeometryScale	2015-04-01 18:23:25 -07:00
Seth Alves	bfab522ee7	debuging render mode	2015-04-01 17:52:30 -07:00
Seth Alves	8940ba0c2a	new member variables related to rendering collision hulls	2015-04-01 17:52:18 -07:00
Seth Alves	00449ef7c0	new member variable to remember the order in which meshes appeared in the model file	2015-04-01 17:50:35 -07:00
Seth Alves	36cd69c38a	new member variable to remember the order in which meshes appeared in the model file	2015-04-01 17:50:20 -07:00
Seth Alves	420424a5ee	make it possible to sort meshes into the same order they appear in the model file	2015-04-01 17:49:49 -07:00
Seth Alves	81200bb2a0	save collision hull scaling in model	2015-04-01 17:49:01 -07:00
Stephen Birarda	b27a86fb25	always render yourself, handle change of render values elsewhere	2015-04-01 17:36:43 -07:00
Andrew Meadows	b537625e59	Merge pull request #4574 from ZappoMan/crashOnExit ... fix crash on shutdown related to entity scripts connecting to signals	2015-04-01 17:26:33 -07:00
Stephen Birarda	ee088e12f3	leverage scene scripting values to toggle rendering	2015-04-01 17:06:06 -07:00
Stephen Birarda	3f4a9c64f9	add render bools to the scene scripting interface	2015-04-01 16:53:17 -07:00
Andrew Meadows	b37384d759	exit hover now not quite automatic when over floor ... remove MyAvatar::jump() method for more general API	2015-04-01 15:13:27 -07:00
ZappoMan	d87fe9efff	fix typo	2015-04-01 14:47:04 -07:00
ZappoMan	c66db5d8e4	another approach	2015-04-01 14:43:27 -07:00
ZappoMan	d7188bac0b	another approach	2015-04-01 14:38:01 -07:00
Andrew Meadows	0249b8c9c5	fix backwards comparison logic	2015-04-01 13:56:05 -07:00
Ryan Huffman	f0dd20b21e	Merge pull request #4570 from samcake/orange ... Clean up the sunLightExample.js and create the cookies.js	2015-04-01 13:55:03 -07:00
ZappoMan	aac824fb99	fix crash on shutdown	2015-04-01 13:47:25 -07:00
Brad Hefta-Gaub	1de1527414	Merge pull request #4569 from ctrlaltdavid/20431 ... CR for Job #20431 - Remove XMLHttpRequest file reading and model uploading	2015-04-01 13:00:16 -07:00
Sam Gateau	3b92910a91	Adding the cookies sciprt that provide a simple ui useful for debug and exemple, complete the interface on the scene script interface to provide the getters	2015-04-01 12:22:35 -07:00
Andrew Meadows	e27f800c75	Merge pull request #4561 from sethalves/island ... scaling hints to hash, larger collision shapes	2015-04-01 09:40:18 -07:00
Stephen Birarda	a1f1f7603d	Merge pull request #4564 from PhilipRosedale/master ... Buttons at bottom in dice, gun so not to conflict with edit.js	2015-04-01 09:06:34 -07:00
Philip Rosedale	8114fdd1e2	move button locations, names some constants in avatar controller	2015-03-31 21:51:50 -07:00
Seth Alves	380d03b3b2	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-03-31 19:00:19 -07:00
Stephen Birarda	1d5f1807f7	Merge pull request #4562 from sethalves/editors-are-rezzers ... add a bool value to Node which indicates if it is allowed to rez new ent...	2015-03-31 18:53:29 -07:00
Seth Alves	8bca8ad4ef	bump protocol versions for PacketTypeDomainList and PacketTypeDomainListRequest	2015-03-31 18:37:42 -07:00
Seth Alves	4e83301c65	add a bool value to Node which indicates if it is allowed to rez new entities	2015-03-31 18:27:46 -07:00
Philip Rosedale	6a171c2f22	Merge pull request #4559 from birarda/constant-metaverse-url ... add a networking constants class with the metaverse server URL	2015-03-31 18:13:41 -07:00
Seth Alves	859628a4fd	fix comment	2015-03-31 17:20:16 -07:00
Seth Alves	23c69ad9e1	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-03-31 17:19:59 -07:00