24458 commits

Author	SHA1	Message	Date
Liv Erickson	b78f00342e	Merge branch 'master' of github.com:highfidelity/hifi into feat/disable-add-without-url	2018-03-28 17:53:42 -07:00
Sam Gondelman	d2a74e5713	Merge pull request #12686 from gcalero/android_ui_not_move_camera ... Android - Prevent Camera movement with UI (especially Windows and Radar mode)	2018-03-28 17:14:42 -07:00
Stephen Birarda	0172c24cf2	fix cmake changes for script copy for dev builds	2018-03-28 14:47:09 -07:00
John Conklin II	790162c88b	Merge pull request #12689 from ctrlaltdavid/21808 ... Reinstate Overlays.getOverlayObject API function	2018-03-28 14:00:28 -07:00
Cristian Luis Duarte	f0bcaa47c8	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-28 16:47:21 -03:00
Brad Hefta-Gaub	16df773de4	Merge pull request #12721 from highfidelity/RC66 ... RC66 - Mergeback	2018-03-28 09:55:46 -07:00
John Conklin II	586fb4829c	Merge pull request #12637 from druiz17/fix-asset-server-qml ... Fix asset server qml sorting	2018-03-28 09:35:53 -07:00
Seth Alves	46fb2033f2	Merge pull request #12574 from druiz17/remap-keybaord ... changing keyboard mapping	2018-03-27 19:00:05 -07:00
Seth Alves	bb101956a6	fix entity importing	2018-03-27 18:25:43 -07:00
Dante Ruiz	ad9ca0da20	fix tablet version	2018-03-27 16:03:06 -07:00
John Conklin II	a258a330d3	Merge pull request #12676 from druiz17/fix-keyboard ... fixing AddressManager keyboard when switching domains	2018-03-27 15:34:23 -07:00
John Conklin II	0862f345fe	Merge pull request #12717 from sethalves/workaround-dialog-crash ... fix -- work around asset-upload dialog crash	2018-03-27 13:35:50 -07:00
John Conklin II	7c505a0b85	Merge pull request #12711 from sethalves/serverless-tutorial-rc66 ... Serverless tutorial rc66	2018-03-27 11:17:07 -07:00
Seth Alves	4f7d856a1c	don't free dialogs to avoid crash in setKeyboardRaised	2018-03-27 09:28:55 -07:00
Ryan Huffman	d01a58517f	Fix serverless content not using correct directories	2018-03-26 14:32:52 -07:00
Stephen Birarda	787947b6a8	add a default tutorial json for dev interface	2018-03-26 14:32:26 -07:00
Stephen Birarda	b52a877d8d	optionally grab serverless tutorial, on for installers	2018-03-26 14:32:11 -07:00
Zach Fox	a588776b47	Fix infinite loading when authing wallet during Checkout	2018-03-26 13:19:40 -07:00
Dante Ruiz	1f23e7ab8b	fixing more edge cases	2018-03-26 10:15:15 -07:00
Dante Ruiz	b8796db1e5	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-26 09:13:58 -07:00
Cristian Luis Duarte	6cb5cd7f92	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-26 11:19:42 -03:00
Dante Ruiz	96707a2568	fix mappoing conflicts	2018-03-23 16:43:36 -07:00
Cristian Luis Duarte	686af4ff77	Clean code that manually checked for windows coordinates to disable radar touch	2018-03-23 20:02:51 -03:00
Cristian Luis Duarte	242b009562	Android - Use mouse events for interacting with UI. Now LoginDialog UI interation does not move radar camera. Remove repeated tooggle call in audio.js. Adapt button to simulated mouse events.	2018-03-23 18:59:55 -03:00
Dante Ruiz	28e61bcbb1	fix typo	2018-03-23 11:57:01 -07:00
Dante Ruiz	a14d5c6546	make alternate keys work	2018-03-23 11:55:16 -07:00
John Conklin II	563ff61325	Merge pull request #12661 from SamGondelman/android ... Android: Stats, disable IK, reduce impact of InputRecorder	2018-03-23 11:08:50 -07:00
John Conklin II	c61ed697df	Merge pull request #12552 from vladest/assetbrowser_cosmetics ... Wrap text in query dialogs. Add right margins for input field and but…	2018-03-22 17:56:47 -07:00
Dante Ruiz	f36a916fb6	revert comment change	2018-03-22 17:44:17 -07:00
Dante Ruiz	4d52caccde	making some more requested changes	2018-03-22 17:39:22 -07:00
Dante Ruiz	1d17658c80	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-22 16:29:16 -07:00
Howard Stearns	113670e33b	Merge pull request #12638 from zfox23/commerce_upgrades_1 ... Commerce: Item Updates!	2018-03-22 15:40:22 -07:00
Liv Erickson	1244559618	remove spaces for clean-ness	2018-03-22 15:37:12 -07:00
Liv Erickson	0647155c30	re-add experimental image removal	2018-03-22 15:33:23 -07:00
Liv Erickson	f62e1ed54e	disable add button on model until text is entered	2018-03-22 15:29:41 -07:00
John Conklin II	6d9892856d	Merge pull request #12510 from sethalves/serverless-domains ... Serverless domains	2018-03-22 14:06:49 -07:00
Sam Gondelman	bbded2215d	Merge pull request #12665 from gcalero/android_bottombar_resize ... Android - Resize bottombar after window size changes (to always fill …	2018-03-22 11:15:02 -07:00
John Conklin II	b6920a503c	Merge pull request #12618 from vladest/hificonstants_as_object ... Hificonstants as object	2018-03-22 11:03:05 -07:00
Seth Alves	6c1d713968	review	2018-03-21 19:21:57 -07:00
Seth Alves	ed0778a68a	remove unused json file	2018-03-21 17:07:31 -07:00
Seth Alves	916ed3a0d4	review	2018-03-21 16:18:31 -07:00
Seth Alves	196f621a60	remove unneeded setSessionUUID	2018-03-21 15:21:49 -07:00
Seth Alves	bea7ee42e2	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-21 14:30:07 -07:00
Seth Alves	ef52ae13ee	rearrange domain-url-changed signals	2018-03-21 14:30:00 -07:00
Dante Ruiz	9d8770b134	changing speed	2018-03-21 13:25:50 -07:00
John Conklin II	5bd3d0fab9	Merge pull request #12647 from birarda/feat/client-only-installer ... add a CLIENT_ONLY build option and handle for installer	2018-03-21 11:20:36 -07:00
Seth Alves	4033af9b11	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-21 11:11:43 -07:00
Dante Ruiz	cce77e3e68	made requested changes	2018-03-21 10:15:42 -07:00
Ken Cooke	f5f4e2a780	Merge pull request #12635 from ctrlaltdavid/21776 ... Fix Window hasFocus(), setFocus(), and raiseMainWindow()	2018-03-21 09:27:51 -07:00
Dante Ruiz	86cd5ffa30	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-21 08:49:25 -07:00