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

24610 commits

Author SHA1 Message Date
Howard Stearns
4403c27b52 working checkpoint. still needs verification/hashing, etc. 2017-09-26 14:14:37 -07:00
samcake
510b446409 mergine with master, resolving conflict 2017-09-26 13:13:46 -07:00
Seth Alves
7397a123c5 Merge pull request #11345 from SamGondelman/textAA 
Text3D Overlays and Entities fixes and no-AA
 2017-09-26 12:26:08 -07:00
Seth Alves
51d5f86989 Merge pull request #11460 from AndrewMeadows/fix-debug-build-20170926 
remove asserts that break Debug build
 2017-09-26 12:22:31 -07:00
utkarshgautamnyu
4fd0452694 Update JSBaker.cpp 2017-09-26 12:04:03 -07:00
Seth Alves
913d3c4d12 Merge pull request #11422 from hyperlogic/feature/ant-man2 
Secondary IPD fixes
 2017-09-26 11:53:45 -07:00
Stephen Birarda
608d42cdf7 Merge pull request #11461 from birarda/bug/too-much-logging 
remove noisy logging added by auto baking
 2017-09-26 13:29:42 -05:00
Dante Ruiz
e397d49564 Merge pull request #11159 from vladest/modal_dialogs_async 
Modal dialogs async
 2017-09-26 11:07:42 -07:00
utkarshgautamnyu
0b387f5b38 Update JSBaker.cpp 2017-09-26 11:01:56 -07:00
utkarshgautamnyu
a9aab67a06 Update JSBaker.h 2017-09-26 11:01:26 -07:00
samcake
b5c942f7f6 Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface 2017-09-26 10:47:59 -07:00
Stephen Birarda
b77ceab661 remove noisy logging added by auto-baking 2017-09-26 10:45:23 -07:00
Andrew Meadows
ec80846281 Merge pull request #11443 from SamGondelman/sharks 
Laser Pointer fixes and updates
 2017-09-26 10:22:55 -07:00
Howard Stearns
81cd00527a Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-09-26 10:15:37 -07:00
utkarshgautamnyu
1ba7aefd03 Update JSBaker.h 2017-09-26 09:57:02 -07:00
Sam Gateau
ff1101cc69 Merge pull request #11453 from Menithal/entity-custom-shader-emit-fix 
Experimental Fix: Entity Shader Lightmap use / emissive
 2017-09-26 09:39:33 -07:00
Andrew Meadows
67481287ff comment out asserts that fail to compile in Debug 2017-09-26 09:29:43 -07:00
utkarshgautamnyu
b86dd9dea4 Update JSBaker.cpp 2017-09-25 20:20:30 -07:00
Brad Davis
40c42d35a5 Fix long tablet lag on first load 2017-09-25 17:50:04 -07:00
utkarshgautamnyu
209201e592 updates to handle white space within a single line comment 2017-09-25 15:55:12 -07:00
samcake
11c55755d5 Removing unused call 2017-09-25 15:10:40 -07:00
utkarshgautamnyu
0a57874cc2 Made updates to JSBaker 2017-09-25 14:46:38 -07:00
Menithal
19a290be70 Fixed Entity Shader emmissive 
Makes sure that the emissiveAmount information is used correctly for a custom
shader, instead of using specular rgb information to generate the
emissiveness, which was incorrect
 2017-09-26 00:12:45 +03:00
Howard Stearns
ee6bf7f761 Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-09-25 12:37:28 -07:00
SamGondelman
a73fdf4397 fix pointer event properties 2017-09-25 10:19:42 -07:00
Olivier Prat
f31e9df21c Fixed incorrect pixel byte size computation in KTX 2017-09-25 10:31:49 +02:00
Olivier Prat
23c77d528a Merged with master with new abotProcessing in image 2017-09-25 09:48:24 +02:00
utkarshgautamnyu
6c40d39f81 refactored jsbaker.cpp 2017-09-24 20:53:09 -07:00
Sam Gateau
f90dc64241 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-24 19:32:57 -07:00
Andrew Meadows
cf0dd6f8c3 Merge pull request #11371 from cain-kilgore/21542 
WL 21542 - Allow Scripts to change Avatar Gravity [Experimental]
 2017-09-23 22:20:52 -07:00
Brad Hefta-Gaub
bafb59e691 Merge pull request #11436 from SamGondelman/missingModels 
Fix missing models
 2017-09-23 13:56:50 -07:00
