22054 commits

Author	SHA1	Message	Date
samcake	40ca98214b	Moving all of the camera and avatar eval to game loop	2017-09-27 17:58:43 -07:00
samcake	f16c552978	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-26 17:18:05 -07:00
anshuman64	ca4d5ef807	Merge pull request #11454 from ElderOrb/case7877 ... 7877 Unexpected Behavior when pressing Enter on Input Field	2017-09-26 16:26:42 -07:00
Andrew Meadows	dafadf82bb	Merge pull request #11458 from jherico/fix/tablet_latency ... Fix long tablet lag on first load	2017-09-26 16:18:31 -07:00
samcake	328dd9c108	Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into blue	2017-09-26 16:12:27 -07:00
samcake	badb45c921	fixing the web surface now getting scaled when the table t is grabbed is fixed	2017-09-26 15:20:45 -07:00
Bradley Austin Davis	e42068f681	Merge branch 'master' into android_new	2017-09-26 14:31:29 -07:00
Andrew Meadows	909e5e86b1	Merge pull request #11442 from vladest/fix_dde_visibility ... Fix dde visibility	2017-09-26 14:19:47 -07:00
samcake	510b446409	mergine with master, resolving conflict	2017-09-26 13:13:46 -07:00
Seth Alves	7397a123c5	Merge pull request #11345 from SamGondelman/textAA ... Text3D Overlays and Entities fixes and no-AA	2017-09-26 12:26:08 -07:00
Seth Alves	913d3c4d12	Merge pull request #11422 from hyperlogic/feature/ant-man2 ... Secondary IPD fixes	2017-09-26 11:53:45 -07:00
Dante Ruiz	74f9e07f1a	Merge pull request #11361 from vladest/move_tablet2toolbar_to_developer_menu ... Move Tablet becomes toolbar menu from General to Developer menu	2017-09-26 11:26:42 -07:00
Dante Ruiz	e397d49564	Merge pull request #11159 from vladest/modal_dialogs_async ... Modal dialogs async	2017-09-26 11:07:42 -07:00
samcake	b5c942f7f6	Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface	2017-09-26 10:47:59 -07:00
samcake	669af73a96	Bringing as much as possible out from render to game	2017-09-26 10:47:24 -07:00
Andrew Meadows	ec80846281	Merge pull request #11443 from SamGondelman/sharks ... Laser Pointer fixes and updates	2017-09-26 10:22:55 -07:00
Sam Gateau	953614fe65	More stuff out of render to the gameloop	2017-09-25 23:43:32 -07:00
samcake	157b4f2e13	Moving some of the updates on the camera and the avatar out from render to game loop	2017-09-25 18:28:33 -07:00
Brad Davis	40c42d35a5	Fix long tablet lag on first load	2017-09-25 17:50:04 -07:00
samcake	11c55755d5	Removing unused call	2017-09-25 15:10:40 -07:00
beholder	5502a639e2	7877 Unexpected Behavior when pressing Enter on Input Field	2017-09-26 01:07:47 +03:00
Sam Gateau	f90dc64241	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-24 19:32:57 -07:00
Andrew Meadows	cf0dd6f8c3	Merge pull request #11371 from cain-kilgore/21542 ... WL 21542 - Allow Scripts to change Avatar Gravity [Experimental]	2017-09-23 22:20:52 -07:00
samcake	59006411c6	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-22 18:00:58 -07:00
Zach Fox	921ebc221e	Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled ... Enable Inspection Mode for all; change Commerce setting name	2017-09-22 17:52:27 -07:00
SamGondelman	0e3f1c5149	add setLaserLength, setLockEndUUID doesn't use defaultRenderStates	2017-09-22 16:11:24 -07:00
Zach Fox	702a4e9ade	More tweaking to overlay position	2017-09-22 15:32:38 -07:00
SamGondelman	cbe621f2b7	add searchRay to RayPickResult, fix precision picking caching with multiple lasers, make laser addition/removal immediate	2017-09-22 15:15:15 -07:00
Zach Fox	0eafdeab14	Fix hover -> unhover overlay behavior	2017-09-22 13:32:11 -07:00
Ryan Huffman	883bdc6003	Merge pull request #11425 from Atlante45/feat/auto-bake ... Asset Browser auto-refresh	2017-09-22 13:17:04 -07:00
vladest	5aab9bf5b0	Merge branch 'master' into fix_dde_visibility	2017-09-22 21:10:21 +02:00
vladest	4d530ef173	Make sure menu items vill be created even its not visible at the moment. Cleanup warnings on app close	2017-09-22 21:08:34 +02:00
Zach Fox	e3f2e70bca	No magic numbers	2017-09-22 11:43:56 -07:00
Zach Fox	430d1b22bb	Update angular size and i behavior	2017-09-22 11:41:28 -07:00
samcake	452a8f7175	Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into game-render-interface	2017-09-22 11:31:33 -07:00
Zach Fox	bb9db3ef6d	Updates to behavior and shader appearance	2017-09-22 11:24:30 -07:00
samcake	47b7fcc532	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-22 11:03:05 -07:00
samcake	4ce774ab8e	Merge branch 'blue-bis' of https://github.com/samcake/hifi into blue	2017-09-22 11:02:57 -07:00
samcake	b424505f65	FIxing the case of the Circle3D	2017-09-22 10:48:56 -07:00
samcake	219d63784b	REmoving the extra variables in Linear3D and just use the _renderTRansform	2017-09-22 10:39:51 -07:00
Atlante45	8583be41ce	Don't refresh if not connected to the Asset Server	2017-09-21 18:57:09 -07:00
samcake	16fb64afaa	Merging with blue-bis	2017-09-21 18:01:04 -07:00
samcake	4a67e0421f	minimise the changes compared to upstream	2017-09-21 17:33:50 -07:00
samcake	eed099502a	minimise the changes compared to upstream	2017-09-21 17:20:32 -07:00
samcake	510ecbb137	Merging with upstream	2017-09-21 16:59:15 -07:00
samcake	2d369a4586	fixing the image3D updating its renderTransform from it s update() call	2017-09-21 16:20:13 -07:00
Atlante45	6cdbf0c44a	Fix RunningScripts in tablet mode	2017-09-21 15:53:27 -07:00
Atlante45	1a571d0991	Add Asset Server auto refresh	2017-09-21 14:41:59 -07:00
Anthony J. Thibault	54e627e2c5	Merge branch 'master' into feature/ant-man2	2017-09-21 13:59:47 -07:00
samcake	454e167d93	notifying a render transform / bound change when the dimension property change	2017-09-21 12:58:56 -07:00