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
|
08ec9ef3b7
|
Various URL updates + window title update.
|
2020-02-05 15:25:51 -05:00 |
|
|
|
f5fcb90cac
|
Revert "Removed obsolete default scripts + more branding changes."
|
2020-01-16 18:51:49 -06:00 |
|
Kasen IO
|
336b5e275b
|
Removed obsolete default scripts + more branding changes.
|
2020-01-12 23:13:01 -05:00 |
|
Simon Walton
|
6e23924ed9
|
Add screenshare zone-property - WIP
|
2019-11-25 13:22:35 -08:00 |
|
milad
|
2fc0f01928
|
added natural dimensions after loading
|
2019-11-15 15:16:09 -08:00 |
|
milad
|
87adae6c6f
|
cr
|
2019-11-15 12:48:32 -08:00 |
|
MiladNazeri
|
481e239a37
|
Update scripts/system/create/edit.js
Co-Authored-By: Zach Fox <fox@highfidelity.com>
|
2019-11-15 12:43:25 -08:00 |
|
milad
|
4ae3c67493
|
added Entities.isLoaded
|
2019-11-15 11:45:05 -08:00 |
|
Rebecca Stankus
|
4173cc46e2
|
Made web entities not grabbable by default
|
2019-11-06 14:11:17 -08:00 |
|
Zach Fox
|
d622e53458
|
Some comments; changed the code to be backwards compatible
|
2019-07-08 17:10:11 -07:00 |
|
RebeccaStankus
|
d8daee49a8
|
Fixed bad path to gridControls
|
2019-06-25 16:31:21 -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 |
|
