HifiExperiments
|
9a5b956968
|
Apply suggestions from code review
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
|
2020-11-27 15:11:18 -08:00 |
|
HifiExperiments
|
7bfbf3c99c
|
Merge remote-tracking branch 'upstream/master' into update
|
2020-11-09 19:33:38 -08:00 |
|
HifiExperiments
|
ccd5ef80b3
|
remove isActive, fix contains, maybe fix green box issue
|
2020-11-09 19:14:30 -08:00 |
|
HifiExperiments
|
c8532a1ac5
|
another unused variable
|
2020-11-04 22:21:24 -08:00 |
|
Dale Glass
|
3284313399
|
Mark font textures as something that shouldn't be downscaled
|
2020-10-27 18:24:08 +01:00 |
|
HifiExperiments
|
c664991f6f
|
models seem to be working!
|
2020-10-20 15:06:21 -07:00 |
|
HifiExperiments
|
9142b7123d
|
collisions and dimensions seem to be working
|
2020-10-13 16:27:48 -07:00 |
|
HifiExperiments
|
5a8c1a0374
|
starting improve entity updates pt 2
|
2020-10-12 18:50:46 -07: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 |
|
Dale Glass
|
e6bd75d497
|
Fix incorrect fall-through in RenderPipelines
|
2020-08-27 19:27:11 +02:00 |
|
HifiExperiments
|
e78ece7fc5
|
CR
|
2020-08-17 14:16:41 -07:00 |
|
HifiExperiments
|
87fd039f99
|
fix merge issue
|
2020-08-04 08:54:44 -07:00 |
|
HifiExperiments
|
0d62798860
|
Merge remote-tracking branch 'upstream/master' into parenting
|
2020-08-04 08:52:13 -07:00 |
|
kasenvr
|
80d3e3c455
|
Merge pull request #520 from kasenvr/fix/move-user-agent
Fix/move user agent
|
2020-07-23 17:13:18 -04:00 |
|
HifiExperiments
|
aa6eedf0fe
|
make sure render with zones works on models on restart/reload
|
2020-07-21 12:06:38 -07:00 |
|
Kasen IO
|
4b1e82fc0b
|
Move user agent to networking constants.
|
2020-07-08 14:18:24 -04:00 |
|
HifiExperiments
|
56d359f2ba
|
Merge remote-tracking branch 'upstream/master' into parenting
|
2020-06-14 17:30:26 -07:00 |
|
Kasen IO
|
21fd10d154
|
Revert commit 359248829c using -m 1 to temporarily fix issue 383.
|
2020-06-03 16:08:18 -04:00 |
|
kasenvr
|
1a46b28b71
|
Merge pull request #62 from HifiExperiments/blendshapes
Support blendshapes on model entities
|
2020-05-31 18:34:42 -04:00 |
|
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 |
|
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
|
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 |
|
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
|
bc319cb340
|
zone occlusion
|
2020-01-11 22:29:07 -08:00 |
|
HifiExperiments
|
ef8f085b47
|
support blendshapes on model entities
|
2020-01-05 02:37:44 -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 |
|
Kasen IO
|
9839b23061
|
Made Sam's graphics patches work with 86 K2.
|
2019-12-13 02:38:14 -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
|
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 |
|
|
|
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 |
|
HifiExperiments
|
400b771a1a
|
fix shadows!!
|
2019-12-05 01:41:56 -08:00 |
|
