Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-05 17:25:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
82020 commits 25 branches 28 tags 1.2 GiB
Commit graph

82020 commits

This branch
This branch
All branches
Author SHA1 Message Date
DouglasWilcox
b8e85aedc7 Merge branch 'master' into improve_seated_rotation 2019-11-13 13:11:30 -08:00
milad
9ebe7067c5 fixed the ordering of selects 2019-11-13 13:08:34 -08:00
milad
c6c9059a29 Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp 2019-11-13 13:06:12 -08:00
Sabrina Shanman
579eb04df9
Merge pull request #16491 from sabrina-shanman/instancing 
Fix code style / remove cruft
 2019-11-13 12:53:10 -08:00
sabrina-shanman
516debdcb2 Fix code style / remove cruft 2019-11-13 12:50:13 -08:00
Zach Fox
61f0896e30 Fix small bugs with the HTTP request to screenshare endpoint 2019-11-13 12:35:01 -08:00
David Rowe
1145bc8904 Fix Graphics.exportModelToOBJ() JavaScript crash 2019-11-14 08:43:51 +13:00
Anthony J. Thibault
e81b21ac59 bug fix from code review comment 2019-11-13 10:40:00 -08:00
milad
abf592f533 Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp 2019-11-13 10:14:14 -08:00
Zach Fox
8aea0dd951 Merge in Howard's 'screenshare presence' open PR 2019-11-13 10:11:16 -08:00
Brad Hefta-Gaub
1f2deed941
Merge pull request #16477 from samcake/zorro 
DEV-2711: Fix crash when highlighting custom pipeline shapes
 2019-11-13 09:50:16 -08:00
Brad Hefta-Gaub
0dd764cd29
Merge pull request #16487 from amerhifi/resetAudio 
case DEV-2709: reset QAudioDevInfo on switch
 2019-11-13 09:48:33 -08:00
Anthony J. Thibault
b92badbe76 Updated avatar-animation-optimized-ik.json from latest avatar-animation.json 2019-11-13 08:23:27 -08:00
Anthony J. Thibault
b4c4d81bd1 Merge branch 'master' into bug-fix/android-t-pose 2019-11-13 08:21:19 -08:00
ingerjm0
417856fec4 JSDoc updates for PR16399 2019-11-12 20:45:20 -08:00
amerhifi
3939c7e6fd adding qaudio reset on switch. 2019-11-12 17:07:43 -08:00
Zach Fox
b0c578aa7f Improved HTTP request to proper endpoint - won't work until PR16459 is merged 2019-11-12 17:06:35 -08:00
Andrew Meadows
1c399f5e9b add doc about PICK_BYPASS_IGNORE Pick FilterFlag 2019-11-12 16:58:09 -08:00
amerhifi
d7fbd1e2d4 Merge branch 'master' of https://github.com/highfidelity/hifi 2019-11-12 16:57:47 -08:00
milad
ea8e285793 Zach's ss cpp cleanup changes 2019-11-12 16:02:52 -08:00
Anthony Thibault
7736582f3b
Merge pull request #16486 from DouglasWilcox/HMD_strafe_transition_bug 
Fix HMD strafe locomotion animation.
 2019-11-12 15:49:15 -08:00
Anthony J. Thibault
365b132c30 Bugfix for t-pose avatar when moving 
The android specific optimized IK animation graph was out of date, it was referencing
animations that have been deleted, hence the t-pose.  This PR updates and renames the
android/optimized ik animation graph to the latest.
 2019-11-12 15:33:41 -08:00
milad
239ca45754 cleaned up logs and old code 2019-11-12 15:10:47 -08:00
ingerjm0
dda69bf91a JSDoc revisions for PR16245 2019-11-12 14:47:09 -08:00
milad
4962e26664 update ss css 2019-11-12 14:40:23 -08:00
ingerjm0
ce174696c0 JSDoc revisions for PR 16144 2019-11-12 14:38:51 -08:00
ingerjm0
11cb6ac6e0 JSDoc updates for PR15974 2019-11-12 14:18:12 -08:00
ingerjm0
a61857b6d8 JSDoc revisions for PR16025 2019-11-12 14:17:23 -08:00
DouglasWilcox
f9f28fc286 Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states. 2019-11-12 14:15:19 -08:00
Shannon Romano
d0dceb15c2
Merge pull request #16481 from amerhifi/master 
case dev-2663: Adding safeguard in case device list is empty
 2019-11-12 13:28:53 -08:00
milad
49f972714c more cleanup 2019-11-12 13:12:10 -08:00
milad
5b9b30bf35 updated platform specific dimensions 2019-11-12 12:59:52 -08:00
DouglasWilcox
9d86e49a0b Pretty good exponential acceleration, need to simplify 2019-11-12 11:59:39 -08:00
Sabrina Shanman
5f99c36bb1
Merge pull request #16484 from sabrina-shanman/instancing_oven 
(DEV-2593) Instancing: Fix model baking to work with new hfm::Shape material definition
 2019-11-12 11:40:40 -08:00
milad
05f5863f85 Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp 2019-11-12 11:37:10 -08:00
milad
0f605ffc43 clean up code 2019-11-12 11:37:07 -08:00
RebeccaStankus
5be08ff638
Merge pull request #5 from RebeccaStankus/MiladNazeri-screenshareElectronApp 
Milad nazeri screenshare electron app
 2019-11-12 11:36:22 -08:00
Rebecca Stankus
568e96b6c5 Fixed merge conflict 2019-11-12 11:22:46 -08:00
DouglasWilcox
995f5f92cd Do not use turningSpeed when setting seatedTurn vars, and iterate acceleration formula 2019-11-12 11:11:19 -08:00
Andrew Meadows
cf08a4162a add workload job to help debug entity proxies 2019-11-12 10:35:16 -08:00
Sabrina Shanman
769a332d22
Merge pull request #16485 from highfidelity/master 
Merge master into instancing
 2019-11-12 10:07:28 -08:00
sabrina-shanman
f39121c53b Fix build error/warning 2019-11-12 09:52:58 -08:00
amerhifi
89d494cf81 Merge branch 'master' of https://github.com/amerhifi/hifi 2019-11-12 09:35:47 -08:00
milad
7cce153b6d working flow. Needs clean up and final ui tweaks 2019-11-11 20:13:23 -08:00
sabrina-shanman
2169952613 Remove unused mesh.part.materialID 2019-11-11 17:52:16 -08:00
sabrina-shanman
9a65d78cdf Fix model baking to work with new hfm::Shape material definition (1 
material per mesh part)
 2019-11-11 17:52:00 -08:00
Rebecca Stankus
b85b582d16 Merge branch 'master' of github.com:highfidelity/hifi into MiladNazeri-screenshareElectronApp 2019-11-11 17:32:45 -08:00
Rebecca Stankus
f806c930aa Electron app css UI changes 2019-11-11 17:31:19 -08:00
milad
ae35ec0975 Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp 2019-11-11 16:42:55 -08:00
amer cerkic
35065cf4d8 Merge branch 'master' of https://github.com/highfidelity/hifi 2019-11-11 16:15:41 -08:00