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 |
|
|
|
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 |
|
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 |
|
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 |
|
Kasen IO
|
1f01beba70
|
Fixed patch issues
|
2019-12-13 12:29:08 -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 |
|
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 |
|
HifiExperiments
|
e0a29d9367
|
material entities support cullFaceMode and support gltf doubleSided
|
2019-12-12 23:01:57 -05:00 |
|
HifiExperiments
|
6e961b9f2f
|
procedural vertex shaders
Signed-off-by: Kasen IO <kasenvr@gmail.com>
|
2019-12-12 22:49:48 -05:00 |
|
HifiExperiments
|
2eb0ec18fc
|
fix non-procedural material entity crash
|
2019-12-11 00:42:59 -08:00 |
|
HifiExperiments
|
400b771a1a
|
fix shadows!!
|
2019-12-05 01:41:56 -08:00 |
|
HifiExperiments
|
413bf10f79
|
stupid, shadows still broken
|
2019-11-26 22:28:06 -08:00 |
|
HifiExperiments
|
3dfd63d46b
|
merge with master
|
2019-11-26 20:42:44 -08:00 |
|
HifiExperiments
|
69714a89ca
|
material entities support cullFaceMode and support gltf doubleSided
|
2019-11-26 14:48:48 -08:00 |
|
Sabrina Shanman
|
518d6a530a
|
Merge pull request #16507 from highfidelity/master
Merge master into instancing
|
2019-11-18 13:54:33 -08:00 |
|
HifiExperiments
|
b73a608094
|
procedural vertex shaders
|
2019-11-15 00:22:40 -08:00 |
|
Andrew Meadows
|
dbeea4038d
|
remove unused argument
|
2019-11-14 09:59:43 -08:00 |
|
Andrew Meadows
|
9d92546a8b
|
revert the revert of PR-16307
|
2019-11-14 09:59:43 -08:00 |
|
sabrina-shanman
|
516debdcb2
|
Fix code style / remove cruft
|
2019-11-13 12:50:13 -08:00 |
|
sabrina-shanman
|
a42e09aef8
|
Fix unused variables/implicit type conversions
|
2019-11-08 10:04:34 -08:00 |
|
sabrina-shanman
|
33bb0e2b19
|
Change RenderableModelEntityItem::computeShapeInfo to support new HFM format
|
2019-11-05 14:44:23 -08:00 |
|
sabrina-shanman
|
da5f80c139
|
Use std::vector types in ShapeInfo
|
2019-11-05 10:57:55 -08:00 |
|
Sam Gateau
|
7af0940846
|
getting coision to work
|
2019-11-05 10:57:54 -08:00 |
|
sabrina-shanman
|
7b14c00540
|
Merge branch 'master' into instancing
|
2019-11-05 10:22:24 -08:00 |
|
HifiExperiments
|
1e100a672e
|
merge with master and try to fix opacity mode stuff
|
2019-10-23 22:21:45 -07:00 |
|
Sam Gateau
|
695b9cdba6
|
Clening up left over comments and typos, simplify the code to update Matrices in the model classes and removed renderITemsIdMap because not needed, chasing the problem of the physics objects transform
|
2019-10-18 03:31:06 -07:00 |
|
Brad Hefta-Gaub
|
51669e1ac3
|
Revert "DEV-1811: apply deletion rules to linked entities"
|
2019-10-11 11:06:10 -07:00 |
|
Maia Hansen
|
07b916f0b7
|
Merge pull request #16307 from AndrewMeadows/colossal-cave
DEV-1811: apply deletion rules to linked entities
|
2019-10-10 13:24:43 -07:00 |
|
Sam Gateau
|
abaf0262a7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into instancing
|
2019-10-08 18:55:51 -07:00 |
|
RebeccaStankus
|
458d3bfb48
|
Renamed variable and made it private
|
2019-10-08 13:47:06 -07:00 |
|
RebeccaStankus
|
092424569d
|
Added flag to ensure mouse event signals are not connected twice
|
2019-10-08 12:01:47 -07:00 |
|
Sam Gateau
|
521ce3936b
|
I changed names! Renaming the Geometry to NetworkModel, the GeometryResource to ModelResource, i think there is no need for the 2, only one would be enough in my opinion...
|
2019-10-07 15:19:23 -07:00 |
|
Andrew Meadows
|
8ab70225d9
|
apply delete rules down linked hierarchy
|
2019-10-07 14:38:36 -07:00 |
|
Andrew Meadows
|
470a45c012
|
EntityItem::_owningAvatarID always AVATAR_SELF_ID for MyAvatar's entities
|
2019-10-07 14:38:36 -07:00 |
|
Sam Gateau
|
42bc91b389
|
Merge branch 'master' of github.com:highfidelity/hifi into instancing
|
2019-10-07 09:42:14 -07:00 |
|
Zach Fox
|
5f1c389d1c
|
DEV-611: Ensure that entities with the property set can be clicked in Desktop and VR modes
|
2019-10-03 09:45:23 -07:00 |
|
Sam Gateau
|
1d19671e88
|
Merge branch 'master' of github.com:highfidelity/hifi into instancing
|
2019-10-01 11:27:16 -07:00 |
|
Sam Gateau
|
9d999baab2
|
FIrst pass to clean up before pushing a pr:
|
2019-09-26 11:59:01 -07:00 |
|
Sam Gateau
|
dc40c530a3
|
INstrumenting the code more...
|
2019-09-25 17:53:59 -07:00 |
|
Sam Gateau
|
c0660329a3
|
Exposing the REsource Caches through a bit of ui, adding MaterialCache to the family
|
2019-09-17 18:06:08 -07:00 |
|
Sam Gateau
|
3d199ff444
|
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
|
2019-09-16 21:34:56 -07:00 |
|
Sam Gateau
|
18226e64f8
|
Add a read lock where we think it s needed and banging my head on the problem
|
2019-09-16 18:06:43 -07:00 |
|
sabrina-shanman
|
76b1f551b1
|
Merge branch 'master' into instancing
|
2019-09-16 10:17:59 -07:00 |
|
sabrina-shanman
|
a166b41216
|
Fix build warnings/errors
|
2019-09-13 15:39:29 -07:00 |
|
Shannon Romano
|
79d845d127
|
Merge pull request #16190 from danteruiz/fix-html
BUGZ-1398: HMD Tablet Apps blocked by Web access error
|
2019-09-13 12:35:29 -07:00 |
|
danteruiz
|
8491a37923
|
fixing WebEntities html
|
2019-09-13 09:57:51 -07:00 |
|