utkarshgautamnyu
cda5e94b33 Added JavaScript Baking 2017-09-22 20:57:18 -07:00
samcake
59006411c6 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-22 18:00:58 -07:00
Zach Fox
921ebc221e Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled 
Enable Inspection Mode for all; change Commerce setting name
 2017-09-22 17:52:27 -07:00
SamGondelman
86198606e0 add _modelJustLoaded and updateTransforForSkinnedMesh on creation 2017-09-22 17:12:44 -07:00
SamGondelman
cbe621f2b7 add searchRay to RayPickResult, fix precision picking caching with multiple lasers, make laser addition/removal immediate 2017-09-22 15:15:15 -07:00
Howard Stearns
8fdd405593 consistent comments 2017-09-22 15:10:30 -07:00
Howard Stearns
f25e22b463 entityInstanceNumber 2017-09-22 15:06:39 -07:00
Howard Stearns
7724fc204b working checkpoint 2017-09-22 14:19:54 -07:00
SamGondelman
bc477608ee fix alpha on glowLines 2017-09-22 13:22:08 -07:00
Zach Fox
430d1b22bb Update angular size and i behavior 2017-09-22 11:41:28 -07:00
Zach Fox
bb9db3ef6d Updates to behavior and shader appearance 2017-09-22 11:24:30 -07:00
Anthony Thibault
20cb02dabb Merge pull request #11440 from hyperlogic/bug-fix/text-entity-rendering 
Fix for TextEntity rendering, the translation was incorrect
 2017-09-22 11:19:24 -07:00
samcake
47b7fcc532 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-22 11:03:05 -07:00
samcake
061ec69b09 Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface 2017-09-22 10:52:30 -07:00
SamGondelman
be27376c52 add comment about bottleneck 2017-09-22 10:21:32 -07:00
Anthony J. Thibault
d3c60f3057 Fix for TextEntity rendering, the translation was incorrect 
This was caused by the removal of _dimensions from the SpatiallyNestable scale component.
 2017-09-22 09:44:51 -07:00
Howard Stearns
6c47b71356 Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-09-22 09:23:46 -07:00
Brad Davis
549cb77902 Fix dimensions of rendered web entities 2017-09-21 20:59:01 -07:00
SamGondelman
9f12d3a365 fix missing models 2017-09-21 17:57:25 -07:00
samcake
eed099502a minimise the changes compared to upstream 2017-09-21 17:20:32 -07:00
samcake
510ecbb137 Merging with upstream 2017-09-21 16:59:15 -07:00
Cain Kilgore
0d33976035 Real time changes 2017-09-22 00:38:30 +01:00
Anthony J. Thibault
54e627e2c5 Merge branch 'master' into feature/ant-man2 2017-09-21 13:59:47 -07:00
Ryan Huffman
abbe263142 Fix FBXBaker not properly handling textures with the same name 2017-09-21 13:40:39 -07:00
Howard Stearns
81585afb7c Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-09-21 12:46:34 -07:00
Ken Cooke
84786ac8e3 Merge pull request #11424 from ctrlaltdavid/21548 
Fix recording just made not playing back if reload it
 2017-09-21 12:19:23 -07:00
David Rowe
a2d8152a3a Coding standard 2017-09-22 07:13:32 +12:00
Zach Fox
57b5a23373 Enable Inspection Mode for all; change Commerce setting name 2017-09-21 11:18:21 -07:00
samcake
9a9d13e519 Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface 2017-09-21 09:05:46 -07:00
Andrew Meadows
6b3b3a7448 Merge pull request #11382 from ElderOrb/case6618 
6618 [Worklist] Add Input Field On Top of Keyboard
 2017-09-21 08:54:11 -07:00
Andrew Meadows
b803344f0c Merge pull request #11421 from jherico/fix/transform_log_spam 
Don't add items to the scene graph until they have a valid parent chain
 2017-09-21 08:42:56 -07:00
Ryan Huffman
a56303a3fe Merge pull request #11379 from highfidelity/feat/auto-bake 
Add auto baking to Asset Server and mesh compression for FBXs
 2017-09-21 08:33:51 -07:00
