25387 commits

Author	SHA1	Message	Date
Sam Gondelman	b05e1f8a32	Merge pull request #11847 from SamGondelman/overlayFlash ... Cleanup Web3DOverlay and tablet home button	2017-12-07 14:06:56 -08:00
Andrew Meadows	813c4fa38a	Merge pull request #11915 from druiz17/fix-collision-mask-for-children ... If hold actions are added to entity update the collision mask for the children aswell	2017-12-07 11:16:50 -08:00
Brad Hefta-Gaub	a0457d2b5e	Merge pull request #11856 from AndrewMeadows/sort-and-throttle-avatars ... Use PrioritySortUtil for avatar updates from avatar-mixer	2017-12-07 09:22:52 -08:00
Brad Hefta-Gaub	ac3bd5042f	Merge pull request #11890 from dback2/mirrorissues3 ... Secondary camera frame buffer / texture fixes	2017-12-07 09:17:27 -08:00
Bradley Austin Davis	2a91e98813	Fix iterator names	2017-12-06 14:26:07 -08:00
Brad Davis	e626ca3ccd	Working on scene threading optimizations	2017-12-06 14:26:07 -08:00
Dante Ruiz	0f3a70553c	fix dynamic entities that are parented to your avatar	2017-12-06 11:18:15 -08:00
Zach Fox	3183a1a8b9	Add setupAttemptID to every step (thanks Dave)	2017-12-05 16:48:30 -08:00
Dante Ruiz	36aa0ae476	Merge branch 'master' of github.com:highfidelity/hifi into fix-collision-mask-for-children	2017-12-05 15:48:45 -08:00
Dante Ruiz	8af1d8d8d0	dont run code if not nesscassry	2017-12-05 15:48:09 -08:00
Zach Fox	902064ed37	Cleanup debug stuff	2017-12-05 15:26:55 -08:00
Zach Fox	7521e4870e	Bugfixes	2017-12-05 14:56:47 -08:00
Zach Fox	668f6d50b5	Add data tracking for wallet setup	2017-12-05 14:13:48 -08:00
Zach Fox	4334bf8222	Add data tracking for purchase and rez	2017-12-05 13:09:09 -08:00
Clément Brisset	a5e671e0fd	Merge pull request #11931 from highfidelity/stable ... stable -> master	2017-12-05 11:58:23 -08:00
Dante Ruiz	c58286d371	dont do work if not needed	2017-12-05 09:31:35 -08:00
Dante Ruiz	486cdf14d2	make sure that NO_BOOTSTRAPPING is disbaled correctly if parent is changed	2017-12-04 15:34:53 -08:00
Dante Ruiz	a1bf54ff00	fix issue of no_bootstrapping not being set correctly	2017-12-04 11:16:41 -08:00
Dante Ruiz	03934549cc	Merge branch 'master' of github.com:highfidelity/hifi into fix-collision-mask-for-children	2017-12-04 09:08:11 -08:00
Brad Hefta-Gaub	b2c5154cb6	Merge pull request #11909 from ZappoMan/rc60FixModelImportSizing ... fix issues in model import sizing caused by recent refactor	2017-12-02 09:30:57 -08:00
Dante Ruiz	1e6b5c0c75	make requested changes	2017-12-01 17:09:00 -08:00
Anthony Thibault	fe16cc3fab	Merge pull request #11902 from luiscuenca/onloadFix ... Fixes create list and web and QML audio sync	2017-12-01 16:05:07 -08:00
Dante Ruiz	a1d90b5dd9	added extra bit	2017-12-01 15:41:13 -08:00
luiscuenca	fefedc11c8	mac fix	2017-12-01 15:17:23 -07:00
luiscuenca	d271f61987	Proper fix	2017-12-01 14:37:59 -07:00
ZappoMan	d1017d81bd	fix issues in model import sizing caused by recent refactor	2017-11-30 18:08:32 -08:00
ZappoMan	750d505f9b	fix issues in model import sizing caused by recent refactor	2017-11-30 17:51:59 -08:00
luiscuenca	83e370d9de	add shared pointer	2017-11-30 17:40:49 -07:00
luiscuenca	5d1f2a04c1	restate deleted lines	2017-11-30 16:43:38 -07:00
luiscuenca	98e8361690	Fix and rebuild	2017-11-30 16:07:43 -07:00
luiscuenca	9cd2dc921a	back to for loop	2017-11-30 15:31:29 -07:00
luiscuenca	0729579266	fix for loop	2017-11-30 15:21:43 -07:00
luiscuenca	58e829dbda	Delete leftover line	2017-11-30 15:11:38 -07:00
luiscuenca	e02e810399	Audio Handler fix	2017-11-30 15:06:02 -07:00
Bradley Austin Davis	59aea9c401	Merge pull request #11862 from jherico/android_nov ... Make buildable APK from Gradle	2017-11-30 11:23:29 -08:00
Andrew Meadows	05fbf8e511	workaround for zero-size objects in priority formula	2017-11-30 11:04:51 -08:00
luiscuenca	b817143e2e	Fixes on web and QML audio sync	2017-11-29 18:16:21 -07:00
Zach Fox	39afb4ab6a	Merge pull request #11882 from howard-stearns/the-lost-ECDSA ... The lost ecdsa	2017-11-29 15:53:52 -08:00
howard-stearns	57ec73bb13	spacing	2017-11-29 14:37:20 -08:00
howard-stearns	115bc27557	back to stable, rather than staging	2017-11-29 13:39:58 -08:00
howard-stearns	fb038c17ee	for now, point this PR at staging so that it can be tested as built by ... jenkins	2017-11-29 09:54:34 -08:00
Brad Davis	101d6763cc	PR feedback	2017-11-29 09:11:52 -08:00
howard-stearns	281b4cfd88	Merge branch 'master' of https://github.com/highfidelity/hifi into the-lost-ECDSA	2017-11-28 16:59:44 -08:00
Bradley Austin Davis	e4220aa44e	Fixing warnings in android build	2017-11-28 14:32:30 -08:00
David Back	7101719295	newline	2017-11-28 13:01:47 -08:00
David Back	5cceceb868	secondary cam texture fixes	2017-11-28 13:00:41 -08:00
Bradley Austin Davis	d6072f2bf2	Add bullet and draco to precompiled libraries	2017-11-28 11:32:34 -08:00
Brad Davis	d769acd345	Updating Android toolchain	2017-11-28 11:32:32 -08:00
Andrew Meadows	e212ac67c1	enable custom avatar sort tuning	2017-11-28 11:30:06 -08:00
Andrew Meadows	deccc54965	remove cruft	2017-11-28 09:14:05 -08:00