Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-27 09:06:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76446 commits 23 branches 0 tags 1.2 GiB
Commit graph

76446 commits

This branch
This branch
All branches
Author SHA1 Message Date
r3tk0n
7c515ccd45 Add 2x rotation multiplier. 2019-02-26 19:16:45 -08:00
r3tk0n
42b62ff2d5 Fix Ubuntu compiler warnings. 2019-02-26 19:16:34 -08:00
r3tk0n
a093fe5c4f Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-02-26 15:08:57 -08:00
r3tk0n
2077e012db Fix case of repeated manipulations with fargrab. 2019-02-26 15:00:44 -08:00
r3tk0n
030211aea8 Fix OSX compiler error, init list in wrong order after merge. 2019-02-26 14:46:04 -08:00
r3tk0n
f3b65d06ad Fix frame of reference for rotations. 2019-02-26 12:46:46 -08:00
r3tk0n
2a04d2b9c5 Closer... 2019-02-26 12:39:51 -08:00
Sam Gondelman
f1541c3df4
Merge pull request #15023 from SamGondelman/web 
Case 21171: Web entity thread safety and fixes
 2019-02-26 11:37:46 -08:00
r3tk0n
0b651a8d63 Fix fargrab rotation with dominant hand, need to fix activation criteria next. 2019-02-26 11:29:06 -08:00
Shannon Romano
92168f60c6
Merge pull request #14993 from SamGondelman/untexture 
Case 21071: Handle models with no materials
 2019-02-26 10:07:37 -08:00
Shannon Romano
2aa622b855
Merge pull request #15014 from sethalves/fix-grab-earthquake 
case 21411: don't allow others' grabs to move locked or ungrabbable things
 2019-02-26 09:03:44 -08:00
SamGondelman
94a82b8304 Merge remote-tracking branch 'upstream/master' into web 2019-02-25 17:23:58 -08:00
Shannon Romano
badd0b8bd3
Merge pull request #14968 from davidkelly/dk/20726 
Guard against accidentally calling wrong api/v1/places endpoint
 2019-02-25 17:16:33 -08:00
SamGondelman
6e4ec15c9d there we go 2019-02-25 17:14:51 -08:00
Shannon Romano
7fe3bb387e
Merge pull request #15012 from SamGondelman/nametag 
Case 21397: Trying to fix overlay rotation
 2019-02-25 16:52:01 -08:00
Shannon Romano
bf3b4e6a57
Merge pull request #15015 from SamGondelman/flying 
Case 21418: Allow flying in HMD if you would otherwise fall forever
 2019-02-25 16:48:57 -08:00
amantley
51e4ddd888
Merge pull request #15017 from amantley/ikOnByDefault 
bug fix: Ik is on by default in desktop mode
 2019-02-25 19:36:25 -05:00
SamGondelman
f482ae3b63 Merge remote-tracking branch 'upstream/master' into untexture 2019-02-25 16:26:14 -08:00
SamGondelman
f235d04601 trying to fix web crashes 2019-02-25 15:40:17 -08:00
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
r3tk0n
52b62784d6 Incremental, broken progress. 2019-02-25 14:10:48 -08:00
r3tk0n
a66c76bf38 Fixing typos. 2019-02-25 13:47:31 -08:00
SamGondelman
b2e0067c08 Merge remote-tracking branch 'upstream/master' into nametag 2019-02-25 13:12:48 -08:00
r3tk0n
5d3a778b0b Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco-fargrab-rotation 2019-02-25 13:10:47 -08:00
r3tk0n
d79681470e Saving changes before merging master... 2019-02-25 13:10:25 -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
r3tk0n
c6a3496b25 Add utility functions for adjusting target rotation and position. 2019-02-24 12:36:44 -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
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
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
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