Olivier Prat
98820f720d KTX serialization / unserialization working with compressed HDR. Not sure with packed floats 2017-09-21 13:17:25 +02:00
Olivier Prat
f4579d44bc Merge branch 'master' of git://github.com/highfidelity/hifi into hdrcube 2017-09-21 10:03:16 +02:00
Olivier Prat
5699dc6f42 Added KTX support of compressed HDR and HDR formats 2017-09-21 10:03:05 +02:00
Olivier Prat
5ec9c5bb45 Fixed some coding standard issues 2017-09-21 09:32:34 +02:00
samcake
ad1cab71f3 Merge branch 'master' of https://github.com/highfidelity/hifi into game_render_interface 2017-09-20 18:10:37 -07:00
David Rowe
4ce5e4ac46 Fix recording just made not playing back if reload it 2017-09-21 12:19:32 +12:00
Brad Davis
27350bd7de Don't add items to the scene graph until they have a valid parent chain 2017-09-20 16:52:23 -07:00
Cain Kilgore
45f79b4341 Small fix 2017-09-21 00:00:24 +01:00
Anthony J. Thibault
09c61deda8 Fixes for Vive puck calibration 2017-09-20 15:41:49 -07:00
Cain Kilgore
322b7fc060 Cleanup from Merge 2017-09-20 23:37:33 +01:00
Cain Kilgore
f06c04e1b0 Fixed things 2017-09-20 23:24:56 +01:00
Cain Kilgore
796e9e7ab3 Fixed things 2017-09-20 23:23:30 +01:00
Cain Kilgore
4d904bd5ce Changed naming of avatarGrav 2017-09-20 18:43:16 +01:00
Cain Kilgore
506226ead0 Merge branch 'master' into 21542 2017-09-20 18:22:34 +01:00
Anthony J. Thibault
809e986738 Fixes for lasers on 2d HUD 2017-09-20 09:21:14 -07:00
samcake
fd8868f609 Moving the render transform evaualtion in game loop for Models 2017-09-19 17:30:20 -07:00
Bradley Austin Davis
bc4193f276 Merge branch 'master' into android_new 2017-09-19 14:27:31 -07:00
Chris Collins
0a213e24c4 Merge pull request #11389 from highfidelity/RC-55 
Beta Release 55 - Includes up to Developer Release 7127
 2017-09-19 14:23:58 -07:00
Ryan Huffman
20759b0c97 Merge pull request #11404 from birarda/feat/auto-bake 
add abort on shutdown to Baker/FBXBaker/TextureBaker
 2017-09-19 14:20:56 -07:00
Stephen Birarda
a8ac015bc4 address code review comments 2017-09-19 13:56:42 -07:00
Clément Brisset
a6376fcc12 Merge pull request #11402 from huffman/fix/remove-fbxcpp 
Remove FBX.cpp and other cleanup
 2017-09-19 13:54:50 -07:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
vladest
50ee41e095 Fix file loading dialogs 2017-09-19 22:42:15 +02:00
Stephen Birarda
e1d79ee8f4 add abort to Baker and subclasses 2017-09-19 13:18:23 -07:00
vladest
67771bc297 Merge branch 'master' into modal_dialogs_async 2017-09-19 21:51:02 +02:00
Stephen Birarda
0d166cc250 Merge pull request #11400 from Atlante45/feat/auto-bake 
Remove unused Algorithms.h
 2017-09-19 12:44:15 -07:00
Ryan Huffman
5950006111 Remove extraneous logging 2017-09-19 11:18:25 -07:00
Ryan Huffman
641addf397 Remove FBX.cpp 2017-09-19 11:13:39 -07:00
vladest
6c32783a09 Merge branch 'master' into audio_devices_split 2017-09-19 17:43:03 +02:00
Clément Brisset
108de209bb Merge pull request #11393 from birarda/feat/auto-bake 
don't export embedded textures with original, remove triangle warning
 2017-09-18 16:21:07 -07:00
Atlante45
b9e5957c9f Remove unused Algorithms.h 2017-09-18 16:14:06 -07:00
Anthony J. Thibault
73ad9051a4 Shapes now render at the correct size. 2017-09-18 15:27:58 -07:00
Stephen Birarda
608f8196c6 remove commented out removal of embedded media folder 2017-09-18 14:01:48 -07:00
Stephen Birarda
02a529923e don't export embedded textures, remove triangle warning 2017-09-18 14:00:03 -07:00
Anthony J. Thibault
7e2b2960ed Fix for lighting as IPD scale changes. 
(cherry picked from commit a260aaaae8)
 2017-09-18 12:15:32 -07:00
