Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 08:36:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
83469 commits 76 branches 59 tags 1.2 GiB
Commit graph

34267 commits

Author SHA1 Message Date
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
Marcus Llewellyn
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
Marcus Llewellyn
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
Marcus Llewellyn
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
Marcus Llewellyn
0fbaada57b
Merge pull request #54 from sethalves/fix-linux-build-0 
fix linux build
 2020-01-14 18:44:01 -06:00
Marcus Llewellyn
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
Marcus Llewellyn
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
David Rowe
00bd81b8c3 using MyAvatar.getTargetAvatar or AvatarList.getAvatar. 2019-12-24 09:52:19 +13:00
David Rowe
67bfe03724 Use the @hideconstructor tag in anticipation of it working 2019-12-23 14:27:34 +13:00
David Rowe
2dd981493e Update classes' JSDoc per @hideconstructor 2019-12-23 14:13:48 +13:00
David Rowe
7af1845884 Reinstate mistakenly deleted comment 2019-12-23 09:20:38 +13:00
David Rowe
61b3b09b23 Fill in some missing summaries. 2019-12-23 09:17:08 +13:00
David Rowe
a92830f2c1 Miscellaneous JSDoc fixes 2019-12-23 09:09:27 +13:00
David Rowe
eb11231e78 Graphics API JSDoc 2019-12-23 09:07:35 +13:00
Thijs Wenker
0ac8c178db
fix spacing 2019-12-20 12:43:43 +01:00
Kasen IO
c34cd996df change Metaverse API from setting 2019-12-20 11:39:05 +01:00
David Rowe
8255a50cde Update MeshProxy and Entities.getMeshes() JSDoc 2019-12-20 13:34:21 +13:00
David Rowe
1ebc6a575e Model API JSDoc 2019-12-20 13:33:48 +13:00
Fluffy Jenkins
83e9b891d8 Workaround for Secondary camera crash 2019-12-19 23:31:10 +00:00
David Rowe
a04e57d82d Miscellaneous JSDoc fixes noticed in passing 2019-12-19 11:38:17 +13:00
David Rowe
ccc4be5312 Revise extended avatar blend shapes JSDoc 2019-12-18 12:54:56 +13:00
David Rowe
aa077684f5 Update Controller.Hardware.Keyboard JSDoc per new touchpad gestures 2019-12-18 12:20:05 +13:00
David Rowe
427aa851b3 Fix up links to avatar standards guide 2019-12-18 09:51:34 +13:00
David Rowe
34958ddb71 Address some JSDoc issues identified by makitsune 2019-12-18 08:01:20 +13:00
David Rowe
7cf216f114 Add warning about EventBridge not immediately availble in TabletProxy 2019-12-18 07:15:34 +13:00
David Rowe
5256f58520 Document callback function signatures for Script.addEventHandler() 2019-12-17 16:17:45 +13:00
Brad Hefta-Gaub
bdce8134fc
Merge pull request #16509 from makitsune/domain-server-ports 
Added environment variables to change domain server ports
 2019-12-16 15:15:49 -08:00
David Rowe
3aaeba76a9 Fix typos in WebSocket JSDoc 2019-12-17 09:20:18 +13:00
David Rowe
025c136561 XMLHttpRequest API JSDoc 2019-12-17 09:19:47 +13:00
Brad Hefta-Gaub
bec28e7e05
Merge pull request #16574 from ctrlaltdavid/DOC-242 
DOC-242: WebSocket and WebSocketServer JSDoc
 2019-12-15 09:25:47 -08:00
David Rowe
ea72036757 Typos 2019-12-14 12:36:36 +13:00
David Rowe
5359efead8 Add JSDoc missing for callback parameter 2019-12-14 12:33:51 +13:00
David Rowe
13abf7f016 WebSocket and WebSocketServer JSDoc 2019-12-14 11:59:18 +13:00
Brad Hefta-Gaub
bb68f92d3e
Merge pull request #16562 from ctrlaltdavid/DEV-2442 
DEV-2442: Fix main gamepad (XBox controller) controls
 2019-12-13 13:36:20 -08:00
Brad Hefta-Gaub
fb70569fc2
Merge pull request #16548 from HifiExperiments/visible 
Case 17368: Fix wearables not disappearing with avatar
 2019-12-13 13:20:15 -08:00
Brad Hefta-Gaub
1609e59c42
Merge pull request #16546 from HifiExperiments/cullFace 
Material Entities can specify face culling method, support GLTF doubleSided property
 2019-12-13 13:16:01 -08:00
Brad Hefta-Gaub
f8a9789f86
Merge pull request #16499 from HifiExperiments/proceduralMesh 
Procedural vertex shaders
 2019-12-13 13:00:01 -08:00
Brad Hefta-Gaub
2d56d7c026
Merge pull request #16551 from ctrlaltdavid/DEV-1943 
DEV-1943: Make MyAvatar.getAvatarEntityData() return all properties
 2019-12-13 10:53:24 -08:00
