Commit graph

34234 commits

Author SHA1 Message Date
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
motofckr9k
d406b81b47 Big rebrand 2020-05-22 20:35:27 +02:00
Dale Glass
2ec541f2ef Fix Linux default audio device debug messages
Linux had no default audio implementation, implemented using
QAudioDeviceInfo.
2020-05-20 22:31:02 +02: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
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
kasenvr
86d18e3706
Merge pull request #160 from ctrlaltdavid/fix/http-serverless
Add support for serverless domains via HTTP/HTTPS
2020-02-19 16:24:56 -05:00
David Rowe
fae237ffa7 Fix server logs filling up with /s 2020-02-19 10:46:17 +13:00
kasenvr
48ae156db7
Merge pull request #104 from daleglass/implicit_copy_constructor
Make default copy constructors explicit
2020-02-08 14:45:44 -05:00
David Rowe
5a91de016e Fix scripts not running at Interface start after reloading all scripts 2020-02-08 16:50:46 +13:00
David Rowe
e6c54faaf2 Merge branch 'kasen/core' into fix/http-serverless 2020-02-07 11:32:38 +13:00
David Rowe
166c7809a9 Fix missing "no connection" dialog for invalid serverless domain URLs 2020-02-07 10:09:37 +13:00
David Rowe
82a0308a64 Save the last visited domain URL 2020-02-07 10:08:51 +13:00
Kasen IO
08ec9ef3b7 Various URL updates + window title update. 2020-02-05 15:25:51 -05:00
David Rowe
fa30866701 Remember serverless HTTP and HTTPS domains 2020-02-06 07:02:05 +13:00
David Rowe
46173439ed Enable serverless domains via HTTP and HTTPS 2020-02-01 12:46:28 +13:00
Kasen IO
428a5b65ff Lint 2020-01-27 13:13:36 -05:00
Kasen IO
8b03d1bd19 Removed unnecessary var. 2020-01-25 19:08:56 -05:00
kasenvr
fe48427d38
Update libraries/script-engine/src/ScriptEngine.cpp
Co-Authored-By: HifiExperiments <53453710+HifiExperiments@users.noreply.github.com>
2020-01-25 19:02:12 -05:00
Kasen IO
d6cf4db930 Fixed bug 2020-01-25 12:48:43 -05:00
Kasen IO
aa0c225809 Merge branch 'kasen/core' into fix/whitelist-qml-adds 2020-01-24 19:55:23 -05:00
David Rowe
7ed117dfcb Replace links to docs.highfidelity.com 2020-01-24 10:18:55 +13:00
Kasen IO
c121a8ef2a Housekeeping. 2020-01-23 03:06:58 -05:00
Kasen IO
7a985b445e removed extra debug, added debug for user awareness. 2020-01-22 14:53:55 -05:00
Kasen IO
fd5ee3e1a7 Whitelist toggle now works. 2020-01-22 14:48:15 -05:00
Kasen IO
98473abbb4 QML works, C++ works but does a manual set to true, does not see updates from QML set setting. 2020-01-22 11:29:37 -05:00
Kasen IO
61943d0edb non-working state 2020-01-21 22:51:30 -05:00
Kasen IO
bd066adbf6 Whitelist toggle not working c++ side. 2020-01-20 16:03:48 -05:00
David Rowe
b816d7053a Update models used in JSDoc examples 2020-01-20 21:07:33 +13:00
David Rowe
eae3336f57 Fix up docs links 2020-01-20 15:06:32 +13:00
David Rowe
1a4266a64a Review JSDoc updates from recent commits 2020-01-20 14:33:06 +13:00
Dale Glass
d0dc041275 Another default operator= and copy constructor 2020-01-19 11:24:51 +01:00
Dale Glass
68d10a2fe1 Make default copy constructors explicit
Recent versions of gcc generate a warning without this
2020-01-19 00:20:49 +01:00
15e9d08bff
Merge pull request #68 from daleglass/fix_too_small_to_hold
Fix thousands of 'is too small to hold all values' warnings on Linux
2020-01-18 13:43:36 -06:00
f5fcb90cac
Revert "Removed obsolete default scripts + more branding changes." 2020-01-16 18:51:49 -06:00
Dale Glass
bb51a000fb Code style fixes 2020-01-17 00:41:16 +01:00
Dale Glass
367c5f39df Finish removal of getRaw() and bit fields 2020-01-16 21:02:58 +01:00
6ac090dea5 Quick fix for the metaverse API
We did have the dfault metaverse API as metaverse.projectathena.io, but that doesn't not yet exist, and it turns out we can't just do a redirect. So for now changing it to metaverse.highfidelity.com
2020-01-14 20:33:39 -06:00
0fbaada57b
Merge pull request #54 from sethalves/fix-linux-build-0
fix linux build
2020-01-14 18:44:01 -06:00
e5dd23b922
Merge pull request #33 from kasenvr/feature/metaverse-url-switching
Ability to change Metaverse API from setting
2020-01-14 18:40:04 -06:00
Dale Glass
8f65a90453 Remove getRaw() from DepthTest
State::getKey removed because it breaks and is not referenced from anywhere.
2020-01-14 23:00:08 +01:00
David Rowe
ec1e6bc7d3 Merge branch 'DOC-55-C' into api-docs 2020-01-14 18:04:32 +13:00
David Rowe
050c6e2cc5 Merge branch 'DOC-212' into api-docs
# Conflicts:
#	libraries/shared/src/RegisteredMetaTypes.h
2020-01-14 18:04:17 +13:00
David Rowe
b9a1b78531 Merge branch 'DOC-68' into api-docs
# Conflicts:
#	libraries/shared/src/RegisteredMetaTypes.h
2020-01-14 18:02:23 +13:00
HifiExperiments
c45ee33e97 review comment 2020-01-13 17:44:32 -08:00
Kasen IO
336b5e275b Removed obsolete default scripts + more branding changes. 2020-01-12 23:13:01 -05:00
HifiExperiments
bc640b0f9f Merge remote-tracking branch 'upstream/kasen/core' into zoneOcclusion 2020-01-11 22:29:38 -08:00
HifiExperiments
bc319cb340 zone occlusion 2020-01-11 22:29:07 -08:00
kasenvr
5fdd563bfa
Merge pull request #65 from kasenvr/fix/whitelist-server
Whitelist Quality of Life Updates
2020-01-09 17:55:45 -05:00
Kasen IO
2c7911acb8 more housekeeping 2020-01-09 16:15:41 -05:00
kasenvr
dc46d581b0
Merge pull request #66 from FluffyJenkins/feature/websocketArrayBuffer
Added ArrayBuffer support to websockets
2020-01-08 09:09:17 -05:00
Fluffy Jenkins
672ac8066b Made changes 2020-01-08 04:38:33 +00:00
Kasen IO
a6dc494d7c housekeeping 2020-01-07 19:40:42 -05:00
Dale Glass
ea36e7a239 Fix thousands of 'is too small to hold all values' warnings on Linux
When building with GCC, it generates 3020 warnings like this:

libraries/gpu/src/gpu/State.h:208:18: warning: ‘gpu::State::BlendFunction::destColor’
is too small to hold all values of ‘enum gpu::State::BlendArg’

This is because ‘enum gpu::State::BlendArg’ is declared as an enum
of uint16 size, and gpu::State::BlendFunction::destColor is a bit
field.

GCC correctly deduces that a 16 bit value won't always fit in a 4
bit field, and emits a warning.

The problem is that the amount is such that it floods the output and hides
other warnings.

Changing the 'enum foo : uint16' declarations to 'enum foo' stops gcc
from emitting the warning.

Making this change required the removal of a set of assertion checks. At least
empirically they seem unnecessary -- the interface compiles and runs fine.
2020-01-08 00:12:30 +01:00
Kasen IO
13d79fec8b Fixes bools and tab. 2020-01-07 13:04:28 -05:00
Kasen IO
d87cd01129 Adds major QOL updates to whitelist 2020-01-07 03:03:08 -05:00
Fluffy Jenkins
3c4d56bc50 Fixed whitespace 2020-01-07 04:10:15 +00:00
Fluffy Jenkins
b33ad80992 Init push 2020-01-07 04:00:13 +00:00
HifiExperiments
b40a468b4c fix EOF 2020-01-06 18:31:35 -08:00
Kasen IO
20f5439fa8 Hard tabs converted to 4 length soft tabs. 2020-01-06 08:58:09 -05:00
Kasen IO
8124b7d4a1 Fixed tabs and spaces. 2020-01-06 08:29:01 -05:00
Kasen IO
fb5dbfc52a Disable whitelist on entity_server scripts. 2020-01-05 23:32:28 -05:00
HifiExperiments
ef8f085b47 support blendshapes on model entities 2020-01-05 02:37:44 -08:00
Seth Alves
82bddeb5a7 fix linux build 2020-01-03 10:27:43 -08:00
3bb8498067
Merge pull request #39 from daleglass/fix_invoke_method_crash
Don't bind action if QML menu can't be added.
2019-12-30 18:23:08 -06:00
Dale Glass
dabda684b8 Don't bind action if QML menu can't be added.
Otherwise eventually methods will be called on a NULL pointer.
Fixes crash related to QMetaObject::invokeMethod.
2019-12-26 01:04:53 +01:00