52911 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Davis	85c80f3be8	Merge remote-tracking branch 'upstream/master' into smarter_textures ... Conflicts: libraries/gpu/src/gpu/Texture.cpp	2017-03-22 14:25:23 -07:00
Andrew Meadows	a463013d90	Merge pull request #9960 from samcake/blue ... Fix Ambient Lighting equation	2017-03-22 14:13:31 -07:00
Chris Collins	05c40d2930	Merge pull request #9933 from mittens/hotfix/obj-texture-fix ... Fixed the texture assignment for the OBJ loader	2017-03-22 13:19:01 -07:00
trent	c71e57753b	Removing changes (albeit benign ones) from another PR.	2017-03-22 15:23:40 -04:00
Triplelexx	c7b9492620	revert removing rightUnitVec ... .....	2017-03-22 19:14:20 +00:00
trent	36619cd2e4	Fixed issue with duplicate physics status icons per sub-object.	2017-03-22 15:07:29 -04:00
Triplelexx	216f20ed2c	rename fronts to forwards	2017-03-22 19:03:39 +00:00
Triplelexx	d1db04f93a	fix lost forwardOffset declaration	2017-03-22 18:57:00 +00:00
Triplelexx	fd312f6bf8	rename fronts to forwards	2017-03-22 18:49:34 +00:00
Triplelexx	31ec9b832f	rename fronts to forwards	2017-03-22 18:43:30 +00:00
Triplelexx	c2cff55427	rename fronts to forwards	2017-03-22 18:41:06 +00:00
trent	83d69e65b3	Merge branch 'master' of https://github.com/highfidelity/hifi into 21215	2017-03-22 14:20:37 -04:00
Dante Ruiz	3a89654111	saving work	2017-03-22 19:14:53 +01:00
Anthony J. Thibault	2c38d7ff89	Tablet spawn orientation now takes hand orientation into account. ... Perhaps this will make the tablet spawn location feel more predictable and consistent to the user.	2017-03-22 11:03:03 -07:00
Triplelexx	2fc8dd48de	change testFront to testForward	2017-03-22 17:13:45 +00:00
Triplelexx	2d1ca99e2e	change variable names that use Quat.getForward	2017-03-22 17:00:12 +00:00
Seth Alves	bd32104bc1	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-22 08:41:59 -08:00
Ryan Huffman	1285f2a9eb	Merge pull request #9937 from thoys/boppo ... El Boppo the Clown punching bag game	2017-03-22 09:30:54 -07:00
Thijs Wenker	dff67886d0	CR Changes - remove double constructor, use creation function instead	2017-03-22 17:28:10 +01:00
Dante Ruiz	7423bf6ca1	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help	2017-03-22 16:33:29 +01:00
Dante Ruiz	a44704c4fe	merging with tablet-ui	2017-03-22 16:32:37 +01:00
Brad Davis	e60108cc8c	PR comments	2017-03-21 17:26:24 -07:00
Triplelexx	2515563a0b	change getFront to getForward	2017-03-21 22:35:07 +00:00
Triplelexx	6e740a5fbb	change Mat4 getFront to getForward	2017-03-21 22:33:37 +00:00
Triplelexx	66d697873f	change mat4test back to getFront ... premature, including in seperate commit	2017-03-21 22:31:06 +00:00
Triplelexx	8df0395754	change getFrontDirection to getForwardDirection	2017-03-21 22:28:12 +00:00
Triplelexx	a964edee91	change all references of Quat.getFront to Quat.getForward in scripts directory	2017-03-21 22:25:30 +00:00
Triplelexx	b7980569cc	change all references of IDENTITY_FRONT to IDENTITY_FORWARD	2017-03-21 22:13:33 +00:00
Triplelexx	248c932d50	inline getFront	2017-03-21 22:11:18 +00:00
Seth Alves	93341556ff	Merge pull request #9973 from druiz17/tablet-misspelled-function-call ... fix error from using a misspelled function	2017-03-21 13:30:37 -08:00
Dante Ruiz	d2c139ce6e	fix error from using a misspelled function	2017-03-21 22:25:45 +01:00
kunalgosar	f09ee92fe1	spacing issues	2017-03-21 14:16:49 -07:00
kunalgosar	30d2ea0ea5	spacing issues	2017-03-21 14:15:56 -07:00
kunalgosar	a4af973ae4	fixed back button on marketplace	2017-03-21 14:12:54 -07:00
Seth Alves	a51c1e5a78	Merge pull request #9971 from sethalves/tablet-ui ... Tablet ui	2017-03-21 13:05:38 -08:00
Seth Alves	a93fbc00b5	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 14:05:08 -07:00
Seth Alves	91cac892d2	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 14:04:58 -07:00
Seth Alves	b5786befc3	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-21 13:49:19 -07:00
Brad Davis	a3828ce45c	Fixing comment	2017-03-21 13:42:24 -07:00
Triplelexx	6d664fd668	add getForward, getFront returns getForward ... getForward better describes the returned vector as a direction	2017-03-21 19:54:32 +00:00
Chris Collins	4c789c44aa	Merge pull request #9922 from birarda/bug/stuck-ess ... fix a couple of ESS issues during ES/ESS restart	2017-03-21 12:44:53 -07:00
Seth Alves	14027d4acb	Merge pull request #9968 from druiz17/tablet-xbox ... Fixed the third eye for the xbox controller	2017-03-21 11:03:53 -08:00
Seth Alves	4c26bcd93e	Merge pull request #9969 from sethalves/tablet-ui ... unmangle merge	2017-03-21 11:03:10 -08:00
Seth Alves	04a334fd07	unmangle merge	2017-03-21 11:02:18 -08:00
Dante Ruiz	bf3c5dbf0e	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-xbox	2017-03-21 19:47:16 +01:00
Dante Ruiz	1811a2edc7	fixed third eye laser	2017-03-21 19:45:00 +01:00
Seth Alves	c5a5c1c642	Merge pull request #9967 from sethalves/tablet-ui ... Tablet ui -- merge from upstream	2017-03-21 09:26:57 -08:00
Seth Alves	1da6349505	merge from upstream	2017-03-21 10:26:02 -07:00
Ryan Huffman	13222468e3	Merge pull request #9712 from huffman/feat/edit-particle-icon ... Add particle system overlay in edit.js	2017-03-21 10:02:52 -07:00
Seth Alves	048da6e6cb	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-21 09:52:15 -07:00