HifiExperiments
|
bdbb88084b
|
CR
|
2021-07-05 21:02:40 -07:00 |
|
HifiExperiments
|
9514ade844
|
add reference materials and support reference texture changes
|
2021-03-15 21:21:32 -07:00 |
|
HifiExperiments
|
c47351c4f2
|
merge with master
|
2021-02-25 19:39:09 -08:00 |
|
HifiExperiments
|
826eb709ce
|
more work on materials
|
2021-02-25 19:03:42 -08:00 |
|
HifiExperiments
|
186f505b15
|
images support materials
|
2021-02-24 20:56:14 -08:00 |
|
HifiExperiments
|
25e4f59d55
|
gizmos have materials, working on images
|
2021-02-23 20:54:57 -08:00 |
|
HifiExperiments
|
852edec9e7
|
entities with billboardMode != none use local rotation so parent rotation doesn't affect them
|
2021-02-18 22:15:12 -08:00 |
|
HifiExperiments
|
92ea14a059
|
proper render bounds for models (need to pass RenderArgs to getBound everywhere)
|
2021-01-17 22:08:06 -08:00 |
|
HifiExperiments
|
6e0bad814e
|
working on billboard mode for all entity types
|
2021-01-03 20:33:08 -08:00 |
|
HifiExperiments
|
a7e6332c0e
|
fix alpha material bug
|
2020-11-04 22:09:11 -08:00 |
|
HifiExperiments
|
5a8c1a0374
|
starting improve entity updates pt 2
|
2020-10-12 18:50:46 -07:00 |
|
HifiExperiments
|
56d359f2ba
|
Merge remote-tracking branch 'upstream/master' into parenting
|
2020-06-14 17:30:26 -07:00 |
|
HifiExperiments
|
ebc9dae78d
|
Merge branch 'master' into parenting
|
2020-05-07 13:35:32 -07:00 |
|
HifiExperiments
|
3bf690571c
|
Merge branch 'master' into zoneOcclusion
|
2020-05-07 13:13:20 -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 |
|
Kasen IO
|
1f01beba70
|
Fixed patch issues
|
2019-12-13 12:29:08 -05:00 |
|
SamGondelman
|
1736252f0d
|
trying and failing to fix models
|
2019-12-12 23:04:47 -05:00 |
|
HifiExperiments
|
3dfd63d46b
|
merge with master
|
2019-11-26 20:42:44 -08:00 |
|
Andrew Meadows
|
9d92546a8b
|
revert the revert of PR-16307
|
2019-11-14 09:59:43 -08:00 |
|
Brad Hefta-Gaub
|
51669e1ac3
|
Revert "DEV-1811: apply deletion rules to linked entities"
|
2019-10-11 11:06:10 -07:00 |
|
Andrew Meadows
|
470a45c012
|
EntityItem::_owningAvatarID always AVATAR_SELF_ID for MyAvatar's entities
|
2019-10-07 14:38:36 -07:00 |
|
HifiExperiments
|
1b84244210
|
merge with master
|
2019-08-05 09:35:56 -07:00 |
|
HifiExperiments
|
7b29f0f718
|
reduce locking necessary for render updates
|
2019-07-31 11:21:29 -07:00 |
|
HifiExperiments
|
078ca7edea
|
supporting text effects + fonts on text entities
|
2019-07-30 09:59:45 -07:00 |
|
Sam Gondelman
|
a64d307bdf
|
make sure we don't have transparent shadow casters
|
2019-07-10 14:21:56 -07:00 |
|
SamGondelman
|
9a866a129d
|
fix text visibility toggle
|
2019-07-10 10:20:27 -07:00 |
|
SamGondelman
|
fa416adaf6
|
adding unlit property to text, fixing transparency, normals, other cleanup
|
2019-07-02 10:28:36 -07:00 |
|
sabrina-shanman
|
03a8e77ade
|
Move RenderItemStatusIcon to Item.h
|
2019-05-20 12:07:41 -07:00 |
|
sabrina-shanman
|
5aff4d9f69
|
Update comment on render item status
|
2019-05-20 11:58:55 -07:00 |
|
SamGondelman
|
0bcd8b81e1
|
trying and failing to fix models
|
2019-05-01 12:01:49 -07:00 |
|
SamGondelman
|
27338c3639
|
fix cauterization of entities that are children of MyAvatar's head
|
2019-04-08 19:48:11 -07:00 |
|
danteruiz
|
8115ef6d36
|
addressing more requested changes
|
2019-04-01 16:46:15 -07:00 |
|
danteruiz
|
db17f094da
|
adding entities to fade out list;
|
2019-03-29 15:23:16 -07:00 |
|
SamGondelman
|
c8ffb130a3
|
only update sub items on change
|
2019-02-19 17:38:47 -08:00 |
|
SamGondelman
|
6765268998
|
Merge remote-tracking branch 'upstream/master' into wearables
|
2019-02-19 16:52:00 -08:00 |
|
SamGondelman
|
06ac2b291b
|
attachments and wearables cull with avatar parent
|
2019-02-17 17:52:10 -08:00 |
|
SamGondelman
|
bed2732d34
|
start moving materials to rendering only
|
2019-02-14 12:59:16 -08:00 |
|
SamGondelman
|
13cb70a6a5
|
Merge remote-tracking branch 'upstream/master' into NOverlays12
|
2019-01-28 11:37:15 -08:00 |
|
SamGondelman
|
ac513df103
|
ring gizmo entities
|
2019-01-23 17:46:04 -08:00 |
|
SamGondelman
|
62b853816a
|
deprecate the new property so that people hopefully don't use it
|
2019-01-16 19:35:15 -08:00 |
|
SamGondelman
|
611998f799
|
add pulse group properties to shapes, particles, text, web, image, and grid
|
2019-01-16 13:34:10 -08:00 |
|
SamGondelman
|
1b5c1d0677
|
working on primitiveMode and groupCulled
|
2019-01-08 10:02:03 -08:00 |
|
SamGondelman
|
b609cfaa2b
|
renderLayer
|
2019-01-07 15:43:35 -08:00 |
|
SamGondelman
|
6094a2f0a0
|
add back line entities, undo polyline changes temporarily
|
2018-12-14 15:41:11 -08:00 |
|
SamGondelman
|
5dd00bed1d
|
new improved polylines
|
2018-12-14 14:15:56 -08:00 |
|
Sam Gondelman
|
d21d764131
|
Merge branch 'master' into NOverlays4
|
2018-12-06 12:48:05 -08:00 |
|
SamGondelman
|
305cb6d323
|
grid entities
|
2018-12-03 18:04:34 -08:00 |
|
SamGondelman
|
98f9dc0ca4
|
remove grid entity files
|
2018-12-03 12:07:26 -08:00 |
|