kasenvr
|
7996698c8f
|
Merge branch 'master' into fix/other-renamings
|
2020-05-18 15:10:32 -04: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 |
|
Kasen IO
|
115c40bd54
|
Lots of renamings, more to come.
|
2020-04-07 04:56:02 -04:00 |
|
David Rowe
|
e6c54faaf2
|
Merge branch 'kasen/core' into fix/http-serverless
|
2020-02-07 11:32:38 +13:00 |
|
David Rowe
|
7c87f89712
|
Add FIXME for Clipboard.importEntities()
|
2020-02-07 11:12:54 +13:00 |
|
David Rowe
|
4f0cc2ebd5
|
Remove dead code
|
2020-02-06 11:28:51 +13:00 |
|
David Rowe
|
ad427e31a7
|
Make --url take existing Interface to FILE, HTTP, and HTTPS serverless
|
2020-02-06 11:11:41 +13:00 |
|
Kasen IO
|
08ec9ef3b7
|
Various URL updates + window title update.
|
2020-02-05 15:25:51 -05:00 |
|
David Rowe
|
46173439ed
|
Enable serverless domains via HTTP and HTTPS
|
2020-02-01 12:46:28 +13:00 |
|
David Rowe
|
7ed117dfcb
|
Replace links to docs.highfidelity.com
|
2020-01-24 10:18:55 +13: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 |
|
kasenvr
|
1d14bed3ce
|
Merge pull request #16 from FluffyJenkins/feature/qmlWhitelistMeow
QML Whitelisting
|
2019-12-30 19:51:51 -05:00 |
|
kasenvr
|
9dc7f54bfd
|
Merge pull request #38 from kasenvr/feature/quality-of-life-k2
Feature/quality of life k2
|
2019-12-29 18:28:58 -05:00 |
|
Nex-Pro
|
4856dd07fc
|
Update interface window title
Change window title from "High Fidelity" to "Project Athena"
|
2019-12-25 00:20:36 +00:00 |
|
Kasen IO
|
c34cd996df
|
change Metaverse API from setting
|
2019-12-20 11:39:05 +01:00 |
|
David Rowe
|
e13b237e96
|
Add missing Controller.Hardware.Application camera properties' JSDoc
|
2019-12-19 11:23:36 +13:00 |
|
Fluffy Jenkins
|
0f3e8d2101
|
Made requested changes
|
2019-12-18 20:08:20 +00:00 |
|
Kasen IO
|
d4c3504c8d
|
Updated about dialog (old logo still there), application name, and readme.md
|
2019-12-14 23:12:54 -05:00 |
|
Fluffy Jenkins
|
82dc6d197a
|
New feature
|
2019-12-14 03:02:13 +00:00 |
|
Brad Hefta-Gaub
|
bb68f92d3e
|
Merge pull request #16562 from ctrlaltdavid/DEV-2442
DEV-2442: Fix main gamepad (XBox controller) controls
|
2019-12-13 13:36:20 -08:00 |
|
Brad Hefta-Gaub
|
f8a9789f86
|
Merge pull request #16499 from HifiExperiments/proceduralMesh
Procedural vertex shaders
|
2019-12-13 13:00:01 -08: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 |
|
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 |
|
Seth Alves
|
f97c3217a5
|
allow Linux interface to connect to domain when DISABLE_QML is true
|
2019-12-10 09:52:12 -08:00 |
|
Kasen IO
|
68443f878b
|
Update Application.cpp
updated application name.
|
2019-12-09 18:06:33 -05:00 |
|
David Rowe
|
96e21343bf
|
Selfie view menu option isn't present in HMD mode
|
2019-12-08 12:38:48 +13:00 |
|
David Rowe
|
aabf27955b
|
Fix camera view cycling getting stuck in non-existent fullscreen mirror
|
2019-12-08 12:38:48 +13:00 |
|
Kasen IO
|
6976939ff4
|
Merge branch 'kasen/core' into v0860-kasen-release+freshstart
|
2019-12-04 13:42:20 -05:00 |
|
Kasen IO
|
245224f0e9
|
Updated readme.md again + updated application title again.
|
2019-12-04 13:39:22 -05:00 |
|
Kasen IO
|
2cf453432e
|
Updated readme.md + updated application title.
|
2019-12-04 11:50:01 -05:00 |
|
Kasen IO
|
165eb16f93
|
Merge branch 'kasen/core' into v0860-kasen-release+freshstart
|
2019-12-01 20:04:32 -05:00 |
|
Kasen IO
|
872a0b4496
|
Updated application version to 86.
|
2019-12-01 20:04:00 -05:00 |
|
Kasen IO
|
0b46c53df1
|
Merge branch 'kasen/core' into v0860-kasen-release+freshstart
|
2019-12-01 19:59:59 -05:00 |
|
dante ruiz
|
cd6f9a774d
|
implement gesture pinch to camera zoom
|
2019-11-18 11:33:31 -07:00 |
|
HifiExperiments
|
b73a608094
|
procedural vertex shaders
|
2019-11-15 00:22:40 -08:00 |
|
Zach Fox
|
5229b0c0f3
|
Various cleanup and CR
|
2019-11-14 15:45:52 -08:00 |
|
Zach Fox
|
b4135e2655
|
We are so close...
|
2019-11-13 17:35:57 -08:00 |
|
Kalila R
|
a7b2c3a32c
|
Updated application name and version.
|
2019-11-11 20:22:19 -05:00 |
|
milad
|
c6f7c058bc
|
merging master
|
2019-11-05 17:30:09 -08:00 |
|
HifiExperiments
|
bae2ba7bae
|
merge with master
|
2019-11-02 01:08:56 -07:00 |
|
MiladNazeri
|
676e7bd5b8
|
Merge branch 'master' into screenshareElectronApp
|
2019-10-31 13:11:56 -07:00 |
|
Anthony Thibault
|
f99bb3ec77
|
Merge pull request #16400 from hyperlogic/feature/arkit-blendshapes
Extended avatar blendshape support for ARKit compatiblity
|
2019-10-31 12:33:50 -07:00 |
|
Zach Fox
|
47b3fdbfe3
|
Stop screenshare process on interface shutdown
|
2019-10-31 10:01:00 -07:00 |
|
milad
|
ea373ac14c
|
First steps towards a screenshare app
|
2019-10-30 16:44:42 -07:00 |
|
HifiExperiments
|
deb5aacfad
|
fix materialcachescriptinginterface
|
2019-10-25 18:16:08 -07:00 |
|
Shannon Romano
|
15f27e53cb
|
Merge pull request #16372 from ctrlaltdavid/DEV-2055
DEV-2055: Sanitize LODManager.setWorldQualityDetail() parameter value
|
2019-10-24 15:20:34 -07:00 |
|
HifiExperiments
|
1e100a672e
|
merge with master and try to fix opacity mode stuff
|
2019-10-23 22:21:45 -07:00 |
|
