Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 21:45:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
60964 commits 76 branches 59 tags 1.2 GiB
Commit graph

60964 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
57b943ae98 Fix initialization order in ModelBaker 2017-11-21 13:51:44 -08:00
Ryan Huffman
8c9c069a5c Update OBJ/FBX bakers to inherit parent ctor 2017-11-21 11:56:06 -08:00
Ryan Huffman
5c522d556b Cleanup connection generation in OBJBaker 2017-11-21 09:43:22 -08:00
Ryan Huffman
7026337f24 Fix broken string serialization in FBXWriter 2017-11-21 09:05:37 -08:00
Ryan Huffman
6050b4d85c Cleanup ObjBaker and remove setPropertiesList 2017-11-21 09:05:22 -08:00
Ryan Huffman
dd2d3d97b4 Fix coding guideline violations in *Baker classes 2017-11-16 16:32:11 -08:00
utkarshgautamnyu
730202b7fc Refactored ModelBaker 2017-10-26 14:22:23 -07:00
utkarshgautamnyu
d8b0a6360e Fix for -Wreorder warning 2017-10-26 13:11:59 -07:00
utkarshgautamnyu
1092c09e8b changed variable names 2017-10-26 11:40:26 -07:00
utkarshgautamnyu
735e641548 fixed errors with Jenkins build 2017-10-26 10:48:50 -07:00
utkarshgautamnyu
2fa7c0a07d Removed unused library 2017-10-25 19:52:37 -07:00
utkarshgautamnyu
6c553e5923 moved FBXBaker::abort() to ModelBaker::abort() 2017-10-25 19:04:12 -07:00
utkarshgautamnyu
10eb258d3b moved more common members to ModelBaker parent class 2017-10-25 18:31:50 -07:00
utkarshgautamnyu
854c190f32 fixed names of protected members according to naming conventions 2017-10-25 17:10:12 -07:00
utkarshgautamnyu
8d3f11a990 moved code to set _textureContent to ModelBaker class 2017-10-25 16:27:09 -07:00
utkarshgautamnyu
d7f2e21dca Moved common variables between base and derived classes to base class 2017-10-25 16:13:06 -07:00
utkarshgautamnyu
54f9d52aa1 Moved _textureContent to parent class ModelBaker 2017-10-25 14:15:55 -07:00
utkarshgautamnyu
221b293daf Indentation Fixes 2017-10-24 16:58:35 -07:00
utkarshgautamnyu
41add3e20c Merge branch 'master' into feat/OBJ_Baker 2017-10-24 16:34:34 -07:00
Brad Hefta-Gaub
41b637bc79 Merge pull request #11668 from ZappoMan/cleanupVersions 
Cleanup versions
 2017-10-24 16:24:01 -07:00
utkarshgautamnyu
dccf449cf7 edited comments 2017-10-24 16:20:39 -07:00
utkarshgautamnyu
79c1e84c76 More indentation/spacing fixes 2017-10-24 16:15:20 -07:00
utkarshgautamnyu
98ec464106 Indentation Fixes 2017-10-24 16:05:00 -07:00
utkarshgautamnyu
5d5e62d002 Refactored ModelBaker and OBJBaker 2017-10-24 15:44:54 -07:00
Seth Alves
75f8699bcc Merge pull request #11665 from NissimHadar/hazeZone 
Changed blend range from 32,000 m to 30,000m
 2017-10-24 15:22:24 -07:00
ZappoMan
aad91edba2 actually remove all those defines 2017-10-24 14:45:33 -07:00
ZappoMan
3ded26b0e9 Merge branch 'master' of https://github.com/highfidelity/hifi into cleanupVersions 2017-10-24 14:44:06 -07:00
Brad Hefta-Gaub
ecf8d35f5f Merge pull request #11664 from ZappoMan/callEntityClientMethod 
implement callEntityClientMethod
 2017-10-24 14:43:39 -07:00
ZappoMan
275fff4609 more CR feedback 2017-10-24 14:02:47 -07:00
ZappoMan
5901d1a311 clean up VERSION_ENTITIES stuff 2017-10-24 13:48:27 -07:00
Nissim Hadar
f81675e3b4 Changed blend range from 32,000 m to 30,000m 2017-10-24 13:17:09 -07:00
ZappoMan
12c32d5834 bump protocol version 2017-10-24 13:08:48 -07:00
ZappoMan
ed408e09d0 remove some log spam 2017-10-24 11:50:25 -07:00
Sam Gateau
fad0dde550 Merge pull request #11662 from Zvork/zoneshadow 
BUG FIX : Shadows cast by top zone key light
 2017-10-24 11:49:53 -07:00
ZappoMan
a1885926b5 some cleanup 2017-10-24 11:46:42 -07:00
ZappoMan
1128a98e88 implement callEntityClientMethod 2017-10-24 11:15:57 -07:00
Seth Alves
58501bd0b0 Merge pull request #11661 from Delanir/Gizmos 
FogBugz 7425 - Billboard orientation and grabber move up tool are now dependent on the Avatar referential.
 2017-10-24 10:32:29 -07:00
Daniela
059c5c1806 billboard is now using a general formula to calculate the rotation, where we don't assume y is up. Added dependency on the avatar. 2017-10-24 14:49:17 +01:00
Daniela
30a5b00b6e Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos 2017-10-24 14:44:06 +01:00
Olivier Prat
a34db5f26d Shadows are now cast by the current zone key light (sun) 2017-10-24 11:09:36 +02:00
utkarshgautamnyu
46b46c2f4c Fixed issues with FBXBaker and refactoring of OBJBaker 2017-10-23 20:07:24 -07:00
Seth Alves
7793506d0f Merge pull request #11640 from jherico/fix/fb8406 
Fix for shape size flickering
 2017-10-23 17:39:36 -07:00
Andrew Meadows
26226fe968 Merge pull request #11654 from SamGondelman/lineEdit 
Update Line3DOverlay renderTransform if end changes
 2017-10-23 15:36:37 -07:00
Bradley Austin Davis
4f5851f420 Reducing needless render updates 2017-10-23 15:31:25 -07:00
SamGondelman
55ba093f09 update line render transform on end edit 2017-10-23 13:09:40 -07:00
Zach Fox
03b46c5e62 Merge pull request #11652 from cain-kilgore/21508 
WL 21508 - Improve upon Skybox Changer (Updated)
 2017-10-23 12:22:21 -07:00
Seth Alves
d3a859d207 Merge pull request #11648 from ElderOrb/mouse_pointer_fix 
7469 Mouse Pointer Depth is Incorrect in HMD Mode
 2017-10-23 11:57:46 -07:00
Cain Kilgore
b60b58ff35 zFox Changes 2017-10-23 19:40:43 +01:00
Cain Kilgore
3b4185fdb3 WL 21508 - Improve upon Skybox Changer 
This involved a second PR, due to optimizing the way the Skyboxes are laid  out. All of the Skyboxes will now appear at once, with the random button being removed. You are able to scroll up and down the list and choose which Skybox you'd like to pick.
 2017-10-23 19:30:36 +01:00
Daniela
f15038c54f Re-add isFacingAvatar to true and delete rotation of the grabbermoveup tool. 2017-10-23 19:11:32 +01:00