Kalila L
|
2d7a640935
|
Create networkingConstants.js
|
2020-08-27 05:27:47 -04:00 |
|
Kalila L
|
d45c283f3b
|
Add semanticVersionCompare function to utils.js
|
2020-08-27 03:53:04 -04:00 |
|
Seth Alves
|
63dcf0e1c9
|
use same near-grab module to grab entities and overlays
|
2020-04-26 12:22:53 -07:00 |
|
Seth Alves
|
fa4d055ab1
|
disable far-trigger and grab if using hand tracker
|
2020-04-26 12:22:53 -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 |
|
David Rowe
|
316abaeedc
|
Fix jitter when start moving camera in edit mode focused on entity
|
2020-01-12 17:37:58 +13:00 |
|
David Rowe
|
48680a0fe2
|
Remove now-unnecessary getEntityProperties() call from WebTablet.js
|
2019-12-01 21:46:35 +13:00 |
|
luiscuenca
|
63c2b41929
|
Restate legacy first person camera mode
|
2019-10-17 13:26:42 -07:00 |
|
Ryan Huffman
|
609b533cf2
|
Fix create duplication key conflicting with camera orbit
|
2019-08-06 17:23:13 -07:00 |
|
RebeccaStankus
|
d840723fe3
|
Fixed space before function params
|
2019-07-02 15:08:34 -07:00 |
|
RebeccaStankus
|
0670147bf8
|
Fixed paths to included files and collision with 'clamp'
|
2019-07-02 14:24:02 -07:00 |
|
RebeccaStankus
|
e9777dc40f
|
Merge branch 'master' of github.com:highfidelity/hifi into create
|
2019-06-25 09:28:43 -07:00 |
|
RebeccaStankus
|
6aca2fcf07
|
Working on new file structure
|
2019-06-24 14:01:51 -07:00 |
|
RebeccaStankus
|
5a49ac9a22
|
moved files
|
2019-06-17 16:45:54 -07:00 |
|
Seth Alves
|
22d602a334
|
CREATE app will now recognize newer-style baked models and skyboxes as baked in entity-list
|
2019-06-07 16:36:29 -07:00 |
|
SamGondelman
|
2bb522eea6
|
entity icons ignorePickIntersection when not visible
|
2019-05-09 14:16:59 -07:00 |
|
SamGondelman
|
54d7bde91a
|
grid ignorePickIntersection
|
2019-04-17 10:56:55 -07:00 |
|
unknown
|
ca7cfc0240
|
only call onMove on lastMouseEvent change
|
2019-04-10 09:56:35 -07:00 |
|
Thijs Wenker
|
98e0164964
|
Merge pull request #15281 from kitely/copy-grandchild-entities
case 21980: Allow copying grandchild entities
|
2019-04-08 19:59:46 +02:00 |
|
Ryan Huffman
|
a4919320b3
|
Merge pull request #15277 from dback2/editHandleContinualTranslateFix
Case 20896: Fix continual edit handle translation when moving
|
2019-04-05 15:40:57 -07:00 |
|
unknown
|
8dbdee4262
|
better fix for trailing key events
|
2019-04-03 09:08:29 -07:00 |
|
David Back
|
93fc8e2e18
|
fix continual translation when moving
|
2019-04-02 15:11:32 -07:00 |
|
r3tk0n
|
4fb7bbabe1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
|
2019-04-01 14:52:21 -07:00 |
|
Oren Hurvitz
|
69ebf1629d
|
Allow copying grandchild entities.
Using Copy/Paste on entities only worked for one level of children, but not for grandchildren.
|
2019-03-28 11:00:09 +02:00 |
|
Seth Alves
|
29af3b1612
|
add a button to Avatar panel to lock or unlock wearables.
allow grabbing / adjusting others' wearables if they are unlocked.
|
2019-03-27 10:12:57 -07:00 |
|
r3tk0n
|
108e8b9994
|
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
|
2019-03-21 15:17:56 -07:00 |
|
Thijs Wenker
|
19c51b25d1
|
don't ignore updates that originate from entityPropertiesTool itself
|
2019-03-20 00:18:21 +01:00 |
|
r3tk0n
|
39342b9771
|
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
|
2019-03-11 16:27:05 -07:00 |
|
Seth Alves
|
e515e9cc66
|
fix cloneEntity function
|
2019-03-11 12:38:54 -07:00 |
|
Roxanne Skelly
|
e94d248ac5
|
Merge pull request #15126 from howard-stearns/domainUnlimited
unlimited certified copies in a domain
|
2019-03-08 10:23:42 -08:00 |
|
danteruiz
|
05dc30a740
|
more requested changes
|
2019-03-07 10:49:37 -08:00 |
|
danteruiz
|
9ca3805499
|
making requested changes
|
2019-03-07 10:27:16 -08:00 |
|
Howard Stearns
|
97bfa538ff
|
unlimited certified copies in a domain
|
2019-03-07 09:51:20 -08:00 |
|
danteruiz
|
618a1d5b83
|
fix tablet button and gizmos rotation
|
2019-03-01 14:31:12 -08:00 |
|
danteruiz
|
f715dbe243
|
fix tablet scaling
|
2019-02-28 13:32:12 -08:00 |
|
SamGondelman
|
4d591e0624
|
fix web interaction and debug print filling logs
|
2019-02-26 16:30:31 -08:00 |
|
r3tk0n
|
ebbf48a11b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
|
2019-02-19 12:02:50 -08:00 |
|
David Back
|
158e255319
|
Merge pull request #14902 from huffman/fix/duplicating-grabbed-entities
Case 21029: Fix duplicating non-dynamic grabbed entities in edit.js
|
2019-02-15 11:25:42 -08:00 |
|
Ryan Huffman
|
e800a6e030
|
Update hard-coded vec3 zero with Vec3.ZERO
|
2019-02-14 15:56:17 -08:00 |
|
Ryan Huffman
|
2728654d35
|
Fix duplicating non-dynamic grabbed entities in edit.js
|
2019-02-12 10:09:28 -08:00 |
|
SamGondelman
|
f53ccf7363
|
fix create, working on mini tablet
|
2019-02-11 14:54:53 -08:00 |
|
SamGondelman
|
c6080d0795
|
fix edit selection + log problem
|
2019-02-01 14:37:42 -08:00 |
|
SamGondelman
|
ba8320f561
|
fix 2d overlay deletion
|
2019-02-01 14:31:26 -08:00 |
|
SamGondelman
|
b80d2a9b06
|
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
|
2019-02-01 13:33:04 -08:00 |
|
SamGondelman
|
7d47bfa2e4
|
david's comments
|
2019-01-30 11:50:32 -08:00 |
|
SamGondelman
|
834e44dd3a
|
make polyline's with faceCamera not depend on normal
|
2019-01-30 11:02:24 -08:00 |
|
Thijs Wenker
|
132d293c3c
|
skip child entities of mismatching entityHostType when copy/delete/duplication of entities
|
2019-01-30 03:15:32 +01:00 |
|
SamGondelman
|
9aae9d13f6
|
fix tablet home button
|
2019-01-28 22:19:31 -08:00 |
|
SamGondelman
|
a8dbe5e761
|
working on build errors
|
2019-01-28 21:10:24 -08:00 |
|
SamGondelman
|
6ad0b3412a
|
showKeyboardFocusHighlight + fixes
|
2019-01-28 20:43:47 -08:00 |
|