Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
82251 commits 29 branches 0 tags 1.1 GiB
Commit graph

82251 commits

This branch
This branch
All branches
Author SHA1 Message Date
Shannon Romano
07da496fa7
Merge pull request #16532 from hyperlogic/feature/animedit 
Added animedit avatar-animation.json graph editor tool
 2019-11-26 12:20:15 -08:00
Howard Stearns
323007eb2c ignore anonymous screenshare zone entry 2019-11-26 12:11:38 -08:00
amer cerkic
0de812b7b5 waiting on local injector prep 2019-11-26 11:41:41 -08:00
Zach
7b49542a4d Fix screenshare on MacOS DEBUG builds; fix z-fighting on smartboard in screenshare mode 2019-11-26 14:16:09 -05:00
Anthony J. Thibault
764b6a9adf code review feedback 2019-11-26 10:52:21 -08:00
miladi
90605b5338 Merge branch 'master' of github.com:highfidelity/hifi into moreScreenshareBugs 2019-11-26 10:43:21 -08:00
David Rowe
c998148589 Revise recent changes to Entities.Material JSDoc 2019-11-26 17:43:41 +13:00
David Rowe
fafb3dd30b MaterialCache JSDoc 2019-11-26 17:43:23 +13:00
David Rowe
5eb6e9dadd Add recently added properties to caches' JSDoc 2019-11-26 17:00:13 +13:00
Simon Walton
6b371ec388 Changes to avatar mixer to use screenshare zones 2019-11-25 18:30:53 -08:00
David Rowe
46c389f064 Tidying 2019-11-26 15:19:54 +13:00
Anthony Thibault
0a12dc7446
Merge pull request #16531 from luiscuenca/fixWheelPitch 
DEV-2825: Fix camera pitch by mouse wheel
 2019-11-25 17:03:05 -08:00
David Rowe
d797e33123 Stats JSDoc 2019-11-26 13:39:00 +13:00
Zach Fox
18f410c6db
Merge pull request #16537 from danteruiz/document-qt-launcher 
DEV-491: Create a README.md file to document the Qt Launcher
 2019-11-25 18:28:12 -05:00
danteruiz
60140a3aca fix more typos 2019-11-25 15:26:57 -08:00
danteruiz
e0c5edfccd fix typos 2019-11-25 14:58:40 -08:00
danteruiz
c08a18c517 making requested changes 2019-11-25 14:52:53 -08:00
milad
8b6df032e4 forgot a slash 2019-11-25 14:40:38 -08:00
HifiExperiments
b4c9a3e73d Merge remote-tracking branch 'origin/alphaModes' into cullFace 2019-11-25 14:23:50 -08:00
luiscuenca
d301378210
Merge branch 'master' into fixWheelPitch 2019-11-25 14:48:13 -07:00
milad
a38e0007f8 trying to go back several directories for the mac build 2019-11-25 13:32:48 -08:00
Dante Ruiz
d8ba0564b5 Adding QT Launcher Documention 2019-11-25 13:24:51 -08:00
Simon Walton
6e23924ed9 Add screenshare zone-property - WIP 2019-11-25 13:22:35 -08:00
Bradley Austin Davis
30b7d70189
Merge pull request #16536 from jherico/ga/update_deps 
Update prebuilt dependencies
 2019-11-25 13:02:55 -08:00
Brad Davis
0240a6e3d9 Update prebuilt dependencies 2019-11-25 11:42:09 -08:00
Zach Fox
5787b2f737 Merge branch 'master' of github.com:highfidelity/hifi into moreScreenshareBugs 2019-11-25 13:16:17 -05:00
luiscuenca
69a063a700 Better mouse wheel detection and attenuated touchpad X axis 2019-11-25 10:19:54 -07:00
Shannon Romano
85cea1fcb6
Merge pull request #16533 from ctrlaltdavid/DEV-2800 
DEV-2800: Fix crash in Stats.forceUpdateStats() at start-up
 2019-11-25 09:04:30 -08:00
HifiExperiments
f55c4b8b12 put back stepping in translucent case 2019-11-24 12:44:42 -08:00
Anthony Thibault
edfad97b64
Merge pull request #16517 from hyperlogic/feature/facecap-osc-plugin 
Input plugin for streaming blendshapes from an iPhone
 2019-11-23 11:49:51 -08:00
David Rowe
b458a746b7 Fix crash in Stats.forceUpdateStats() at start-up 2019-11-23 15:23:57 +13:00
Simon Walton
30f3525932
Merge branch 'master' into linux-actions-builds 2019-11-22 18:02:48 -08:00
Anthony J. Thibault
320095f765 Added animedit avatar-animation.json graph editor tool 2019-11-22 15:40:44 -08:00
Anthony J. Thibault
7371c8e83d Fix for github action build 2019-11-22 15:30:13 -08:00
Simon Walton
167dfab539 Copy PolyVox libs to build directory; don't try to upload docker image 2019-11-22 15:17:23 -08:00
Maia Hansen
e5d00d118e
Merge pull request #16530 from sethalves/fix-linux-build-1 
fix linux build
 2019-11-22 14:45:34 -08:00
Anthony J. Thibault
909d292295 Bumped version number on hifi-client-deps/CONTROL file 2019-11-22 14:22:29 -08:00
luiscuenca
2f887228cf
Fix camera pitch by mouse pitch 2019-11-22 14:51:37 -07:00
Seth Alves
ea2c6b4dfb fix linux build 2019-11-22 11:35:23 -08:00
Anthony J. Thibault
98c951702d Added DEFAULT_GAZE_DISTANCE constant 2019-11-22 09:29:21 -08:00
Shannon Romano
d76dfbe83b
Merge pull request #16525 from amerhifi/master 
DEV-2871: signal connection check before emit of devices changed
 2019-11-22 08:22:24 -08:00
HifiExperiments
5371fd613a properly implement alphaModes 2019-11-22 00:41:32 -08:00
Bradley Austin Davis
cf09e9f45e
Merge pull request #16526 from sabrina-shanman/crash_updateMeshPart 
Call updateGeometry before Model::createRenderItemSet
 2019-11-21 20:13:58 -08:00
Bradley Austin Davis
411e7335ea
Merge pull request #16527 from SimonWalton-HiFi/libquazip5-static 
On Linux, remove quazip5 dynamic libs
 2019-11-21 20:13:29 -08:00
Anthony J. Thibault
404d1a3c93 Fix several bugs for eye tracking from input plugins to function 2019-11-21 17:57:44 -08:00
Bradley Austin Davis
cb5d881bd8
Merge pull request #16524 from jherico/ga/pr_builds 
Remove upload step and unlabel job from builds
 2019-11-21 16:50:19 -08:00
Simon Walton
a2c5295311 On Linux, remove quazip5 dynamic libs 2019-11-21 16:32:54 -08:00
Shannon Romano
d801ccb7e1
Merge pull request #16523 from DouglasWilcox/Move-away-animation-from-cloud-url-to-local-resource- 
Move "away" animation from S3 bucket to local resource
 2019-11-21 16:23:51 -08:00
sabrina-shanman
79d470c70e Call updateGeometry before Model::createRenderItemSet to ensure well-defined state 2019-11-21 16:12:49 -08:00
amer cerkic
87afa636a2 typo 2019-11-21 15:52:56 -08:00