Kalila
|
053548cd14
|
Merge pull request #1033 from HifiExperiments/skyboxShape
Non-uniformly scaled sphere zones and models behave like ellipsoids (and fix EntityItem::contains sphere case)
|
2021-03-03 16:15:47 -05: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
|
f9b88c68e0
|
treat non-uniform spheres as ellipsoids everywhere
|
2021-02-15 21:13:58 -08:00 |
|
HifiExperiments
|
51bf54c703
|
fix EntityItem::contains sphere case
|
2021-02-12 12:27:35 -08:00 |
|
HifiExperiments
|
ae26416c59
|
Merge branch 'master' into billboard
|
2021-02-09 22:57:10 -08:00 |
|
HifiExperiments
|
bb898aac33
|
non-exact collisions should work on models with pivots and useOriginalPivot=true
|
2021-01-21 21:05:00 -08:00 |
|
HifiExperiments
|
1f71a23082
|
optimize picking
|
2021-01-17 13:09:09 -08:00 |
|
HifiExperiments
|
2a27fc4de2
|
billboarding for model entities
|
2021-01-13 22:31:21 -08:00 |
|
HifiExperiments
|
bef0c79b67
|
billboard mode working on most entity types
|
2021-01-10 16:03:04 -08:00 |
|
HifiExperiments
|
6e0bad814e
|
working on billboard mode for all entity types
|
2021-01-03 20:33:08 -08:00 |
|
HifiExperiments
|
5dc45e895c
|
more fixes and create checkbox defaults to checked
|
2021-01-02 19:18:54 -08:00 |
|
HifiExperiments
|
20e0c24163
|
cleanup + create
|
2021-01-02 00:04:24 -08:00 |
|
HifiExperiments
|
7069e48073
|
working on pivot
|
2020-12-16 21:01:56 -08:00 |
|
HifiExperiments
|
44b34e0341
|
what about...this
|
2020-10-14 13:21:07 -07:00 |
|
HifiExperiments
|
8274ee3ca9
|
put back old last edited logic
|
2020-07-20 15:10:48 -07:00 |
|
HifiExperiments
|
a7861855a7
|
properties update over wire
|
2020-07-16 14:34:02 -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
|
6eacc5c8c2
|
Merge remote-tracking branch 'upstream/kasen/core' into zoneOcclusion
|
2020-04-03 14:37:14 -07: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 |
|
HifiExperiments
|
bc319cb340
|
zone occlusion
|
2020-01-11 22:29:07 -08:00 |
|
Kasen IO
|
c34cd996df
|
change Metaverse API from setting
|
2019-12-20 11:39:05 +01: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
|
3b8275c240
|
_lastEdited can only increase or be reset
|
2019-11-19 08:44:33 -08:00 |
|
Andrew Meadows
|
b5ca93a019
|
remove redundant checks 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
|
4159bc4862
|
abide by domain-entity hierarchy deletion rules
|
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 |
|
Brad Hefta-Gaub
|
51669e1ac3
|
Revert "DEV-1811: apply deletion rules to linked entities"
|
2019-10-11 11:06:10 -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 |
|
Zach Fox
|
b39e527b5b
|
DEV-555: Ensure 'href' entity property supports relative paths (coordinates and named paths)
|
2019-09-10 11:57:02 -07:00 |
|
Andrew Meadows
|
227b99859d
|
fix api for checking EntityItem grab status
|
2019-09-06 17:23:38 -07:00 |
|
HifiExperiments
|
62bb4e1d46
|
simplify render update check, threadsafety
|
2019-07-31 21:02:21 -07:00 |
|
HifiExperiments
|
7b29f0f718
|
reduce locking necessary for render updates
|
2019-07-31 11:21:29 -07:00 |
|
Shannon Romano
|
c677f71650
|
Merge pull request #15514 from zfox23/privateUserData
New Entity Property: Private User Data
|
2019-05-14 10:24:39 -07:00 |
|
Seth Alves
|
8b2d12e2f7
|
when an avatar entity is deleted, also delete its descendants
|
2019-05-13 17:33:10 -07:00 |
|
Zach Fox
|
2ce9e9ee10
|
The right way to restrict private user data:
|
2019-05-13 16:07:29 -07:00 |
|
Zach Fox
|
e87381f431
|
Merge branch 'master' of github.com:highfidelity/hifi into privateUserData
|
2019-05-13 14:13:34 -07:00 |
|
Andrew Meadows
|
e770bd6142
|
build CollisionShapes and load RigidBodies even when not yet stepping
|
2019-05-06 17:37:35 -07:00 |
|
Zach Fox
|
d53b528994
|
Some fixes - i don't think this code is complete
|
2019-05-06 13:38:09 -07:00 |
|
Zach Fox
|
fb77928652
|
Private user data is accessible to all right now
|
2019-05-01 15:29:04 -07:00 |
|
Clement
|
281f92e3ea
|
Query shape type outside lock
|
2019-05-01 14:31:53 -07:00 |
|
SamGondelman
|
0bcd8b81e1
|
trying and failing to fix models
|
2019-05-01 12:01:49 -07:00 |
|
Clement
|
0f2dbd7b6a
|
Fix mac warnings
|
2019-04-19 20:14:15 -07:00 |
|