Anthony J. Thibault
0757f513af Merge branch 'master' into feature/ant-man 2017-09-18 11:36:39 -07:00
Anthony J. Thibault
5187ac4761 Avatar Attachments now render correctly 
* moved Avatar::fixupModelsInScene off the newly created render thread back
  to the main thread.
* updated Avatar::postUpdate to take a scene pointer, necessary for
  Avatar::fixupModelsInScene
* updated developer/tests/avatarAttachementTest.js to account for recent
  changes in avatar attachment scale, commit 712aff7ad.
* updated initialization of anim graph to use Model::isLoaded() instead of
  Model::initWhenReady() to know when the model was completely loaded.
 2017-09-18 10:57:04 -07:00
beholder
8b39c56aa1 rename 'target' to 'targetOverride' to indicate that parameter overrides default target 2017-09-18 20:40:22 +03:00
Ryan Huffman
d80aa50e79 Remove support for QList in FBXWriter 2017-09-18 09:04:13 -07:00
Olivier Prat
037550f176 Switched back to R11G11B10 for HDR cube maps because of sometimes wrong hue shifts with RGB9E5 2017-09-18 10:58:38 +02:00
vladest
1cde504c74 Memleak fix. Cleanup 2017-09-16 22:57:26 +02:00
vladest
5585265349 Merge branch 'master' into modal_dialogs_async 2017-09-16 22:06:49 +02:00
vladest
3ceeb0d83e Rework all c++ calls 2017-09-16 22:04:53 +02:00
Seth Alves
765031bf89 Merge pull request #11377 from vladest/create_resize 
Add resizable flag. Use the flag for Create only
 2017-09-16 11:14:40 -07:00
Sam Gateau
84dfe53fee Merge pull request #11362 from jherico/crash/model-race 
Ensure thread-safety for model pointer access
 2017-09-16 10:45:09 -07:00
beholder
871b169128 6618 [Worklist] Add Input Field On Top of Keyboard 2017-09-16 16:17:36 +03:00
vladest
5b033e021a Merge branch 'master' into modal_dialogs_async 2017-09-16 12:30:07 +02:00
howard-stearns
b9f5810d99 snapshot 2017-09-15 17:09:07 -07:00
Stephen Birarda
1f961885cc Merge pull request #11369 from huffman/feat/bake-skinning-support 
Add animation support for draco encoded FBXs
 2017-09-15 15:21:35 -07:00
Ryan Huffman
2a4f7712c3 Replace magic number for compressed flag in FBXWriter 2017-09-15 14:41:38 -07:00
Ryan Huffman
c5852dfbe8 Add list compression to FBXWriter 2017-09-15 13:53:10 -07:00
Anthony Thibault
c7fc45e0ae Merge pull request #11375 from hyperlogic/bug-fix/avatar-attachments-rendering 
Avatar Attachments now render correctly
 2017-09-15 13:28:00 -07:00
vladest
de4f34aacb Add resizable flag. Use the flag for Create only 2017-09-15 21:49:38 +02:00
Seth Alves
d968bbad6c Merge pull request #11364 from sethalves/rework-scriptengine-lifetime 
Rework scriptengine lifetime
 2017-09-15 12:17:51 -07:00
samcake
a49b4dc31f Merge back blue-bis in 2017-09-15 11:40:26 -07:00
Anthony J. Thibault
3f6c88e77f Avatar Attachments now render correctly 
* moved Avatar::fixupModelsInScene off the newly created render thread back
  to the main thread.
* updated Avatar::postUpdate to take a scene pointer, necessary for
  Avatar::fixupModelsInScene
* updated developer/tests/avatarAttachementTest.js to account for recent
  changes in avatar attachment scale, commit 712aff7ad.
* updated initialization of anim graph to use Model::isLoaded() instead of
  Model::initWhenReady() to know when the model was completely loaded.
 2017-09-15 11:23:09 -07:00
