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 |
|
David Rowe
|
ec1e6bc7d3
|
Merge branch 'DOC-55-C' into api-docs
|
2020-01-14 18:04:32 +13:00 |
|
David Rowe
|
a92830f2c1
|
Miscellaneous JSDoc fixes
|
2019-12-23 09:09:27 +13:00 |
|
Kasen IO
|
c34cd996df
|
change Metaverse API from setting
|
2019-12-20 11:39:05 +01:00 |
|
David Rowe
|
a04e57d82d
|
Miscellaneous JSDoc fixes noticed in passing
|
2019-12-19 11:38:17 +13: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 |
|
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
|
5fc55d1763
|
Merge branch 'master' into cullFace
|
2019-12-11 00:49:58 -08:00 |
|
HifiExperiments
|
69714a89ca
|
material entities support cullFaceMode and support gltf doubleSided
|
2019-11-26 14:48:48 -08:00 |
|
David Rowe
|
c998148589
|
Revise recent changes to Entities.Material JSDoc
|
2019-11-26 17:43:41 +13:00 |
|
David Rowe
|
fafb3dd30b
|
MaterialCache JSDoc
|
2019-11-26 17:43:23 +13:00 |
|
David Rowe
|
5eb6e9dadd
|
Add recently added properties to caches' JSDoc
|
2019-11-26 17:00:13 +13:00 |
|
HifiExperiments
|
b73a608094
|
procedural vertex shaders
|
2019-11-15 00:22:40 -08:00 |
|
sabrina-shanman
|
7b14c00540
|
Merge branch 'master' into instancing
|
2019-11-05 10:22:24 -08:00 |
|
HifiExperiments
|
deb5aacfad
|
fix materialcachescriptinginterface
|
2019-10-25 18:16:08 -07:00 |
|
HifiExperiments
|
1e100a672e
|
merge with master and try to fix opacity mode stuff
|
2019-10-23 22:21:45 -07:00 |
|
HifiExperiments
|
97b9179144
|
merge with master
|
2019-09-05 00:46:56 -07:00 |
|
Sam Gateau
|
4a93b23d83
|
Address the procedural to populate all reflection versions with user uniforms bindings and make EnigneInspector works correctly
|
2019-08-13 18:47:57 -07:00 |
|
Sam Gateau
|
0b470b9ab8
|
Fixing the bad location assignment on gl41 on windows with Austin's help
|
2019-08-13 00:22:17 -07:00 |
|
SamGondelman
|
60600779c9
|
merge with master
|
2019-07-12 11:01:17 -07:00 |
|
SamGondelman
|
d545ba5bc6
|
haze on most entities, working on skybox
|
2019-07-10 23:52:50 -07:00 |
|
SamGondelman
|
9c1b139d5f
|
merge with master
|
2019-06-25 23:46:39 -07:00 |
|
SamGondelman
|
37feb7f027
|
merge with master
|
2019-06-10 10:29:39 -07:00 |
|
Sam Gondelman
|
16a56dc1ec
|
Merge branch 'master' into proceduralMesh
|
2019-06-04 09:56:25 -07:00 |
|
SamGondelman
|
4eeff52746
|
add version to texmeta.json files, fallback to original file if version has changed for skyboxes
|
2019-05-21 15:30:28 -07:00 |
|
SamGondelman
|
6d3e23a7fe
|
merge with master
|
2019-05-16 20:03:10 -07:00 |
|
SamGondelman
|
de90c5088c
|
(✿◠‿◠)
|
2019-05-16 19:33:07 -07:00 |
|
SamGondelman
|
3eac2cf1d6
|
(づ｡◕‿‿◕｡)づ
|
2019-05-16 18:31:45 -07:00 |
|
SamGondelman
|
da254c2ccc
|
(¬‿¬)
|
2019-05-15 23:48:04 -07:00 |
|
SamGondelman
|
eb8c722080
|
fix runtime switch
|
2019-05-13 09:58:55 -07:00 |
|
SamGondelman
|
de5643b5b9
|
quint64 -> uint64_t
|
2019-03-25 10:33:32 -07:00 |
|
SamGondelman
|
4fd2c4449d
|
new procedural uniforms for time
|
2019-03-21 12:15:03 -07:00 |
|
SamGondelman
|
13ece79476
|
merge with master
|
2019-02-13 16:30:22 -08:00 |
|
sabrina-shanman
|
b2af6d1374
|
Have only one ColorChannel enum as header in image library
|
2019-02-12 16:14:41 -08:00 |
|
sabrina-shanman
|
2b355e9d52
|
Re-name ColorChannelMapping to ColorChannel and put versions in two specific libraries rather than shared
|
2019-02-12 11:56:44 -08:00 |
|
SamGondelman
|
77a8ddb3f0
|
Merge remote-tracking branch 'upstream/master' into materialMapping
|
2019-02-11 16:35:05 -08:00 |
|
SamGondelman
|
f7a487a020
|
move materialcache et al to material-networking library
|
2019-02-08 10:28:07 -08:00 |
|
SamGondelman
|
4c9fb168c7
|
enable backface culling on procedurals
|
2019-02-06 10:55:36 -08:00 |
|
SamGondelman
|
93e32f1bd5
|
fix skybox depth testing
|
2019-01-30 12:25:48 -08:00 |
|
SamGondelman
|
835615fbbd
|
separate out v3 and v4
|
2018-12-20 16:33:13 -08:00 |
|
Sam Gondelman
|
7936dd1ac4
|
fix build errors again
|
2018-11-28 23:01:02 -08:00 |
|
Sam Gondelman
|
66d77d2df8
|
fix build error 2
|
2018-11-28 21:45:50 -08:00 |
|
Sam Gondelman
|
dc32472bd6
|
fix build error
|
2018-11-28 20:42:45 -08:00 |
|
SamGondelman
|
2acb6b6857
|
v3 procedurals and shader fixes
|
2018-11-28 17:58:27 -08:00 |
|
Brad Davis
|
b7c567af08
|
Fix procedurals using the iGlobalTime input
|
2018-11-14 15:28:22 -08:00 |
|
Roxanne Skelly
|
cef7000a72
|
Case 19754 - Remove logging URLs and related file locations.
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
|
2018-11-06 16:24:32 -08:00 |
|
Brad Davis
|
5a43462218
|
Remove unneeded shader directive
|
2018-10-23 10:40:12 -07:00 |
|
