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

55264 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
0b393c845a Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-05-15 13:38:03 -07:00
Seth Alves
66a1dbfcfe Merge pull request #10445 from AndrewMeadows/cleanup-head-simulation 
cleanup Head::simulate() code
 2017-05-15 11:21:43 -07:00
Seth Alves
8ff8d70f84 Merge pull request #10457 from vladest/sit-script-crash 
Fix crash in sit script
 2017-05-15 11:07:37 -07:00
Seth Alves
d7432048a0 Merge pull request #10456 from vladest/market-crash-fix 
Market crash fix
 2017-05-15 10:58:02 -07:00
samcake
b627fe463b Generate correct KTX for the default Sky 2017-05-15 10:50:10 -07:00
Anthony J. Thibault
1e276d113c Added support for weights per target 2017-05-15 09:26:24 -07:00
Anthony J. Thibault
67fbb15faa WIP: initial implementation of flexCoefficients 2017-05-15 09:26:23 -07:00
Sam Cake
91d439442d warning -1 2017-05-14 17:45:52 -07:00
samcake
9d6cf5b7f8 not testing in storage for alignment 2017-05-14 17:45:46 -07:00
samcake
05ad4b13a5 Replace the alignment test by a nice function 2017-05-14 17:45:41 -07:00
samcake
62f2bf722d Adding a comment for debug sake 2017-05-14 17:45:34 -07:00
samcake
833eb0b527 Fixing the test... 2017-05-14 17:45:29 -07:00
samcake
665316a574 Adding a validation step at runtime for the cached KTX file in order to regenerate them if anything seems wrong 2017-05-14 17:45:22 -07:00
Chris Collins
263e4de951 Merge pull request #10454 from samcake/orange 
Fixing potential crashes when loading  invalid KTX cached textures
 2017-05-14 17:41:06 -07:00
Zach Fox
6720c0c02b Fix the twitter mention 2017-05-14 17:36:05 -07:00
Zach Fox
806b6e1acf Clarifying comments 2017-05-14 17:35:53 -07:00
Zach Fox
81706c1502 Finally, the actual fix? 2017-05-14 17:35:45 -07:00
Zach Fox
97f67e27d1 This is a better method. 2017-05-14 17:35:39 -07:00
Zach Fox
aa4e100346 I think this is all that must be done. 2017-05-14 17:35:32 -07:00
ZappoMan
9c81a89ac3 add test script 2017-05-14 08:37:26 -07:00
ZappoMan
149750fe21 make the octree sparse 2017-05-14 08:36:54 -07:00
Philip Rosedale
6e82343b29 Merge pull request #10406 from amvmoody/21289 
21289 - Edit: Add the ability to duplicate an object with hand controller
 2017-05-13 20:43:52 -07:00
Vladyslav Stelmakhovskyi
cc10fc81b7 Fix crash in sit script 2017-05-13 20:57:04 +02:00
Brad Hefta-Gaub
ed7a63c89c Merge pull request #10451 from druiz17/puck-lost-tracking 
Better handing when the pucks lose tracking and openvr still send you a "valid" data
 2017-05-13 10:20:42 -07:00
ZappoMan
5065c7c5c4 more warning fixes 2017-05-13 10:17:59 -07:00
ZappoMan
da404ce2ce fix warning 2017-05-13 09:29:32 -07:00
Vladyslav Stelmakhovskyi
49a45f0300 Merge branch 'master' into market-crash-fix 2017-05-13 14:23:26 +02:00
Vladyslav Stelmakhovskyi
20c27fc133 Fix crash on save Map data settings from scripts 2017-05-13 14:20:28 +02:00
Sam Cake
b38be7e561 warning -1 2017-05-12 20:20:03 -07:00
ZappoMan
dcb70aa504 more cleanup 2017-05-12 19:03:08 -07:00
ZappoMan
4af3c760e6 more cleanup 2017-05-12 18:57:33 -07:00
ZappoMan
f1bd06cfa0 cleanup some unneeded class 2017-05-12 18:33:28 -07:00
samcake
c4e8885842 not testing in storage for alignment 2017-05-12 18:27:58 -07:00
samcake
f35b0297fa Replace the alignment test by a nice function 2017-05-12 18:25:07 -07:00
samcake
d734358290 Adding a comment for debug sake 2017-05-12 18:15:00 -07:00
samcake
5bc8e09865 Fixing the test... 2017-05-12 18:10:48 -07:00
samcake
bdb0414add Adding a validation step at runtime for the cached KTX file in order to regenerate them if anything seems wrong 2017-05-12 18:04:22 -07:00
ZappoMan
89b6a79f68 make sure to exit early if box intersection is already larger than best triangle intersection 2017-05-12 17:56:45 -07:00
anshuman64
49d4cf4e68 Merge pull request #10419 from hyperlogic/feature/ik-solver-init-config 
More stable IK when hips, feet and chest are controlled via external input
 2017-05-12 17:22:29 -07:00
ZappoMan
eb3b27849c only keep one copy of Triangles 2017-05-12 17:07:47 -07:00
ZappoMan
6d7e98274b revert debug change 2017-05-12 17:07:00 -07:00
Dante Ruiz
e6020e0137 added lookup table for tracking result and configs 2017-05-13 00:40:07 +01:00
Brad Hefta-Gaub
bffa3185d0 Merge pull request #10402 from MrRoboman/W-21305-floating-lanterns 
added floating lantern box that spawns floating lanterns
 2017-05-12 15:57:03 -07:00
Dante Ruiz
052126bdd2 Merge branch 'master' of github.com:highfidelity/hifi into puck-lost-tracking 2017-05-12 23:39:43 +01:00
Rob Kayson
9fc0ad0d28 fix indent floatingLanternBox 2017-05-12 15:12:43 -07:00
Rob Kayson
f3d8d1641f fix indent createFloatingLanternBox.js 2017-05-12 15:10:40 -07:00
Rob Kayson
a12e8e34db coding standard 2017-05-12 15:06:22 -07:00
Seth Alves
9d4411e3f0 Merge pull request #10417 from sethalves/motor-action 
misc action/constraint changes
 2017-05-12 14:27:51 -07:00
Anthony Thibault
f4b772d747 Merge pull request #10452 from druiz17/bug-irecorder-crash 
Fixed input recorder crash
 2017-05-12 13:46:15 -07:00
Seth Alves
fcc5e12211 redelete these 2017-05-12 13:19:15 -07:00