Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 14:53:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
34984 commits 71 branches 56 tags 1.2 GiB
Commit graph

34984 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
ded8a624ad Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-11-30 09:41:28 -08:00
Seth Alves
4add3e2e91 rework worldToLocal, start on allowing scripts entity position/rotation to always be in world space 2015-11-30 09:41:15 -08:00
Andrew Meadows
b74c229d02 Merge pull request #6495 from ctrlaltdavid/fix-webwindowclass-crash 
Fix crash in WebWindowClass in debug build setTitle on open WebWindow
 2015-11-30 09:25:12 -08:00
David Rowe
ce100dbbc5 Fix crash in WebWindowClass in debug build setTitle on open WebWindow 2015-11-30 15:10:51 +13:00
Seth Alves
9548b0e138 get parent-id field working 2015-11-29 13:38:27 -08:00
Seth Alves
bbc9d5d131 add missing single-quote 2015-11-29 13:04:45 -08:00
Seth Alves
cf39cac7fc attempt to make SpatiallyNestable data access thread-safe 2015-11-29 12:50:33 -08:00
Seth Alves
e91a8684a4 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-11-29 10:17:36 -08:00
Seth Alves
204c3d839e added localToWorld calls, put locks around access to _children hashtable 2015-11-29 10:17:21 -08:00
Seth Alves
eb50c9de5f aabox delivered to scripts in properties should be in world space 2015-11-29 10:16:56 -08:00
Seth Alves
ddf5539a49 Merge pull request #6492 from imgntn/grabupdates 
Isolate handControllerGrab.js changes from bow branch
 2015-11-29 06:21:44 -08:00
James Pollack
55f797838f remove unused key 2015-11-28 23:22:00 -08:00
James Pollack
1e2398cbea use constants 2015-11-28 23:04:52 -08:00
James Pollack
1315201bdc update name of function 2015-11-28 22:55:44 -08:00
James Pollack
8f51ee6f58 rename hand disabler 2015-11-28 22:29:12 -08:00
Andrew Meadows
ce3fb028ef Merge pull request #6493 from hyperlogic/tony/cmake-fixes 
cmake: warning fixes
 2015-11-28 10:51:57 -08:00
Anthony Thibault
63cef9c367 Configure fix for quazip 
23>  CMake Warning (dev) at C:/msys64/home/Anthony/code/hifi/build/ext/vc12/quazip/project/src/quazip-stamp/quazip-configure-Debug.cmake:3 (set):
    23>    Syntax error in cmake code at
    23>
    23>      C:/msys64/home/Anthony/code/hifi/build/ext/vc12/quazip/project/src/quazip-stamp/quazip-configure-Debug.cmake:3
    23>
    23>    when parsing string
    23>
    23>      C:/Program Files (x86)/CMake/bin/cmake.exe;-DCMAKE_INSTALL_PREFIX:PATH=C:/msys64/home/Anthony/code/hifi/build/ext/vc12/quazip/project;-DCMAKE_PREFIX_PATH=C:\Qt\Qt5.5.1\5.5\msvc2013\lib\cmake;-DCMAKE_INSTALL_NAME_DIR:PATH=C:/msys64/home/Anthony/code/hifi/build/ext/vc12/quazip/project/lib;-DZLIB_ROOT=C:/msys64/home/Anthony/code/hifi/build/ext/vc12/zlib/project;-GVisual Studio 12 2013;C:/msys64/home/Anthony/code/hifi/build/ext/vc12/quazip/project/src/quazip
    23>
    23>    Invalid escape sequence \Q
    23>
    23>    Policy CMP0010 is not set: Bad variable reference syntax is an error.  Run
    23>    "cmake --help-policy CMP0010" for policy details.  Use the cmake_policy
    23>    command to set the policy and suppress this warning.
    23>  This warning is for project developers.  Use -Wno-dev to suppress it.

By converting backslashes to slashes before using the QT_CMAKE_PREFIX_PATH environment variable on the command line.
 2015-11-27 20:57:35 -08:00
Anthony Thibault
a9e25c51e5 Fix for linker warning LNK4075 on Windows 
Specifcally, this warning:

    LINK : warning LNK4075: ignoring '/INCREMENTAL' due to '/OPT:ICF' specification

The fix is to set /OPT:NOREF and /OPT:NOICF on debug builds.
 2015-11-27 20:56:57 -08:00
James B. Pollack
9ec2a01475 isolate grab script changes from bow branch 2015-11-27 12:13:53 -08:00
Seth Alves
facf91faac minimize diff vs master 2015-11-26 07:13:43 -08:00
Seth Alves
6062691c2a minimize diff vs master 2015-11-26 07:04:27 -08:00
Seth Alves
10cf85bad9 fix some rotation handling in EntityItem, minimize diff vs master 2015-11-26 07:02:53 -08:00
Seth Alves
ca75802b9c unmangle merge 2015-11-26 06:43:28 -08:00
Seth Alves
36e293608a more adding parentID to edit.js 2015-11-26 05:31:52 -08:00
Seth Alves
7df984e7b2 fix deadlock when setting parentID to null 2015-11-26 05:30:01 -08:00
Anthony Thibault
6d65f1e3b6 Merge pull request #6491 from howard-stearns/fix-missing-own-avatar 
Restore rendering of one's own avatar.
 2015-11-25 15:46:50 -08:00
