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 |
|
Kasen IO
|
e101535106
|
Add link to top of Entites API docs for the list of entity types.
|
2020-03-18 14:58:32 -04:00 |
|
kasenvr
|
48ae156db7
|
Merge pull request #104 from daleglass/implicit_copy_constructor
Make default copy constructors explicit
|
2020-02-08 14:45:44 -05:00 |
|
Kasen IO
|
08ec9ef3b7
|
Various URL updates + window title update.
|
2020-02-05 15:25:51 -05:00 |
|
Dale Glass
|
68d10a2fe1
|
Make default copy constructors explicit
Recent versions of gcc generate a warning without this
|
2020-01-19 00:20:49 +01:00 |
|
|
|
f5fcb90cac
|
Revert "Removed obsolete default scripts + more branding changes."
|
2020-01-16 18:51:49 -06: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
|
336b5e275b
|
Removed obsolete default scripts + more branding changes.
|
2020-01-12 23:13:01 -05:00 |
|
Kasen IO
|
c34cd996df
|
change Metaverse API from setting
|
2019-12-20 11:39:05 +01:00 |
|
David Rowe
|
8255a50cde
|
Update MeshProxy and Entities.getMeshes() JSDoc
|
2019-12-20 13:34:21 +13: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
|
f8a9789f86
|
Merge pull request #16499 from HifiExperiments/proceduralMesh
Procedural vertex shaders
|
2019-12-13 13:00:01 -08:00 |
|
Brad Hefta-Gaub
|
2d56d7c026
|
Merge pull request #16551 from ctrlaltdavid/DEV-1943
DEV-1943: Make MyAvatar.getAvatarEntityData() return all properties
|
2019-12-13 10:53:24 -08:00 |
|
Kasen IO
|
1f01beba70
|
Fixed patch issues
|
2019-12-13 12:29:08 -05:00 |
|
Kasen IO
|
9839b23061
|
Made Sam's graphics patches work with 86 K2.
|
2019-12-13 02:38:14 -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 |
|
SamGondelman
|
1736252f0d
|
trying and failing to fix models
|
2019-12-12 23:04:47 -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 |
|
David Rowe
|
65bba26dfb
|
EntityScriptServerLog API
|
2019-12-11 19:22:28 +13:00 |
|
David Rowe
|
c7f82a8264
|
Add new MyAvatar.getAvatarEntityData() implementation for API
|
2019-11-28 17:10:19 +13:00 |
|
HifiExperiments
|
3dfd63d46b
|
merge with master
|
2019-11-26 20:42:44 -08:00 |
|
Simon Walton
|
6b371ec388
|
Changes to avatar mixer to use screenshare zones
|
2019-11-25 18:30:53 -08:00 |
|
Simon Walton
|
6e23924ed9
|
Add screenshare zone-property - WIP
|
2019-11-25 13:22:35 -08:00 |
|
Maia Hansen
|
6169936c2b
|
Merge pull request #16512 from AndrewMeadows/time-moves-forward
DEV-2585: fix for whiteboard poly lines getting their parentID incorrectly reverted
|
2019-11-19 12:34:53 -08:00 |
|
Andrew Meadows
|
0bccc38906
|
remove one call to usecTimestampNow()
|
2019-11-19 08:52:14 -08:00 |
|
Andrew Meadows
|
3b8275c240
|
_lastEdited can only increase or be reset
|
2019-11-19 08:44:33 -08:00 |
|
Andrew Meadows
|
08263b2672
|
add helpful comment about mysterious code
|
2019-11-19 08:42:28 -08:00 |
|
Sabrina Shanman
|
518d6a530a
|
Merge pull request #16507 from highfidelity/master
Merge master into instancing
|
2019-11-18 13:54:33 -08:00 |
|
Sam Gateau
|
6370059a96
|
Merge pull request #16483 from AndrewMeadows/debug-workload-selection
Add tools for debugging entity workload proxies
|
2019-11-18 11:02:00 -08:00 |
|
HifiExperiments
|
b73a608094
|
procedural vertex shaders
|
2019-11-15 00:22:40 -08:00 |
|
Andrew Meadows
|
ec872bfcf8
|
remove unused variable
|
2019-11-14 09:59:43 -08:00 |
|
Andrew Meadows
|
b5ca93a019
|
remove redundant checks in 'if' clause
|
2019-11-14 09:59:43 -08:00 |
|
Andrew Meadows
|
b231dadba5
|
add check for local-entity when changing phys properties
|
2019-11-14 09:59:43 -08:00 |
|
Andrew Meadows
|
28f51f6204
|
add comments
|
2019-11-14 09:59:43 -08:00 |
|
Andrew Meadows
|
de44cdaf25
|
remove unnecessary check in if clause
|
2019-11-14 09:59:43 -08:00 |
|
Andrew Meadows
|
039f7cae13
|
avoid Qt container in another spot
|
2019-11-14 09:59:43 -08:00 |
|
Andrew Meadows
|
3546bab19a
|
use std::vector<> instead of QVector<>
|
2019-11-14 09:59:43 -08:00 |
|
Andrew Meadows
|
fb090d1388
|
force delete OtherAvatar entities when necessary
|
2019-11-14 09:59:43 -08:00 |
|
Andrew Meadows
|
4159bc4862
|
abide by domain-entity hierarchy deletion rules
|
2019-11-14 09:59:43 -08:00 |
|
Andrew Meadows
|
4e6a647718
|
don't restrict edit properties of myAvatarEntity
|
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 |
|
Andrew Meadows
|
cf08a4162a
|
add workload job to help debug entity proxies
|
2019-11-12 10:35:16 -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 |
|
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
|
3e8d6671f7
|
Merge branch 'instancing' of github.com:highfidelity/hifi into instancing
|
2019-10-10 09:04:22 -07:00 |
|
Sam Gateau
|
abaf0262a7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into instancing
|
2019-10-08 18:55:51 -07:00 |
|
Andrew Meadows
|
960646f117
|
skip delete entities not in the tree
|
2019-10-08 16:12:14 -07:00 |
|
