15065 commits

Author	SHA1	Message	Date
howard-stearns	069199554c	checkpoint	2015-12-15 16:07:37 -08:00
Brad Hefta-Gaub	be058398a2	remove blue sphere while speaking	2015-12-13 12:02:39 -08:00
Brad Hefta-Gaub	2815cb0fef	first cut at adding advanced and developer menu groupings	2015-12-12 18:12:36 -08:00
Atlante45	b8495a6912	Merge branch 'master' of https://github.com/highfidelity/hifi into warnings-win	2015-12-11 18:05:47 -08:00
Clément Brisset	c160a98c5c	Merge pull request #6636 from samcake/controllers ... Fix the broken skybox and simplify a bit the vertex shader used	2015-12-11 17:06:33 -08:00
Atlante45	c782b01fde	More warning fixes	2015-12-11 16:31:27 -08:00
Atlante45	8bd301e45e	More warning fixes	2015-12-11 16:31:27 -08:00
Atlante45	79fdb2e882	Fix warnings on windows 64bit	2015-12-11 16:31:27 -08:00
Atlante45	0f49653da3	More OS X warning cleanup	2015-12-11 16:31:27 -08:00
samcake	68134aafe5	Fix the broken skybox and simplify a bit the vertex shader used	2015-12-11 16:14:55 -08:00
Brad Davis	1bcf42a799	Merge pull request #6629 from ZappoMan/resetSkyBoxOnDomainChange ... reset skybox on changing domains	2015-12-11 15:48:20 -08:00
Brad Hefta-Gaub	d918eca030	reset skybox on changing domains	2015-12-11 11:36:02 -08:00
Brad Hefta-Gaub	a1a3c4470c	reload own avatar on Content Reload	2015-12-11 11:02:16 -08:00
Brad Hefta-Gaub	a7a924153a	Merge pull request #6617 from huffman/entity-query-keyhole ... Add keyhole radius to OctreeQuery	2015-12-11 09:35:46 -08:00
Brad Hefta-Gaub	a472d293bb	Merge pull request #6599 from jherico/aeryn-sdl2 ... Moving SDL2 to external plugin	2015-12-10 18:02:15 -08:00
Howard Stearns	585911fe98	Merge pull request #6612 from sethalves/no-physics-until-ready ... No physics until ready	2015-12-10 16:09:49 -08:00
Brad Davis	98263f0c0d	Moving sdl2 to external plugin	2015-12-10 14:56:41 -08:00
Ryan Huffman	b6ecd539df	Merge branch 'master' of https://github.com/highfidelity/hifi into entity-query-keyhole	2015-12-10 14:36:03 -08:00
Ryan Huffman	b5e3dce376	Add keyhole radius to OctreeQuery	2015-12-10 14:34:28 -08:00
Brad Hefta-Gaub	e133bd867a	Merge pull request #6600 from jherico/aeryn-sixense ... Moving Sixense to external plugin	2015-12-10 13:33:17 -08:00
Bradley Austin Davis	c5f5e8de60	Trying to fix build problem	2015-12-10 12:00:40 -08:00
Seth Alves	8ca6c7acc3	Merge pull request #6611 from Atlante45/attachments ... Fix Attachments jitter	2015-12-10 11:46:19 -08:00
Seth Alves	dbde0b641e	Merge branch 'attachments' of github.com:Atlante45/hifi into no-physics-until-ready	2015-12-10 11:38:08 -08:00
Seth Alves	d10221f53a	merge from upstream	2015-12-10 11:21:36 -08:00
Atlante45	739e184b52	Fix attachments jitter	2015-12-10 11:19:11 -08:00
Brad Hefta-Gaub	589adde41e	Merge pull request #6541 from howard-stearns/correct-target-frame-rate ... Don't limit avatar rendering when not vsync'd	2015-12-10 11:17:23 -08:00
James B. Pollack	d21e4ff5e1	Merge pull request #6592 from huffman/script-engine-fixes ... Fix concurrency issues for bools in ScriptEngine	2015-12-10 10:48:54 -08:00
Brad Davis	645695d5d5	Moving sixense to external plugin	2015-12-10 10:44:23 -08:00
Seth Alves	a59af2c1b2	Merge branch 'master' of github.com:highfidelity/hifi into no-physics-until-ready	2015-12-10 09:03:57 -08:00
Seth Alves	d09f70239c	make entity-tree a global. change how network-requests to load model geometry are triggered	2015-12-10 09:03:53 -08:00
Howard Stearns	83078b9d8c	Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate	2015-12-10 08:44:08 -08:00
Brad Hefta-Gaub	3d325351fb	Merge pull request #6602 from AndrewMeadows/character-cleanup ... move raw bullet code from interface to physics lib	2015-12-10 07:26:29 -08:00
Ryan Huffman	ad0865171b	Fix unused variable in scriptFinished	2015-12-09 15:52:30 -08:00
Howard Stearns	dd2d040253	Merge branch 'fix-sync-period-calc' into correct-target-frame-rate	2015-12-09 15:43:43 -08:00
Howard Stearns	d964032572	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc	2015-12-09 15:23:00 -08:00
Howard Stearns	270cfe8af7	coding standards	2015-12-09 15:22:44 -08:00
Ryan Huffman	fc6a78d9ef	Update scriptFinished signal to be a DirectConnection	2015-12-09 14:49:05 -08:00
Ryan Huffman	4bfce768ca	Add locks around read/writes of _scriptEnginesHash	2015-12-09 14:48:33 -08:00
Seth Alves	446ca8236f	disable physics disabler	2015-12-09 11:25:44 -08:00
Andrew Meadows	d59311f258	Merge pull request #6594 from sethalves/no-physics-until-ready ... No physics until ready	2015-12-09 10:51:07 -08:00
howard-stearns	1d65cbce88	Remove unneeded getTargetFramePeriod and isVSynchronized.	2015-12-08 18:08:57 -08:00
howard-stearns	9ae22800fe	Merge branch 'fix-sync-period-calc' into correct-target-frame-rate	2015-12-08 17:32:53 -08:00
Andrew Meadows	8c109fd623	move raw bullet code from interface to physics lib	2015-12-08 17:21:43 -08:00
howard-stearns	32e4967ee0	cleanup	2015-12-08 16:38:05 -08:00
howard-stearns	7afc803fb5	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc	2015-12-08 15:30:48 -08:00
howard-stearns	5b41d4da1c	Snapshot of "working" version.	2015-12-08 15:30:23 -08:00
Leonardo Murillo	9ba5670c76	Fix	2015-12-08 14:20:19 -08:00
Leonardo Murillo	dda99bfea6	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-12-08 14:07:50 -08:00
Seth Alves	c462bda86c	disable physics when moving to a new domain	2015-12-08 14:01:18 -08:00
Seth Alves	164439b303	don't enable physics until an entire scene has been received from the entity server and until nearby (to MyAvatar) entities are ready	2015-12-08 13:53:39 -08:00