Brad Hefta-Gaub
4c9129268d
Merge pull request #16571 from ctrlaltdavid/DOC-243 
DOC-243: EntityScriptServerLog JSDoc
 2019-12-13 10:43:45 -08:00
Kasen IO
1f01beba70 Fixed patch issues 2019-12-13 12:29:08 -05:00
Kasen IO
9839b23061 Made Sam's graphics patches work with 86 K2. 2019-12-13 02:38:14 -05:00
HifiExperiments
0bd5e15b47 fix non-procedural material entity crash 
Signed-off-by: Kasen IO <kasenvr@gmail.com>
 2019-12-13 02:17:52 -05:00
Maki
a7851c9205 Fixed type conversions for environmental domain ports 
Signed-off-by: Kasen IO <kasenvr@gmail.com>
 2019-12-12 23:09:18 -05:00
Maki
1ef45b703c Added environment variables to change domain server ports 
Signed-off-by: Kasen IO <kasenvr@gmail.com>
 2019-12-12 23:09:18 -05:00
HifiExperiments
204c7a7391 fix shadows!! 2019-12-12 23:04:55 -05:00
HifiExperiments
6156495345 stupid, shadows still broken 2019-12-12 23:04:47 -05:00
SamGondelman
1736252f0d trying and failing to fix models 2019-12-12 23:04:47 -05:00
SamGondelman
398562321d fix wearables not disappearing with avatar 2019-12-12 23:02:57 -05:00
HifiExperiments
e0a29d9367 material entities support cullFaceMode and support gltf doubleSided 2019-12-12 23:01:57 -05:00
HifiExperiments
59c67e5590 put back stepping in translucent case 2019-12-12 23:01:57 -05:00
HifiExperiments
3fe395ca32 properly implement alphaModes 2019-12-12 23:01:57 -05:00
HifiExperiments
b66fa1d57a put back stepping in translucent case 2019-12-12 22:58:36 -05:00
HifiExperiments
d54ca43554 properly implement alphaModes 2019-12-12 22:58:36 -05:00
HifiExperiments
6e961b9f2f procedural vertex shaders 
Signed-off-by: Kasen IO <kasenvr@gmail.com>
 2019-12-12 22:49:48 -05:00
David Rowe
3232f89a33 OverlayWindow and OverlayWebWindow JSDoc 2019-12-13 10:13:10 +13:00
HifiExperiments
5fc55d1763
Merge branch 'master' into cullFace 2019-12-11 00:49:58 -08:00
HifiExperiments
2eb0ec18fc fix non-procedural material entity crash 2019-12-11 00:42:59 -08:00
David Rowe
65bba26dfb EntityScriptServerLog API 2019-12-11 19:22:28 +13:00
Marcus Llewellyn
af4c0ea0d1 Removes the environment variable requirement for procedural material shaders. 
Signed-off-by: Marcus Llewellyn <marcus.llewellyn@gmail.com>
 2019-12-10 16:52:19 -06:00
David Rowe
bbd16d7544 Fix global print function's JSDoc 2019-12-11 07:42:58 +13:00
David Rowe
5caa21e5d9 Update Script JSDoc accordingly 2019-12-11 07:42:40 +13:00
David Rowe
7d2e818ab1 console JSDoc 2019-12-11 07:41:37 +13:00
jennaingersoll
6312a7cdd8
Merge pull request #16563 from ctrlaltdavid/DOC-198 
DOC-198: OffscreenFlags JSDoc
 2019-12-09 16:01:49 -08:00
jennaingersoll
6f44373141
Merge pull request #16556 from ctrlaltdavid/DOC-235 
DOC-235: DriveKeys JSDoc
 2019-12-09 15:58:31 -08:00
David Rowe
deb60f66d0 Update API status 2019-12-10 09:20:12 +13:00
David Rowe
b7af7fe1ab OffscreenFlags JSDoc 2019-12-10 09:14:59 +13:00
David Rowe
204215c573 Typo 2019-12-10 07:49:37 +13:00
David Rowe
3a48a97a90 AddressManager JSDoc 2019-12-10 07:34:17 +13:00
Kasen IO
3e6660b633 Updated whitelist debugs for clarity in dev log 2019-12-09 08:30:02 -05:00
Kasen IO
2de388ab3b Fixes bug where empty "" whitespace allows all scripts. 2019-12-09 01:20:04 -05:00
Kasen IO
fe66dc82f3 scriptengine pulls from inferface.json correctly, removed extra debug, fixed QML to load to textarea correctly. 2019-12-08 23:11:21 -05:00
Kasen IO
f49e64b99f Cleaned out extra commented code. 2019-12-08 21:12:20 -05:00
Kasen IO
2e36c40912 added QML + C++ system for whitelists 2019-12-07 21:37:23 -05:00
David Rowe
4d4e9d32de Update JSDoc 2019-12-08 12:38:48 +13:00