Seth Alves
8a49edbecb code review 2017-09-15 10:08:35 -07:00
Cain Kilgore
0526d32802 Merge branch 'master' of https://github.com/highfidelity/hifi into 21542 2017-09-15 06:05:43 +01:00
Cain Kilgore
c2e342ddac Gravity Implementation 2017-09-15 06:03:56 +01:00
samcake
bff578b283 Working version that fixes the web overlay / tablet 2017-09-14 17:07:50 -07:00
Ryan Huffman
fd1d4b9bd1 Update FBXBaker to only pack original indices if needed 2017-09-14 16:49:53 -07:00
Ryan Huffman
7db8d1dcbc Add support for baked skinned meshes 2017-09-14 16:43:52 -07:00
Ryan Huffman
3793062045 Add optional FBX 2015 encoding to FBXWriter 2017-09-14 16:31:10 -07:00
Stephen Birarda
2a62bac4f9 refuse to re-bake an already baked FBX 2017-09-14 16:08:11 -07:00
Brad Davis
d3ac7a388c Fix polyline rendering using default texture 2017-09-14 15:50:09 -07:00
Brad Davis
4c4df97c42 Fix transform of polylines with high update rates 2017-09-14 15:50:02 -07:00
Brad Davis
c0fb9dcf2e Fix polyline crash and flicker 2017-09-14 15:49:54 -07:00
Atlante45
ae14f1f88e Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-09-14 15:34:20 -07:00
Clément Brisset
cbe61871dc Merge pull request #11346 from birarda/feat/draco-in-baking 
Add mesh compression to baking library and FBXReader
 2017-09-14 15:32:58 -07:00
Stephen Birarda
43196cd0a6 fix buffer resizing to only occur when attribute is present 2017-09-14 14:46:48 -07:00
Stephen Birarda
bb98df38d4 remove re-grabbing of draco faces 2017-09-14 14:42:40 -07:00
Stephen Birarda
9cb4e2c5f2 address code review comments 2017-09-14 13:58:48 -07:00
Brad Davis
688ee68cf9 Ensure thread-safety for model pointer access 2017-09-14 12:29:23 -07:00
vladest
0bfa29d0d4 Merge branch 'master' into modal_dialogs_async 2017-09-14 20:21:29 +02:00
samcake
3d33ab9686 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-14 11:18:25 -07:00
Brad Davis
aef85eb69d Fix polyline rendering using default texture 2017-09-14 10:48:14 -07:00
Seth Alves
cf2979dc78 Merge branch 'master' of github.com:highfidelity/hifi into rework-scriptengine-lifetime 2017-09-14 10:42:26 -07:00
Seth Alves
d89f2b77da rework ScriptEngine lifetimes using 'smart' pointers 2017-09-14 10:42:21 -07:00
Anthony J. Thibault
7959988622 Merge branch 'master' into feature/ant-man 2017-09-14 10:37:45 -07:00
Brad Davis
501eee8b10 Fix transform of polylines with high update rates 2017-09-14 08:45:37 -07:00
Brad Davis
75e7146c5b Fix polyline crash and flicker 2017-09-14 08:45:36 -07:00
Sam Gateau
e4a5b7f250 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-13 19:28:56 -07:00
Anthony J. Thibault
8fb69a9867 Merge branch 'master' into feature/ant-man 2017-09-13 18:23:11 -07:00
Brad Davis
f4d8216501 Fix race condition accessing QString sub-properties in zones 2017-09-13 18:06:21 -07:00
Cain Kilgore
72ca62c4af Initial Commit - more to do. 2017-09-14 00:25:11 +01:00
Stephen Birarda
bfb4dd0cdb disable warning c4267 when including draco 2017-09-13 14:00:41 -07:00
Stephen Birarda
1e6154fbc8 make draco compile flags OS X only 2017-09-13 13:45:26 -07:00
David Kelly
030b39050a Merge pull request #11343 from davidkelly/dk/oneFileWallet 
Wallet updates
 2017-09-13 11:15:03 -07:00
SamGondelman
f68a588323 rename isAA isAntiAliased 2017-09-13 10:24:10 -07:00
Olivier Prat
b8065d46ce Fixed bugs with conversion to packed floats 2017-09-13 19:15:51 +02:00
Atlante45
7d9daea0f6 Transmit baking errors to interface for display. 2017-09-13 09:54:54 -07:00
Cain Kilgore
2427008ff3 Static 2017-09-13 17:40:04 +01:00
Stephen Birarda
dc86c6fe73 fixes for warnings in FBXReader/FBXWriter 2017-09-13 09:16:58 -07:00
Cain Kilgore
1c05311056 Some code cleanup 2017-09-13 16:48:18 +01:00
Andrew Meadows
50b94887fa Merge pull request #11339 from ElderOrb/case7469 
7469 Mouse Pointer Depth is Incorrect in HMD Mode
 2017-09-13 08:33:09 -07:00
Andrew Meadows
5741699bab Merge pull request #11301 from Menithal/21484-Fix 
WL21484 _- Hotfix - Solve Joint array issues with Similar, but not same Skeletons
 2017-09-13 08:05:53 -07:00
