HifiExperiments
|
81940214bb
|
Revert "Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine""
|
2020-11-16 21:20:25 -08:00 |
|
kasenvr
|
21f8eac936
|
Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine"
|
2020-11-16 22:35:46 -05:00 |
|
HifiExperiments
|
3b2c219e53
|
possibly more robust fix?
|
2020-11-10 21:39:15 -08:00 |
|
HifiExperiments
|
b3e9c1e8f8
|
Merge remote-tracking branch 'upstream/master' into scriptEngine
|
2020-11-09 22:00:11 -08:00 |
|
Dale Glass
|
2fac1ddf2c
|
Add missing 'override'
Fixes:
warning: ‘virtual void render::entities::GizmoEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer&, render::Transaction&, const TypedEntityPointer&)’ can be marked override [-Wsuggest-override]
|
2020-09-26 22:58:44 +02:00 |
|
kasenvr
|
87d4fddb40
|
Merge branch 'master' into feature/transparent-web-entities
|
2020-09-26 01:25:02 -04:00 |
|
kasenvr
|
dd3152a2e4
|
Merge pull request #349 from daleglass/fix_warnings
Fix warnings emitted by GCC
|
2020-09-24 17:06:16 -04:00 |
|
HifiExperiments
|
ae944fd985
|
merge with master
|
2020-09-01 09:34:54 -07:00 |
|
HifiExperiments
|
2e4a6ee1b5
|
fix build errors
|
2020-08-28 11:22:08 -07:00 |
|
HifiExperiments
|
2a1857e9ec
|
split entity script engines into two
|
2020-08-27 16:50:32 -07:00 |
|
Dale Glass
|
5a8be4de4b
|
Fix -Wclass-memaccess warnings
|
2020-08-27 19:49:48 +02:00 |
|
Dale Glass
|
afa44dccf6
|
Fix initialization order warning
https://stackoverflow.com/questions/30364585/will-be-initialized-after-wreorder
|
2020-08-27 19:27:11 +02:00 |
|
HifiExperiments
|
af82860751
|
fix shape issue that alezia found
|
2020-08-19 19:51:16 -07:00 |
|
Kasen IO
|
103288b8de
|
Update bool name "isTransparentWeb" -> "transparent"
|
2020-08-18 20:04:27 -04:00 |
|
Kasen IO
|
204789bd42
|
Further fix up web entity property processing on reload.
Co-Authored-By: null <HifiExperiments@users.noreply.github.com>
|
2020-08-18 19:22:54 -04:00 |
|
Kasen IO
|
8d904d39ce
|
Semi-working fixes for updates to web entities.
Co-Authored-By: null <HifiExperiments@users.noreply.github.com>
|
2020-08-18 04:17:29 -04:00 |
|
Kasen IO
|
c379f6c92f
|
Fix transparency check bug.
Co-Authored-By: null <HifiExperiments@users.noreply.github.com>
|
2020-08-18 03:21:34 -04:00 |
|
Kasen IO
|
b05cb8b6ac
|
useBackground property added.
|
2020-08-18 01:48:27 -04:00 |
|
HifiExperiments
|
e78ece7fc5
|
CR
|
2020-08-17 14:16:41 -07:00 |
|
Kasen IO
|
cd5bdf6160
|
Added transparent + colored background web entity capability dynamically.
|
2020-08-15 00:56:19 -04:00 |
|
Kasen IO
|
21167a0f6a
|
Maybe fix scriptURL on WebEntities bug
|
2020-08-14 23:53:01 -04:00 |
|
HifiExperiments
|
0d62798860
|
Merge remote-tracking branch 'upstream/master' into parenting
|
2020-08-04 08:52:13 -07:00 |
|
kasenvr
|
ce6573333c
|
Merge pull request #543 from HifiExperiments/alpha
Fix shape alpha 0 issue
|
2020-07-23 17:23:20 -04:00 |
|
HifiExperiments
|
aa6eedf0fe
|
make sure render with zones works on models on restart/reload
|
2020-07-21 12:06:38 -07:00 |
|
HifiExperiments
|
e635d0ff87
|
fix alpha 0 issue
|
2020-07-16 15:29:58 -07:00 |
|
HifiExperiments
|
c9684b8c6d
|
Merge remote-tracking branch 'upstream/master' into parenting
|
2020-07-10 11:43:03 -07:00 |
|
HifiExperiments
|
11ad64c606
|
properly pause particles when you look away
|
2020-07-01 14:37:09 -07:00 |
|
HifiExperiments
|
56d359f2ba
|
Merge remote-tracking branch 'upstream/master' into parenting
|
2020-06-14 17:30:26 -07: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 |
|
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
|
c5fdacf975
|
Merge pull request #301 from HifiExperiments/modelBackface
Models support flipped normals on double sided geometry
|
2020-05-13 16:06:26 -04:00 |
|
HifiExperiments
|
8f9c180243
|
Merge remote-tracking branch 'origin/parenting' into modelShader
|
2020-05-07 13:43:20 -07:00 |
|
HifiExperiments
|
405d557725
|
Merge branch 'master' into blendshapes
|
2020-05-07 13:38:59 -07:00 |
|
HifiExperiments
|
ebc9dae78d
|
Merge branch 'master' into parenting
|
2020-05-07 13:35:32 -07:00 |
|
HifiExperiments
|
8017e30ab9
|
Merge branch 'master' into blendshapes
|
2020-05-07 13:27:22 -07:00 |
|
HifiExperiments
|
3bf690571c
|
Merge branch 'master' into zoneOcclusion
|
2020-05-07 13:13:20 -07:00 |
|
HifiExperiments
|
b6cb1fcfe7
|
fix procedural applying to other things
|
2020-04-22 16:36:51 -07:00 |
|
HifiExperiments
|
420af95131
|
models support flipped normals on double sided geometry
|
2020-04-16 16:18:39 -07: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
|
eb26d9b4e3
|
working on parenting fixes
|
2020-04-06 13:41:01 -07: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 |
|
|
|
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 |
|
HifiExperiments
|
bc319cb340
|
zone occlusion
|
2020-01-11 22:29:07 -08:00 |
|
HifiExperiments
|
b40a468b4c
|
fix EOF
|
2020-01-06 18:31:35 -08:00 |
|
HifiExperiments
|
ef8f085b47
|
support blendshapes on model entities
|
2020-01-05 02:37:44 -08:00 |
|
Kasen IO
|
c34cd996df
|
change Metaverse API from setting
|
2019-12-20 11:39:05 +01: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 |
|
