84159 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
daleglass	70f2866871	Merge pull request #860 from makitsune/fix-alt-on-linux ... Fix alt key on Linux	2020-12-10 23:45:55 +01:00
kasenvr	ec1c8f2b87	Merge pull request #891 from JulianGro/ubuntu_20_04_cmake ... Fix hifi_qt.py reporting Ubuntu 20.04 as outdated	2020-12-03 17:47:33 -05:00
kasenvr	248de8f666	Merge pull request #879 from kasenvr/feature/crash-rpt-cmd-option ... Initial add of crash report arg option.	2020-12-03 17:46:12 -05:00
kasenvr	0f93c415ac	Merge pull request #895 from kasenvr/fix/master-references ... Fix references 'kasen/core' -> 'master'	2020-12-02 22:20:59 -05:00
kasenvr	86cbcb53a3	Merge pull request #882 from ctrlaltdavid/fix/jsdoc-typo ... Fix JSDoc typo	2020-12-01 05:58:31 -05:00
Kalila L	0575971d12	Fix references 'kasen/core' -> 'master'	2020-12-01 05:58:01 -05:00
Julian Groß	dec726b976	Update hifi_qt.py to recognize ubuntu version over 19.10 as not supported yet.	2020-11-28 23:30:34 +01:00
kasenvr	6b320899d6	Merge pull request #863 from daleglass/upgrade-tbb ... Upgrade tbb to fix a startup crash on Fedora 32 and later	2020-11-28 14:20:31 -05:00
kasenvr	60e59abe47	Merge pull request #874 from AleziaKurdis/CreateApp_Issue869 ... Fix new Zones appearing as parent of a ghost child	2020-11-28 14:19:07 -05:00
kasenvr	0157d5f804	Merge pull request #887 from daleglass/fix-ati-auto-vram ... Fix getting the free VRAM on ATI cards	2020-11-28 14:17:02 -05:00
Dale Glass	182302c3e7	GL_TEXTURE_FREE_MEMORY_ATI returns 4 values, not just 1 ... This should fix a buffer overflow that happens on ATI cards.	2020-11-28 02:07:08 +01:00
kasenvr	9b253c3a32	Update interface/src/main.cpp ... Co-authored-by: David Rowe <david@ctrlaltstudio.com>	2020-11-25 16:27:46 -05:00
kasenvr	4e1b6838cc	Merge pull request #871 from kasenvr/revert-868-revert-659-scriptEngine ... Revert "Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine""	2020-11-24 18:43:33 -05:00
kasenvr	78214b15d9	Merge pull request #881 from ctrlaltdavid/fix/gha-master-target ... Fix GHA master build target branch	2020-11-24 18:43:13 -05:00
kasenvr	fe9e32fa5c	Merge pull request #615 from HifiExperiments/gha ... Playing with GHA	2020-11-24 18:42:33 -05:00
David Rowe	eb70d15f77	Fix JSDoc typo	2020-11-23 19:13:48 +13:00
Alezia Kurdis	343ded8c6f	Minor code adjustments ... Minor code adjustments	2020-11-21 22:02:49 -05:00
David Rowe	c4092a35e3	Fix GHA master build target branch	2020-11-22 14:08:36 +13:00
Alezia Kurdis	b633bc4a16	Excluding EntityShapeVisualizer from Children list ... Excluding EntityShapeVisualizer from Children list Now a name is given to the EntityShape of the EntityShapeVisualizer (used to display the zone) so we can now exclude them from the children list when it's time to figure if there are children for an entity. (This is a better approach than excluding al the local entities) The name has been used because it gives better results than trying to use the id map that arrive always too late. The name is unique for a session, it includes a UUID.	2020-11-21 15:44:15 -05:00
Alezia Kurdis	00575ae8f8	Excluding EntityShapeVisualizer from Children list ... Excluding EntityShapeVisualizer from Children list Now a name is given to the EntityShape of the EntityShapeVisualizer (used to display the zone) so we can now exclude them from the children list when it's time to figure if there are children for an entity. (This is a better approach than excluding al the local entities) The name has been used because it gives better results than trying to use the id map that arrive always too late. The name is unique for a session, it includes a UUID.	2020-11-21 15:43:12 -05:00
Kalila L	f7b0437bc8	Initial add of crash report arg option.	2020-11-21 00:03:56 -05:00
Alezia Kurdis	22abf1c2c4	Fix for Issue 869 ... This excludes the local and avatar entities from what is returns by Entities.getChildrenIDs to avoid the selection tools of the Zone entities to be considered as Children of it. This was necessary for the display of the hierarchy status, but also for the "Add Children to Selection".	2020-11-18 23:15:23 -05:00
Alezia Kurdis	031b3985b0	Fix for Issue 869 ... This excludes the local and avatar entities from what is returns by Entities.getChildrenIDs to avoid the selection tools of the Zone entities to be considered as Children of it. This was necessary for the display of the hierarchy status, but also for the "Add Children to Selection".	2020-11-18 23:14:34 -05:00
HifiExperiments	8047887685	Merge branch 'master' into gha	2020-11-18 17:01:16 -08:00
kasenvr	db2133115d	Merge pull request #872 from ctrlaltdavid/fix/pr-gha ... Replace set-env in PR GHA	2020-11-18 19:49:25 -05:00
HifiExperiments	1e07971d10	how about this	2020-11-18 11:04:09 -08:00
David Rowe	e8520becd6	Syntax	2020-11-18 21:11:48 +13:00
David Rowe	ea77db85d3	Use output var in second step	2020-11-18 21:06:29 +13:00
David Rowe	066dd2a6cc	Typo	2020-11-18 20:49:47 +13:00
David Rowe	6c8b11ddda	Typo	2020-11-18 16:54:21 +13:00
David Rowe	c299026378	Calculate short SHA	2020-11-18 14:52:58 +13:00
HifiExperiments	17f579882a	try fixing commit short	2020-11-17 15:09:50 -08:00
David Rowe	57729e3cef	Remove single quotes ... Per commit be55993 by HifiExperiments.	2020-11-18 11:38:50 +13:00
HifiExperiments	be55993dda	try removing single quotes	2020-11-17 13:14:23 -08:00
David Rowe	cfe824c180	Replace set-env in PR GHA ... Code from commit 4c536f4 by HifiExperiments.	2020-11-18 08:16:25 +13:00
HifiExperiments	5b8f7fad16	some more	2020-11-16 22:18:43 -08:00
HifiExperiments	4c536f4318	try to replace set-env	2020-11-16 22:11:14 -08:00
HifiExperiments	02f7f494fa	Merge remote-tracking branch 'upstream/master' into gha	2020-11-16 21:48:46 -08:00
HifiExperiments	b6744588f4	loading fix	2020-11-16 21:25:25 -08:00
HifiExperiments	81940214bb	Revert "Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine""	2020-11-16 21:20:25 -08:00
kasenvr	b39a8c90e2	Merge pull request #868 from kasenvr/revert-659-scriptEngine ... Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine"	2020-11-16 22:46:56 -05:00
kasenvr	21f8eac936	Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine"	2020-11-16 22:35:46 -05:00
Alezia Kurdis	4c8d8e1b3a	Merge pull request #1 from kasenvr/master ... Upgrading	2020-11-16 21:34:14 -05:00
kasenvr	c3439a8ae7	Merge pull request #659 from HifiExperiments/scriptEngine ... Split Local and owned Avatar Entity scripts into their own ScriptEngine	2020-11-15 23:12:54 -05:00
kasenvr	1b8a8113a6	Merge pull request #858 from AleziaKurdis/feature/CreateApp_NOV2020 ... Create App. - Feature Bundle - Nov 2020	2020-11-15 23:01:13 -05:00
kasenvr	9dbf41647e	Merge pull request #852 from ctrlaltdavid/feature/email-domain-login ... Enable username or e-mail for domain login	2020-11-15 22:56:25 -05:00
Alezia Kurdis	da2737de53	Minor Code Adjustements ... Minor Code Adjustements	2020-11-14 22:39:47 -05:00
Alezia Kurdis	2475deac93	Minor code adjustments ... Minor code adjustments	2020-11-14 22:36:28 -05:00
Alezia Kurdis	33eb01a6c7	Minor code adjustments ... Minor code adjustments	2020-11-14 22:33:38 -05:00
Dale Glass	8e2245c530	Update hash	2020-11-14 19:00:53 +01:00