28227 commits

Author	SHA1	Message	Date
Anthony Thibault	044d142635	Merge pull request #13133 from amantley/nativeCGCode ... Center of Gravity Leaning	2018-06-08 17:53:55 -07:00
Anthony J. Thibault	c3da4e74de	Code review feedback	2018-06-08 16:22:00 -07:00
Stephen Birarda	112abc9d7e	Merge pull request #13148 from birarda/feat/new-version-numbers ... add SHA to PR/master version, add build_type (stable/master/pr/dev)	2018-06-08 14:44:22 -07:00
Sam Gondelman	c7f05d96b4	Merge pull request #13309 from Cristo86/android_crashes_domains ... Android - Double Click crash and dev-mobile crash with Pixel XL	2018-06-08 13:36:53 -07:00
Sam Gondelman	4e649d2498	Merge pull request #13276 from SamGondelman/resource ... Protect against null resource	2018-06-08 11:35:04 -07:00
Sam Gateau	7f8af47075	Merge pull request #13326 from SamGondelman/green ... Fix models starting as green boxes	2018-06-08 10:09:53 -07:00
David Back	e8aece4c11	Merge pull request #13315 from dback2/avatarFeet ... Fix default avatar feet	2018-06-08 10:00:43 -07:00
David Back	9a7e199528	Merge pull request #13270 from dback2/cloneables ... Use version from JSON on domain restore	2018-06-07 15:15:43 -07:00
SamGondelman	c18602d22e	fix models starting as green boxes	2018-06-07 13:03:56 -07:00
John Conklin II	66b66d5248	Merge pull request #13311 from ElderOrb/FB14390 ... terminate thread if it didn't complete during MAX_SCRIPT_QUITTING_TIME	2018-06-07 11:22:57 -07:00
John Conklin II	be9938013f	Merge pull request #13271 from Cristo86/android_joystick_jumps_fix ... Fix joystick and view control bug that makes it bounce	2018-06-07 11:18:26 -07:00
John Conklin II	277758cd03	Merge pull request #13275 from luiscuenca/fixNoAvatarMaterials ... Check for null material pointer in CauterizedModel	2018-06-07 09:41:03 -07:00
Sam Gateau	146732a20f	Merge pull request #13317 from jherico/feature/mac_resources ... Use binary resources on OSX	2018-06-07 09:38:00 -07:00
John Conklin II	2b6fdb6b69	Merge pull request #13217 from Atlante45/fix/ds-memory ... Fix uploaded content archives taking too much memory	2018-06-07 09:37:41 -07:00
Bradley Austin Davis	fa51c15849	Use binary resources on OSX	2018-06-06 15:10:52 -07:00
Seth Alves	b70ffa5bae	Merge pull request #13297 from ctrlaltdavid/21835 ... Remove some deprecated functions from the Controller API	2018-06-06 14:06:34 -07:00
Sam Gondelman	b4afabee68	Merge pull request #13294 from SamGondelman/overlays ... Add isGroupCulled property to ModelOverlays	2018-06-06 13:52:33 -07:00
David Back	afd4b5a8ab	update default avatar to fix non-flat feet	2018-06-06 11:48:04 -07:00
Sam Gateau	a1899e80c0	Merge pull request #13290 from AndrewMeadows/update-queryAACube ... update server-side bounding box more correctly for grabbed things	2018-06-06 11:46:09 -07:00
Sam Gateau	c145c0c1b8	Merge pull request #13186 from SamGondelman/etc2comp ... Android: Local texture compression using Etc2Comp	2018-06-06 11:13:50 -07:00
Alexander Ivash	5897c9948d	terminate thread if it didn't complete during MAX_SCRIPT_QUITTING_TIME	2018-06-06 03:52:22 +03:00
Cristian Luis Duarte	b38eae3731	Only add RenderShadowTask if isDeferred	2018-06-05 18:54:48 -03:00
Anthony J. Thibault	94c39bc4af	Better fix for looking down at your own body.	2018-06-05 14:43:33 -07:00
David Rowe	a7a0cfeef2	Remove some deprecated functions from the Controller API	2018-06-05 10:56:19 +12:00
David Rowe	b5028a9626	Merge branch 'master' into 21880 ... # Conflicts: # interface./src/scripting/WindowScriptingInterface.h	2018-06-05 09:13:54 +12:00
SamGondelman	bde3382657	merge with master	2018-06-04 12:55:17 -07:00
SamGondelman	8af1beca8d	add isGroupCulled for model overlays	2018-06-04 12:07:57 -07:00
John Conklin II	08fcad1932	Merge pull request #13227 from SamGondelman/entityMirror ... Add local-only isVisibleInSecondaryCamera flag to entities	2018-06-04 11:06:00 -07:00
Anthony J. Thibault	c3d1daf855	Merge branch 'master' into nativeCGCode	2018-06-04 09:32:38 -07:00
Andrew Meadows	db3520b332	also update queryAACube for 'Held' things	2018-06-01 16:38:57 -07:00
Seth Alves	97b3fdfe68	make legacy collisionless property work right	2018-06-01 09:34:34 -07:00
SamGondelman	86ee5c12d8	merge and update based on sam's changes	2018-05-31 17:53:36 -07:00
John Conklin II	611159f65f	Merge pull request #13188 from SimonWalton-HiFi/placename-crash ... Initialize Qt's use of openssl lib before calling RSA code	2018-05-31 14:34:24 -07:00
John Conklin II	ec3f9549f1	Merge pull request #13172 from wayne-chen/getChildrenIDs-issue-1934 ... Fix EntityScriptingInterface::getChildrenIDs function	2018-05-31 14:27:25 -07:00
Sam Gateau	46d055a488	Merge pull request #12649 from samcake/punk ... Fix addressing the avatar mesh visibility switch bug	2018-05-31 14:16:04 -07:00
samcake	386c0f9ab2	Re review adjustments	2018-05-31 12:16:57 -07:00
SamGondelman	1470170296	lock weak resource	2018-05-31 11:54:37 -07:00
luiscuenca	60758dec8d	Check for null pointer	2018-05-31 11:32:45 -07:00
John Conklin II	4175825093	Merge pull request #13215 from AndrewMeadows/activate-on-action-removal ... activate RigidBody when removing physics Action	2018-05-31 11:20:03 -07:00
Cristian Luis Duarte	688fad1776	Android - Fix joystick and view control bug that makes it bounce	2018-05-31 14:11:28 -03:00
David Back	ac33f33828	update version from json in toByteArray	2018-05-31 09:24:16 -07:00
Sam Gateau	513acc529e	INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine	2018-05-30 23:31:54 -07:00
Sam Gondelman	ae3b933a80	Merge branch 'master' into etc2comp	2018-05-30 17:17:03 -07:00
samcake	37c1f4fc06	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-30 16:05:46 -07:00
John Conklin II	6095a3b319	Merge pull request #13082 from jherico/feature/shader_cache ... Shader load time performance optimiziations	2018-05-30 13:55:34 -07:00
Simon Walton	a3324c5616	Remove empty destructor	2018-05-30 13:52:26 -07:00
Simon Walton	8fb5d1b92d	Make RSA key-pair class a Runnable that's owned by a threadpool	2018-05-30 13:41:08 -07:00
samcake	457b77ca09	fixing static definition maybe	2018-05-30 13:37:32 -07:00
samcake	2e9076c71e	Clean up and trying to get ready for merge	2018-05-30 11:14:49 -07:00
Andrew Meadows	bc57003cfb	activate body before disconnecting action from entity	2018-05-29 17:56:41 -07:00