Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 06:32:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76441 commits 75 branches 59 tags 1.2 GiB
Commit graph

76441 commits

This branch
This branch
All branches
Author SHA1 Message Date
amantley
12dbaa0ea0 changed the condition so that you can turn off ik in hmd mode if you want to for debug purposes 2019-02-25 14:56:17 -08:00
Andrew Meadows
6e13203fec avoid nullptr deref 2019-02-25 13:52:46 -08:00
SamGondelman
b2e0067c08 Merge remote-tracking branch 'upstream/master' into nametag 2019-02-25 13:12:48 -08:00
amantley
363c0cc26f moved the update of last ik to outside the if changed statement 2019-02-25 13:03:28 -08:00
amantley
cff0fd470a re-enabled ik off by default on Desktop 2019-02-25 12:23:03 -08:00
SamGondelman
e102ad073e allow flying in HMD if you would otherwise fall forever 2019-02-25 11:49:38 -08:00
Seth Alves
db821487d9 don't allow others' grabs to move locked or ungrabbable things 2019-02-25 11:27:10 -08:00
Shannon Romano
dc6bdfae8a
Merge pull request #14995 from SamGondelman/parentCrash 
Case 21391: Fix parent loop crash
 2019-02-25 10:01:37 -08:00
SamGondelman
8058ad884e trying to fix overlay rotation 2019-02-25 09:53:33 -08:00
John Conklin II
6af2b25767
Merge pull request #14980 from AndrewMeadows/dont-clear-space 
Case 21309: don't corrupt workload system
 2019-02-25 09:52:15 -08:00
Clement
d27d624c3f Don't send a KillAvatar packet on kick 
The DS already takes cares of removing nodes no longer allowed when
the permissions are updated and KillAvatar was never meant to be used
from the DS.
 2019-02-25 09:47:35 -08:00
Sam Gateau
4f0911bd29
Merge pull request #15003 from SamGondelman/nametag 
Case 21397: Fix nametag rotation
 2019-02-23 09:00:12 -08:00
Clement
d040803391 Delete old nodes with identical socket 2019-02-22 18:38:31 -08:00
SamGondelman
37720e9daa fix nametag rotation 2019-02-22 16:53:03 -08:00
Shannon Romano
5f99158c25
Merge pull request #14977 from SamGondelman/rot 
Case 21354: Add "modelScale" property to fix pal
 2019-02-22 16:36:17 -08:00
Sam Gondelman
30b6b7f21b
let's try that again 2019-02-22 16:30:36 -08:00
Anthony Thibault
1213084fc6
Merge pull request #14984 from kencooke/master 
Case 21384: Avatar mouth blendshapes are not working correctly (master)
 2019-02-22 16:29:07 -08:00
NissimHadar
7cf79c1108 Now WITH installation of nitpick. 2019-02-22 15:06:42 -08:00
SamGondelman
081e62a647 fix parent loop crash 2019-02-22 14:26:15 -08:00
SamGondelman
dbc3ae3793 hmmm not working 2019-02-22 14:18:59 -08:00
SamGondelman
a31b09b204 handle models with no materials 2019-02-22 13:17:13 -08:00
Shannon Romano
a63f3e76c8
Merge pull request #14972 from SamGondelman/billboard 
Case 21341: Fix billboard mode in secondary camera
 2019-02-22 13:01:09 -08:00
SamGondelman
6d6cd42adb fix bound scaling 2019-02-22 12:00:00 -08:00
NissimHadar
a6ad53e79e TEST 2019-02-22 11:30:26 -08:00
Brad Hefta-Gaub
2a1f4bb963
Merge pull request #14985 from luiscuenca/fixPickOnNullAvatar 
Fix crash on AvatarManager::findRayIntersectionVector when Avatar becomes null
 2019-02-22 10:14:21 -08:00
luiscuenca
3072ca43de Detailed picking if avatar is not null 2019-02-22 09:24:38 -07:00
Ken Cooke
c1786edc24 Emulate the old behavior of _lastInputLoudness 2019-02-21 18:45:17 -08:00
Andrew Meadows
be2d4272da remove the other unnecessary _space->clear() 2019-02-21 18:11:16 -08:00
Anthony Thibault
8785f733db
Merge pull request #14817 from amantley/animSplineIK 
AnimSplineIK node added to inverse kinematics
 2019-02-21 17:13:41 -08:00
Anthony Thibault
e54754c4ce
Merge pull request #14926 from luiscuenca/flowCpp 
Cpp implementation of the Flow script
 2019-02-21 17:10:05 -08:00
Andrew Meadows
982c4c2bc4 do not Space::clear() in clearNonLocalEntities() 2019-02-21 16:33:31 -08:00
amantley
3bf5c44f98 fixed build warnings 2019-02-21 16:24:46 -08:00
luiscuenca
dcbf57ee0b Fix linux warning and HMD breaks flow 2019-02-21 16:41:24 -07:00
amantley
5cf8a963cd make spine2 rotation damping only happen in optimized code. the regular code is already damped 2019-02-21 15:41:16 -08:00
amantley
c9db426ce4 Merge remote-tracking branch 'upstream/master' into animSplineIK 2019-02-21 14:36:13 -08:00
amantley
6323f49f26 changed the define variable to HIFI_USE_OPTIMIZED_IK 2019-02-21 14:36:05 -08:00
SamGondelman
544f54e69a fix model scale 2019-02-21 14:10:36 -08:00
amantley
50bc8d3646 added protected function to cubic hermite spline 2019-02-21 13:32:28 -08:00
amantley
0bdc527ce7 turned off pole vector when hand behind back 2019-02-21 13:14:51 -08:00
amantley
de10aebbb5 removed white space 2019-02-21 11:44:18 -08:00
amantley
64ec28ef44 added back missing unity meta files 2019-02-21 11:37:14 -08:00
amantley
afed0b5442 review changes 2019-02-21 11:08:29 -08:00
luiscuenca
ec4d069011 Allow threads with only one joint, remove dummy joints and unused constants 2019-02-21 12:00:19 -07:00
Shannon Romano
f9e5ee0185
Merge pull request #14970 from danteruiz/quest-no-keyboard 
Case 21335: Use old tablet keyboard for quest
 2019-02-21 10:34:53 -08:00
SamGondelman
4fdf556d5d fix billboard mode in secondary camera 2019-02-21 10:29:21 -08:00
Clément Brisset
8c642fd98d
Merge pull request #14971 from shanzzam/slr_twitter_changes 
Changing twitter handle from inc to VR
 2019-02-21 10:22:08 -08:00
Anthony Thibault
d4a41770d7
Merge pull request #14957 from hyperlogic/bug-fix/add-jsdoc-out-dir 
Add README.md file to tools/jsdoc/out dir to prevent jsdoc build failures
 2019-02-21 09:20:13 -08:00
amantley
33fd64c68c direction on compare in positional theta function 2019-02-21 09:00:23 -08:00
Angus Antley
b6bc467f4b added HIFI_USE_Q_OS_ANDROID to cmake lists and to MySkeletonModel 2019-02-21 06:42:55 -08:00
shanzzam
adb6f559dc Changing twitter handle from inc to VR 2019-02-20 18:31:32 -08:00