Olivier Prat
aab63bf109 Added support for R11G11B10F and RGB9E5 cubemaps. Weird colors though but it doesn't crash 2017-09-13 14:32:22 +02:00
David Kelly
7550374f8f Merge branch 'master' of https://github.com/highfidelity/hifi into dk/oneFileWallet 2017-09-13 04:49:13 -07:00
Stephen Birarda
8a9e4029ae use explicit conversion from size_t to int 2017-09-13 00:23:52 -07:00
Stephen Birarda
4efd9b8453 set explicit draco encoding options 2017-09-12 23:45:34 -07:00
Ryan Huffman
087a95a625 Add explicit draco encoder options to FBXBaker 2017-09-12 23:15:35 -07:00
Stephen Birarda
c445d914d7 make sure material IDs are de-duplicated 2017-09-12 22:04:33 -07:00
Stephen Birarda
88b8fb4c5e use general worker threads for fbx baking 2017-09-12 20:02:27 -07:00
Ryan Huffman
c9024f5e87 Update FBXBaker to bake triangleIndices and fix faces being lost 2017-09-12 19:59:43 -07:00
Stephen Birarda
b253d3b57c fix material triangle index insertion 2017-09-12 17:44:53 -07:00
SamGondelman
a955381726 Merge remote-tracking branch 'upstream/master' into textAA 2017-09-12 16:50:16 -07:00
SamGondelman
1b85a453ab working on text3d overlays and entities 2017-09-12 16:49:51 -07:00
Stephen Birarda
a25e5796dc use push_back instead of append for extracted mesh vectors 2017-09-12 16:35:21 -07:00
Stephen Birarda
bb7cd58e9a fix reference to part index 2017-09-12 16:28:12 -07:00
Stephen Birarda
5d9ed78369 fixes for extracted mesh construction 2017-09-12 16:09:40 -07:00
Stephen Birarda
cf282dd3fc add code to read draco mesh from FBX 2017-09-12 15:04:53 -07:00
samcake
216d74c112 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-12 14:36:12 -07:00
samcake
10b1e3f561 Trying to implement differnet solution to the transform updates problem and debug 2017-09-12 14:35:25 -07:00
Stephen Birarda
61314949ec add draco as external to FBX library 2017-09-12 14:10:27 -07:00
Ryan Huffman
395c9283dc Merge remote-tracking branch 'upstream/feat/auto-bake' into feat/auto-bake-fbxwriter 2017-09-12 14:09:59 -07:00
David Kelly
187ed71a8a more cleanup, plus now keyfile associated with user directly 2017-09-12 10:55:27 -07:00
Stephen Birarda
2105f2da92 change unique ID for material and second tex coord 2017-09-12 10:27:07 -07:00
Ryan Huffman
9243cf7590 Remove extraneous logging in FBXWriter 2017-09-12 09:45:46 -07:00
Ryan Huffman
2d9d432221 Update FBXBaker to remove unused nodes from the Geometry node 2017-09-12 09:45:24 -07:00
Ryan Huffman
8fc8b8100d Fix FBXBaker failing on bad mesh data and draco meshes that can't be encoded 2017-09-12 09:44:44 -07:00
beholder
deee6aab1a 7469 Mouse Pointer Depth is Incorrect in HMD Mode 2017-09-12 04:24:18 +03:00
samcake
01e4bfc53e Trying to avoid calling getTransform on nestables from render thread 2017-09-11 17:36:10 -07:00
Bradley Austin Davis
0f465da92f Various Mac fixes 2017-09-11 17:17:07 -07:00
Bradley Austin Davis
3a75dcf84d Fix crashes in entity rendering on OSX 2017-09-11 17:17:00 -07:00
Anthony J. Thibault
b81f85e1ae Merge branch 'master' into feature/ant-man 2017-09-11 15:14:03 -07:00
anshuman64
996277b34c Merge pull request #11335 from vladest/menu_fix 
Make sure root item is created before lambda gets called for desktop …
 2017-09-11 12:47:40 -07:00
