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

14182 commits

Author SHA1 Message Date
Stephen Birarda
b1a69bb2cf cleanup spacing in ScriptEngine 2015-11-30 15:52:10 -08:00
Stephen Birarda
2acfbd0f8f revert accidental CCD change 2015-11-30 15:52:03 -08:00
Stephen Birarda
f07314f4ef resolve conflicts on merge with huffman/baseball 2015-11-30 13:34:36 -08:00
Stephen Birarda
4573e5c59e resolve conflicts on merge with upstream/master 2015-11-30 13:32:38 -08:00
James B. Pollack
85b8266537 Merge pull request #6494 from ctrlaltdavid/20744 
Fix menu shortcuts created in JavaScript not working
 2015-11-30 11:20:10 -08:00
Andrew Meadows
49a6f63663 remove whitespace and fix warning (unused var) 2015-11-30 10:00:05 -08:00
David Rowe
d6b13ef42c Fix crash when try to remove invalid menu item in JavaScript 2015-11-30 08:33:38 +13: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
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
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
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
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
Brad Davis
5c2b980a45 Fixing avatar facial blendshapes and attachments in recordings 2015-11-23 22:36:07 -08:00
Brad Davis
bc84265e99 Additional checking when serializing transforms to json 2015-11-23 22:35:12 -08:00
Brad Davis
3738f21936 Fix occasional deadlock in loading recordings 2015-11-23 22:34:17 -08:00
samcake
a1668cdc73 Let the AssertClient JS interface use global vars 2015-11-23 22:28:59 -08:00
Brad Hefta-Gaub
5f88d958ab CR feedback 2015-11-23 18:26:15 -08:00
Brad Hefta-Gaub
ce46c30647 change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete 2015-11-23 16:27:06 -08:00
Stephen Birarda
6339c2c48f fix for unnecessary model URL updating 2015-11-23 17:25:31 -06:00
ericrius1
1409ed2d18 moved logic to build vertices buffer to renderable class, recalculating vertices anytime any of the normals, point, or strokeWidths data changes 2015-11-23 12:28:44 -08:00
Seth Alves
d4937071e1 rather than activating rigid body and forcing non-static on deserialize, just force non-static 2015-11-23 12:17:15 -08:00
Howard Stearns
c94a5389a0 comments 2015-11-23 10:31:37 -08:00
Seth Alves
6f19093cb9 if an entity with an action has a motion-type of static, flag it so it gets updated in bullet 2015-11-23 10:03:35 -08:00
Brad Davis
64ba5b4f14 Cleaning up old recording files 2015-11-23 09:42:34 -08:00
EdgarPironti
ebbed7c525 Save clip to asset - removing last fix 2015-11-20 18:23:36 -08:00
samcake
de56f698aa Merge pull request #6444 from EdgarPironti/asset_branch 
Save clip to asset
 2015-11-20 16:28:55 -08:00
Brad Davis
336562b894 Merge pull request #6452 from ctrlaltdavid/20732 
Make multiline strings from JavaScript's print() readably in log file
 2015-11-20 16:25:17 -08:00
EdgarPironti
df2153186d Fixes 2015-11-20 16:07:31 -08:00
EdgarPironti
e70f6855aa Fixes 2015-11-20 16:07:30 -08:00
EdgarPironti
35365f9157 Fixes 2015-11-20 16:07:30 -08:00
EdgarPironti
1db6d0e3c1 Upload QByteArray 2015-11-20 16:07:29 -08:00
EdgarPironti
1b18d3656f Save clip to asset 2015-11-20 16:07:29 -08:00
Brad Davis
f45eff3df9 Merge pull request #6455 from samcake/controllers 
Recording playback the skeleton animation correctly for agents
 2015-11-20 15:35:53 -08:00
samcake
0dc551409d Fixing a comment 2015-11-20 15:22:01 -08:00
samcake
e97e864de7 Getting the animation playback to work 2015-11-20 15:05:17 -08:00
Clément Brisset
5d75fcbfce Merge pull request #6430 from birarda/unique_linked_data 
use a unique_ptr for linkedData in Node
 2015-11-20 15:01:41 -08:00
howard-stearns
1ddcc62db9 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-render-controller2 2015-11-20 14:05:40 -08:00
howard-stearns
6c784256cb final(?) cleanup 2015-11-20 13:51:12 -08:00
David Rowe
c72c6a0a47 Make multiline strings from JavaScript's print() readably in log file 
Addresses quoting of newline characters as "\n" which was introduced in
Qt 5.5.
 2015-11-21 10:44:21 +13:00
Brad Hefta-Gaub
c7673aad4a Merge pull request #6447 from huffman/polyline-texture 
Add texture property to polyline entity type
 2015-11-20 13:31:34 -08:00