5583 commits

Author	SHA1	Message	Date
Cristian Luis Duarte	8235f999d8	Merge remote-tracking branch 'origin/master' into android_places_goto	2018-04-20 17:53:50 -03:00
Cristian Luis Duarte	55e64ceb55	Merge branch 'mm_1e08633' into android_places_goto	2018-04-20 13:32:23 -03:00
Cristian Luis Duarte	77caa4d402	Merge branch 'mm_c8bef86' into android_places_goto	2018-04-20 12:26:38 -03:00
Gabriel Calero	f2184bf456	Handle android back button. Remove unused resources. Fix compilation errors.	2018-04-19 17:31:25 -03:00
Seth Alves	6f420ffae2	Merge pull request #12936 from druiz17/more-tablet-changes ... Change tablet model and spawn position	2018-04-19 10:25:34 -07:00
John Conklin II	5ef90b242e	Merge pull request #12925 from thoys/fix/create-errorOnShutdown ... Create app: Save light selection menu option properly	2018-04-19 10:16:40 -07:00
Gabriel Calero	c8fe45eb8f	Remove debug statements and unused code. Put JNI code in a separated file.	2018-04-19 11:41:59 -03:00
John Conklin II	e557e0ae52	Merge pull request #12844 from druiz17/feature-entity-highlighting ... Highlight grabbable and equippable entities.	2018-04-18 15:35:46 -07:00
John Conklin II	51a98961a6	Merge pull request #12920 from thoys/fix/create-dontCloneOthersAvatarEntities ... edit.js - remove ability to clone non-owned avatar-entities	2018-04-18 15:27:09 -07:00
John Conklin II	eedc8a8c0a	Merge pull request #12929 from misslivirose/fix/misc-edit-bugs ... Fix edit icon behavior	2018-04-18 13:46:38 -07:00
Zach Fox	e0012ed5dc	Merge pull request #12924 from zfox23/MS12292_snapshotResourcesPath ... Fix paths to various Snapshot resource files	2018-04-18 13:44:53 -07:00
Dante Ruiz	86d3ba658f	Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting	2018-04-18 13:30:24 -07:00
Dante Ruiz	cf22f61361	adding cleanup of selection	2018-04-18 13:30:14 -07:00
Zach Fox	3ef0598871	Merge pull request #12923 from zfox23/MS10864_preventSnapshotSpam ... Don't allow users to spam Still Only snapshot capture	2018-04-18 13:19:36 -07:00
Dante Ruiz	9d6fc13a04	Merge branch 'master' of github.com:highfidelity/hifi into more-tablet-changes	2018-04-18 13:06:51 -07:00
Dante Ruiz	a65f5f7917	making tablet changes	2018-04-18 13:06:26 -07:00
Gabriel Calero	472cc1b29a	Fix code spacing	2018-04-18 16:44:49 -03:00
Liv Erickson	e795af03dd	move function out of global scope	2018-04-18 09:56:39 -07:00
Liv Erickson	2a055429cd	handle edit changes	2018-04-17 17:31:16 -07:00
Liv Erickson	e35efccfa3	make icon slightly more robust	2018-04-17 17:11:37 -07:00
Liv Erickson	6c1872caba	remove old dependency on domain changed message to fix issue with edit icon not handling domain changes	2018-04-17 16:38:29 -07:00
Liv Erickson	abe8a3e6d9	correct implementation that doesn't interfere with other app status	2018-04-17 15:41:03 -07:00
Liv	071396bed0	move logic for disconnecting out of initalize() and into setActive()	2018-04-17 15:40:59 -07:00
Liv	7a7438b648	space for synxtax	2018-04-17 15:40:57 -07:00
Liv	7f01dded79	add handler to refused domain change connections	2018-04-17 15:40:55 -07:00
Liv	6f020a7ec8	return tablet to home on change domain	2018-04-17 15:40:54 -07:00
Thijs Wenker	e6f0bfbf4c	get proper checkbox value from the allow light selection menu option	2018-04-18 00:10:49 +02:00
Zach Fox	95ee3c82f5	Fix paths to various Snapshot resource files	2018-04-17 14:13:14 -07:00
Zach Fox	4e48008ba1	Don't allow users to spam Still Only snapshot capture	2018-04-17 12:39:46 -07:00
Thijs Wenker	b741888d77	CR feedback (for real)	2018-04-17 20:31:30 +02:00
Thijs Wenker	91467b6059	CR feedback	2018-04-17 20:30:00 +02:00
Thijs Wenker	0aa0f53925	edit.js - remove ability to clone non-owned avatar-entities	2018-04-17 19:46:45 +02:00
Zach Fox	02aa8ac566	Bugfixes per QA	2018-04-16 11:53:37 -07:00
Gabriel Calero	e3b94b163c	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-16 14:55:16 -03:00
Zach Fox	071bf35683	Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018	2018-04-16 10:11:44 -07:00
Dante Ruiz	08ea72d71f	Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting	2018-04-13 15:39:14 -07:00
John Conklin II	08ca30cf43	Merge pull request #12870 from druiz17/fix-grab-js ... fix grab.js unable to grab other entities	2018-04-13 12:17:46 -07:00
John Conklin II	98f6899c3d	Merge pull request #12839 from SamGondelman/matMigrate ... Migrate materials from userData to materialData	2018-04-12 18:24:33 -07:00
Gabriel Calero	476e1cf7ae	Adjust UI with pixel perfect precision. Support devices with on-screen bars.	2018-04-12 17:59:38 -03:00
Dante Ruiz	43b92299d6	changing highlighting percentage	2018-04-12 10:35:29 -07:00
Seth Alves	32e7e5087e	Merge pull request #12668 from alexiamandeville/marketplace-update ... Updating repo script to match marketplace script	2018-04-12 09:20:03 -07:00
Gabriel Calero	8010fd2420	New view selector behaviour. Update icons	2018-04-11 18:43:39 -03:00
Dante Ruiz	7243160dac	making requested changes	2018-04-11 14:42:26 -07:00
Dante Ruiz	cdc248129c	fix grab.js	2018-04-11 14:25:06 -07:00
Dante Ruiz	ba9d5d18bc	make requested changes	2018-04-11 13:30:21 -07:00
Gabriel Calero	578012b662	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-11 16:30:53 -03:00
John Conklin II	2f4bc5bd04	Merge pull request #12701 from misslivirose/fix-edit-grid-color ... Fix for grid color changes not applying	2018-04-11 12:06:09 -07:00
John Conklin II	28168e6e45	Merge pull request #12699 from misslivirose/fix/save-settings-for-editing ... Fix for edit preferences not persisting	2018-04-11 11:59:58 -07:00
Zach Fox	095b4ba5f2	Reduce logging from some Commerce/Discovery features	2018-04-10 16:02:58 -07:00
Zach Fox	01fec2edc7	Prevent the Bubble icon from ever blinking as per 14026	2018-04-10 16:00:35 -07:00