Andrew Meadows
527408c7c1 Merge pull request #6292 from huffman/physics-continuous-collision-detection 
Physics continuous collision detection
 2015-11-25 15:45:18 -08:00
Howard Stearns
6c7099a5f7 Coordinate with other uses of setVisibleInScene. 2015-11-25 15:18:32 -08:00
howard-stearns
546f09c0b1 Restore rendering of one's own avatar. 2015-11-25 13:30:54 -08:00
Clément Brisset
5ff482071e Merge pull request #6465 from ericrius1/polyLineFix 
moved logic to build vertex buffer to renderable polyline class, recalculati…
 2015-11-25 11:02:02 -08:00
Andrew Meadows
bc20b72645 Merge pull request #6453 from howard-stearns/avatar-render-controller2 
Survive Flash Mobs Without Making Everyone Sick
 2015-11-25 09:52:28 -08:00
Brad Hefta-Gaub
a647b9ea40 Merge pull request #6485 from AlessandroSigna/groupRecording 
Group recording - added prompt
 2015-11-24 20:00:36 -08:00
Brad Hefta-Gaub
e807aaf718 Merge pull request #6486 from hyperlogic/tony/hand-ik-fix 
Fixes hand IK for some avatars
 2015-11-24 20:00:12 -08:00
Anthony J. Thibault
386dad7aff Fixes hand IK for some avatars 
Specifically:

   https://hifi-content.s3.amazonaws.com/ozan/dev/avatars/hifi_team/ryan/_test/ryan.fst
   https://hifi-content.s3.amazonaws.com/ozan/dev/avatars/hifi_team/brad/brad.fst
   https://s3.amazonaws.com/hifi-public/tony/blackmery/blackmery.fst

These avatars have "Hips" joints that are NOT the root of the skeleton.
This would cause the getRootAbsoluteBindPoseByChildName() to return (0,0,0).
Causing the IK targets to be lower then they should have.
 2015-11-24 18:57:35 -08:00
AlessandroSigna
cb0b5b5d02 added prompt 2015-11-24 18:31:41 -08:00
Brad Hefta-Gaub
811fa8da39 Merge pull request #6481 from imgntn/controllermethod 
Update Some Scripts to Use New Method of Getting Trigger Value
 2015-11-24 17:45:30 -08:00
Howard Stearns
b12bc96fb7 Merge pull request #6482 from hyperlogic/tony/avatar-eye-tracking-fix 
Fix for avatar eye tracking
 2015-11-24 14:38:28 -08:00
Anthony J. Thibault
e07e1c5c92 Fix for avatar eye tracking 
When computing a full eye to world matrix, the translations need to be the geometry coordinate frame, not scaled into meters.
 2015-11-24 14:01:01 -08:00
James B. Pollack
23f10659b0 update to new trigger method 2015-11-24 14:00:23 -08:00
Philip Rosedale
dde01b2071 Merge pull request #6476 from AndrewMeadows/arrow 
fix for objects suffering from very small updates to physics properties
 2015-11-24 11:22:25 -08:00
Brad Hefta-Gaub
fd7a704753 Merge pull request #6471 from birarda/url-cmp 
fix unnecessary model URL updating thanks to URL encoding
 2015-11-24 10:56:21 -08:00
Andrew Meadows
e26081e981 always update physics properties when they change 
and move activation check logic to MotionState
 2015-11-24 10:20:19 -08:00
Andrew Meadows
5135c9dded whitespace cleanup 2015-11-24 10:20:19 -08:00
Brad Hefta-Gaub
d32e500464 Merge pull request #6462 from jherico/rec5 
Blendshapes and attachments in recordings, plus other minor fixes.
 2015-11-24 10:01:17 -08:00
Stephen Birarda
5a7b0dd1ad put the parsed model URL in ModelEntityItem 2015-11-24 11:46:51 -06:00
Stephen Birarda
0d6b919448 cleanup printing of updated model URL 2015-11-24 11:22:30 -06:00
Stephen Birarda
0e19e50047 cleaner handling for QString/QUrl conversion/comparison 2015-11-24 11:17:46 -06:00
Stephen Birarda
762709748d Merge pull request #6473 from ZappoMan/waitForScriptThreads 
change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete
 2015-11-24 10:39:22 -06:00
Clément Brisset
28435b6d43 Merge pull request #6478 from samcake/controllers 
Let the AssertClient JS interface use global vars
 2015-11-23 22:43:07 -08:00
Brad Davis
5c2b980a45 Fixing avatar facial blendshapes and attachments in recordings 2015-11-23 22:36:07 -08:00