Ryan Huffman
b1d0df06d9 Add error handling in FBXBaker for empty nodes and failed draco compression 2017-09-11 12:07:41 -07:00
Ryan Huffman
ebd925b966 Add proper per face materials and texCoords1 to fbx baking 2017-09-11 10:52:59 -07:00
vladest
34c1cb6579 Typos and naming fixes 2017-09-11 19:42:05 +02:00
Menithal
40d339a831 21484: Updated code to go with PR feedback 2017-09-11 20:36:29 +03:00
Andrew Meadows
ce3ed68861 Merge pull request #11333 from ctrlaltdavid/faster-fade-in 
Reduce entity fade-in time
 2017-09-11 09:29:45 -07:00
Chris Collins
47a9337aa7 Merge pull request #11323 from jherico/mac_fixes 
Mac fixes
 2017-09-11 09:10:50 -07:00
Andrew Meadows
1f766f743d Merge pull request #11293 from jherico/fix_hmd_menu 
Fix access to menu on background thread
 2017-09-11 08:26:04 -07:00
vladest
dfaa8761e5 Make sure root item is created before lambda gets called for desktop loader 2017-09-10 20:08:40 +02:00
Cain Kilgore
f6e22b0733 Changes 
The ID no longer relies on the Avatar Session ID as this changed per domain switch. The intention of this PR is to be able to group the log files easier, hence why it now relies on Interface ID instead. Additionally, when no ID is found when the interface is first launched, the ID doesn't appear in the rolled over log file. It will just appear blank.
 2017-09-09 17:21:42 +01:00
David Rowe
6ba6c6ee35 Reduce entity fade-in time 2017-09-09 18:00:21 +12:00
Ryan Huffman
3d6d383a15 Clean up duplicate list code in encodeFBXProperty 2017-09-08 16:58:57 -07:00
Ryan Huffman
9b462171f6 Add draco support to FBXBaker 2017-09-08 16:58:29 -07:00
Seth Alves
f5d77104c3 Merge pull request #11332 from sethalves/squelch-cannot-render 
suppress repeated 'item could not be rendered' messages
 2017-09-08 16:23:22 -07:00
Cain Kilgore
387e474889 WIP 2017-09-08 23:48:09 +01:00
Anthony Thibault
3de518a843 Merge pull request #11331 from hyperlogic/bug-fix/unexpected-t-pose 
Fix MyAvatar getting stuck in T-pose on loading
 2017-09-08 15:18:57 -07:00
Seth Alves
967d3f69d3 suppress repeated 'item could not be rendered' messages 2017-09-08 14:13:58 -07:00
Anthony J. Thibault
72e0c844e4 Merge branch 'master' into feature/ant-man 2017-09-08 14:08:26 -07:00
Cain Kilgore
7b39cb7791 Should work now 2017-09-08 21:44:38 +01:00
Cain Kilgore
dfbd25fd77 Now pls 2017-09-08 20:51:41 +01:00
Sam Gateau
ed8aa8b74d Merge pull request #11160 from Zvork/outline 
Outline effect
 2017-09-08 12:32:01 -07:00
Cain Kilgore
7f4cc0ed2a Should fix the Mac Build 2017-09-08 20:21:17 +01:00
Anthony J. Thibault
559ac6786d Fix MyAvatar getting stuck in T-pose on loading 
Before this change, there was a race condition between the main thread calling Model::initWhenReady,
and the render thread calling Avatar::fixupModelsInScene().  They both would end up setting the
Model::_addedToScene flag.  This race caused Model::initWhenReady() to never return true, which
resulted in the MyAvatar class never initializing the animation system.
 2017-09-08 11:44:06 -07:00
Stephen Birarda
0d7b50cfb6 remove old texture type method 2017-09-08 09:44:19 -07:00
Olivier Prat
d6d36cbd43 Outline working on voxels 2017-09-08 11:14:06 +02:00
Cain Kilgore
b953c49461 Commit for Better Logger - WL 21537 2017-09-08 03:20:55 +01:00
Stephen Birarda
3cf77f377c remove FBX SDK from CMake files 2017-09-07 18:46:44 -07:00
Stephen Birarda
b153d1e177 use FBXReader/FBXWriter for texture baking in FBXBaker 2017-09-07 18:38:29 -07:00
Anthony J. Thibault
f4f9c29bff Fix for avatar scale preferences 2017-09-07 15:30:16 -07:00
Bradley Austin Davis
eb8b892571 Various Mac fixes 2017-09-07 14:45:35 -07:00
Bradley Austin Davis
37b184d982 Fix crashes in entity rendering on OSX 2017-09-07 14:32:50 -07:00
Ryan Huffman
7214f57376 Update FBXBaker::exportScene with FBXWriter 2017-09-07 14:12:15 -07:00
Ryan Huffman
b60d68c714 Replace FBX SDK loading of file in FBXBaker with FBXReader 2017-09-07 14:00:09 -07:00
Ryan Huffman
7a55c867be Fix _fbxNode rename to _rootNode in FBXReader 2017-09-07 12:56:46 -07:00
Ryan Huffman
aa1aad0a09 Add FBXWriter for serializing FBXNode 2017-09-07 12:56:36 -07:00
Brad Hefta-Gaub
6a1fe81832 Merge pull request #11210 from AndrewMeadows/mtwabp-OctreeSendThread-002 
split packet construction from packet sending in OctreeSendThread
 2017-09-07 12:36:29 -07:00
