34194 commits

Author	SHA1	Message	Date
Kasen IO	fda40d56d4	Merge branch 'master' into feature/further-rebranding	2020-06-06 18:43:03 -04:00
kasenvr	72d931688c	Merge pull request #409 from kasenvr/fix/entity-null-check ... Bugfix: Add null check to entity render clearing to fix crash.	2020-06-05 13:09:41 -04:00
kasenvr	5f15e8df04	Merge pull request #418 from Misterblue/fix/includes-for-VS-build ... Include <stdexcept> for building on Windows10 with Visual Studio 2019	2020-06-04 17:30:15 -04:00
Robert Adams	ee1d46af94	Include <stdexcept> so building on Windows10 with Visual Studio 2019 works.	2020-06-04 09:35:45 -07:00
kasenvr	103fd8eef2	Merge branch 'master' into fix/revert-instancing-temporarily-1	2020-06-03 22:44:32 -04:00
HifiExperiments	ade6bf24bb	fix issues with glb urls	2020-06-03 15:19:54 -07:00
Kasen IO	21fd10d154	Revert commit 359248829c using -m 1 to temporarily fix issue 383.	2020-06-03 16:08:18 -04:00
Kasen IO	94c230b78b	Add null check to entity render clearing to fix crash. ... Co-Authored-By: null <HifiExperiments@users.noreply.github.com>	2020-06-01 22:13:52 -04:00
kasenvr	1a46b28b71	Merge pull request #62 from HifiExperiments/blendshapes ... Support blendshapes on model entities	2020-05-31 18:34:42 -04:00
kasenvr	4cca7f6f75	Merge pull request #281 from HifiExperiments/parenting2 ... Improve performance of MyAvatar::simulate when you have lots of descendants	2020-05-31 14:47:22 -04:00
kasenvr	8157be5b5a	Merge pull request #405 from kasenvr/v0.86.0-k2.1 ... Merge K2.1 into Master	2020-05-30 18:49:38 -04:00
kasenvr	3c487106a7	Merge branch 'master' into fix/other-renamings	2020-05-28 03:46:36 -04:00
Kasen IO	6c6a405020	Add periods and remove double copyright in tabletaboutdialog.qml	2020-05-25 16:41:16 -04:00
Kasen IO	a4bf1c4d82	Update copyright headers.	2020-05-25 15:59:43 -04:00
kasenvr	7996698c8f	Merge branch 'master' into fix/other-renamings	2020-05-18 15:10:32 -04:00
Kasen IO	335f0c86dd	Reduce scope of PR.	2020-05-17 22:13:57 -04:00
Marcus Llewellyn	0228c35d79	Update JSDOC in EntityItemPropeties.cpp to vircadia.com ... Also strips trailing whitespaces from EntityItemProperties.cpp.	2020-05-17 14:46:33 -05:00
Dale Glass	407b2a4f22	Remove all uses of QString::null ... It's deprecated and produces a warning on Qt 5.14	2020-05-17 18:00:02 +02:00
motofckr9k	95a64b2f2c	Change standard log file names from "hifi-.." to "vircadia-.."	2020-05-13 22:59:51 +02:00
kasenvr	c5fdacf975	Merge pull request #301 from HifiExperiments/modelBackface ... Models support flipped normals on double sided geometry	2020-05-13 16:06:26 -04:00
Dale Glass	95570d5abc	Kill the entity in processRemovedEntities before calling prepareEntityForDelete ... This was removed back in 9d92546a and causes an assertion (#337)	2020-05-10 18:41:03 +02:00
daleglass	affcc6f918	Merge pull request #300 from thoys/feature/gha_vircadia ... GitHub Actions (with artifact uploading)	2020-05-08 17:17:45 +02:00
Kasen IO	430d748b29	Bump packet version size up.	2020-05-07 21:33:20 -04:00
HifiExperiments	405d557725	Merge branch 'master' into blendshapes	2020-05-07 13:38:59 -07:00
HifiExperiments	8017e30ab9	Merge branch 'master' into blendshapes	2020-05-07 13:27:22 -07:00
HifiExperiments	91e177f68b	add spaces after fors	2020-05-07 13:23:22 -07:00
HifiExperiments	3bf690571c	Merge branch 'master' into zoneOcclusion	2020-05-07 13:13:20 -07:00
Thijs Wenker	8a76753135	Merge branch 'master' of https://github.com/kasenvr/project-athena into feature/gha_vircadia	2020-05-07 11:07:28 +02:00
David Rowe	5e997d7b60	Fix up Vircadia URLs	2020-04-27 20:38:23 +12:00
David Rowe	2d070e630b	Merge branch 'master' into fix/jsdoc-fixes ... # Conflicts: # interface/resources/qml/hifi/avatarapp/MessageBoxes.qml # interface/resources/qml/hifi/commerce/checkout/Checkout.qml # interface/resources/qml/hifi/commerce/purchases/Purchases.qml # interface/src/Application.cpp	2020-04-26 20:38:43 +12:00
Heather Anderson	e29271d8ca	rename variables from "is crash enabled" to "is crash monitor enabled" (suggested by Thijs Wenker <me@thoys.nl>) ... added a debug message giving the current state of the debug monitor switch (ignoring whether Crashpad support is compiled)	2020-04-25 20:32:38 -07:00
Thijs Wenker	c4a0fc30bb	fix not matching declaration/definition argument name	2020-04-23 00:58:49 +02:00
Thijs Wenker	b4362ea85a	move template functions to header	2020-04-23 00:58:49 +02:00
Thijs Wenker	5fa8571c0b	shared seems to require linking with CoreFoundation and OpenGL on OSX	2020-04-23 00:58:48 +02:00
HifiExperiments	6b3b475a10	Merge remote-tracking branch 'upstream/kasen/core' into blendshapes	2020-04-16 16:59:24 -07:00
HifiExperiments	420af95131	models support flipped normals on double sided geometry	2020-04-16 16:18:39 -07:00
Heather Anderson	0d514ed74d	Merge branch 'fix/vs2019_v16_5_1' into pr/logging	2020-04-15 00:17:56 -07:00
HifiExperiments	b6db0e1348	Merge remote-tracking branch 'upstream/kasen/core' into parenting2	2020-04-13 15:39:20 -07:00
Heather Anderson	9187a680cd	Apply suggestions from code review ... Adding suggested changes from ctrlaltdavid Co-Authored-By: David Rowe <david@ctrlaltstudio.com>	2020-04-10 17:10:41 -07:00
David Rowe	761bc69faa	Merge branch 'kasen/core' into merge-hifi-master	2020-04-09 18:57:11 +12:00
David Rowe	ffeb37e7aa	Merge remote-tracking branch 'hifi/master' into merge-hifi-master ... # Conflicts: # CMakeLists.txt # README.md # cmake/externals/glad32es/CMakeLists.txt # cmake/externals/glad41/CMakeLists.txt # cmake/externals/glad45/CMakeLists.txt # cmake/externals/polyvox/CMakeLists.txt # cmake/externals/quazip/CMakeLists.txt # cmake/externals/vhacd/CMakeLists.txt # cmake/init.cmake # cmake/ports/hifi-deps/CONTROL # cmake/ports/sdl2/CONTROL # cmake/ports/sdl2/disable-hidapi-for-uwp.patch # cmake/ports/sdl2/enable-winrt-cmake.patch # cmake/ports/sdl2/fix-arm64-headers.patch # cmake/ports/sdl2/fix-x86-windows.patch # cmake/ports/sdl2/portfile.cmake # cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake # cmake/ports/tbb/portfile.cmake # hifi_vcpkg.py # interface/src/avatar/MyAvatar.h # libraries/avatars-renderer/src/avatars-renderer/Avatar.h # libraries/avatars/src/AvatarData.h # libraries/entities-renderer/src/RenderableEntityItem.h # libraries/entities/src/EntityItem.cpp # libraries/entities/src/EntityItem.h # libraries/fbx/src/GLTFSerializer.cpp # libraries/graphics-scripting/src/graphics-scripting/Forward.h # libraries/networking/src/AddressManager.cpp # libraries/networking/src/DomainHandler.h # libraries/procedural/src/procedural/ProceduralMaterialCache.cpp # libraries/render-utils/src/HighlightEffect.cpp # libraries/render-utils/src/MeshPartPayload.cpp # libraries/render-utils/src/Model.cpp # libraries/render-utils/src/RenderShadowTask.cpp # libraries/script-engine/src/WebSocketClass.cpp	2020-04-09 16:46:27 +12:00
HifiExperiments	9b1635f9cc	improve performance of MyAvatar::simulate when you have lots of entity descendants	2020-04-07 15:56:32 -07:00
Thijs Wenker	aa5413fd71	fix VS2019 (Version 16.5.1) builds	2020-04-07 16:57:05 +02:00
Kasen IO	115c40bd54	Lots of renamings, more to come.	2020-04-07 04:56:02 -04:00
HifiExperiments	6eacc5c8c2	Merge remote-tracking branch 'upstream/kasen/core' into zoneOcclusion	2020-04-03 14:37:14 -07:00
HifiExperiments	c062cb75ae	Merge remote-tracking branch 'upstream/kasen/core' into blendshapes	2020-04-03 14:35:21 -07:00
Heather Anderson	7cea4fc574	separate user activity logging from crash logging, allowing people to say "no" to tracking while still sending crashes	2020-04-03 02:38:53 -07:00
Kasen IO	e101535106	Add link to top of Entites API docs for the list of entity types.	2020-03-18 14:58:32 -04:00
kasenvr	e6bf1ffb77	Merge pull request #175 from ctrlaltdavid/fix/server-logs-filling ... Fix server logs filling up with "/"s	2020-03-03 23:53:50 -05:00
Thijs Wenker	fd7bfe7aba	Merge pull request #162 from ctrlaltdavid/fix/no-running-scripts ... Fix scripts not running at Interface start after reloading all scripts	2020-02-23 20:38:51 +01:00