Stephen Birarda
1508edb459 use store/load to be clearer about atomics 2017-09-07 12:07:58 -07:00
Stephen Birarda
7859b3b11f remove image compression choices from Interface settings 2017-09-07 12:07:57 -07:00
Stephen Birarda
5e1decb02b Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake 2017-09-07 12:06:53 -07:00
Chris Collins
12d720805c Merge pull request #11319 from jherico/async_qml_load_crash 
Fix potential crash on asynchronous QML loads
 2017-09-07 12:03:10 -07:00
Brad Hefta-Gaub
c5098abfb9 Merge pull request #10937 from kencooke/zzmp-audio/peak-values 
Add peak values for all input devices in selection dialog
 2017-09-07 11:58:50 -07:00
Olivier Prat
7fb7ebca57 Fixed warning on Mac 2017-09-07 19:03:22 +02:00
Brad Davis
cc3beb3d91 Fix potential crash on asynchronous QML loads 2017-09-07 09:53:21 -07:00
Olivier Prat
6b5ca0c6ce Optimized by removing unnecessary Z buffer copy 2017-09-07 18:33:00 +02:00
Olivier Prat
2003495166 Adjustments to half texel fix 2017-09-07 12:30:20 +02:00
Olivier Prat
b43514fb8b Modified outline shader to do fill branch on CPU. Fixed assymetric outline 
due to depth sample not offset by a half texel in shader.
 2017-09-07 12:15:38 +02:00
Olivier Prat
b9eb317d9b Fixed non working outline in stereo with new changes 2017-09-07 10:33:55 +02:00
Anthony J. Thibault
2f850826f2 Allow override of near/far clip planes in Oculus and OpenVR plugins 2017-09-06 11:02:44 -07:00
Menithal
e1acf9dbc9 Merge remote-tracking branch 'upstream/master' into 21484-Fix 2017-09-06 20:42:47 +03:00
Olivier Prat
17e992bd14 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-09-06 19:08:37 +02:00
Olivier Prat
25ff132fc7 Debugging scripts working again with correct occlusion management 2017-09-06 19:05:15 +02:00
Olivier Prat
10643feb78 Working with specific zpass rendering for outline. Debug script needs relinking to correct config 2017-09-06 18:40:38 +02:00
Olivier Prat
d6ea01c4f3 Created outline task but still need to create specific render job with z-pass shaders 2017-09-06 17:34:29 +02:00
Olivier Prat
75e06b691f Simplified version that works directly with metas 2017-09-06 15:59:04 +02:00
Olivier Prat
700d4a4b43 First working version of outline working with selection interface. 2017-09-06 15:47:10 +02:00
vladest
57643bd904 Merge branch 'master' into audio_devices_split 2017-09-06 14:20:41 +02:00
anshuman64
3a44c6977e Merge pull request #11300 from ElderOrb/case7196 
7196 Mouse pointer no longer visible in HMD mode
 2017-09-05 17:42:36 -07:00
Dante Ruiz
fec8482b69 Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man 2017-09-05 16:26:51 -07:00
Anthony J. Thibault
23ff1b9ead Fixes for scaling controller display 
Adds MyAvatar.sensorToWorldScaleChanged signal.
 2017-09-05 15:03:41 -07:00
Anthony J. Thibault
f0912987a3 Fix ray picks against HUD sphere at different sensor scale factors 2017-09-05 10:03:19 -07:00
Andrew Meadows
4b8840f307 Merge pull request #11282 from sethalves/fix-winking-dynamic-children-1 
fix a bug that caused dynamic children to wink in and out and then vanish
 2017-09-05 10:02:47 -07:00
Olivier Prat
b619b2311d Merged with master 2017-09-05 10:27:53 +02:00