Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 09:16:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
59280 commits 25 branches 0 tags 1.1 GiB
Commit graph

59280 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Stephen Birarda
e1d79ee8f4 add abort to Baker and subclasses 2017-09-19 13:18:23 -07: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
vladest
10f7f08171 Added peak model, missed during merging 2017-09-19 21:42:52 +02:00
Atlante45
1f485ac8f8 Fix OpenSSL build instructions 2017-09-19 12:07:24 -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
6297448e90 Build fix 2017-09-19 19:49:19 +02:00
Bradley Austin Davis
2eff3dcbd6 Add additional DLL cleanup 2017-09-19 09:18:40 -07:00
vladest
6c32783a09 Merge branch 'master' into audio_devices_split 2017-09-19 17:43:03 +02:00
Seth Alves
a889ca1b01 Merge pull request #11396 from hyperlogic/bug-fix/shape-rendering 
Shapes now render at the correct size.
 2017-09-18 17:41:31 -07: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
Stephen Birarda
57a92adc73 flag node as local by sending address, not by local from packet 2017-09-18 15:39:51 -07:00
Cain Kilgore
320c6e6769 Merge branch 'master' of https://github.com/highfidelity/hifi into 21540 2017-09-18 23:39:15 +01:00
Cain Kilgore
dbe7cc5d1a 21540 - Make Rotation using Vive Controller Work 2017-09-18 23:38:38 +01:00
Anthony J. Thibault
73ad9051a4 Shapes now render at the correct size. 2017-09-18 15:27:58 -07:00
Brad Hefta-Gaub
5e5b77fbaa Merge pull request #11394 from hyperlogic/bug-fix/oculus-ipd-lighting 
Oculus: fix for lighting changes as avatar scale changes
 2017-09-18 15:15:10 -07:00
anshuman64
2397e5aedb Merge pull request #11391 from druiz17/spawn-tablet 
(TabletUX improvement) changing tablet spawn position
 2017-09-18 14:56:02 -07:00
Anthony J. Thibault
f314ba38df Oculus: fix for lighting changes as avatar scale changes 
The code was incorrectly NOT using the near and far clip distances when computing
the culling projection matrix. This projection matrix is used by the lighting system
to for deferred lighting, if it does not match actual projection used for
rendering into the g-buffer, the lighting will be incorrect.
 2017-09-18 14:38:03 -07:00
Clément Brisset
02c07fd818 Merge pull request #11385 from huffman/feat/remove-fbxwriter-list-support 
Remove support for QList in FBXWriter
 2017-09-18 14:26:25 -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
druiz17
9df3b6c211 change tablet spawn position 2017-09-18 13:29:05 -07:00
Elisa Lupin-Jimenez
a41aced032 Merge pull request #11390 from elisa-lj11/master 
Fixed blocks download issue with `noDownload=false` tag
 2017-09-18 13:23:47 -07:00
Seth Alves
79d97dcc89 Merge pull request #11234 from hyperlogic/feature/ant-man 
IPD and Sensor Scaling Support
 2017-09-18 12:58:28 -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
Elisa Lupin-Jimenez
a45cc88e55 Fixed blocks download issue with noDownload=false tag 2017-09-18 11:41:30 -07:00
Anthony J. Thibault
0757f513af Merge branch 'master' into feature/ant-man 2017-09-18 11:36:39 -07:00
samcake
93d6c3a1aa Adding more comments for future fixmes 2017-09-18 10:58:45 -07:00
samcake
0e83065a6d One more: 2017-09-18 10:58:36 -07:00
samcake
fd440aeeaa addressing review comments 2017-09-18 10:57:56 -07:00
Sam Gateau
f82a507d09 Cleanup 2017-09-18 10:57:49 -07:00
samcake
a8bf4efc8b Brining the changes just to fix the tablet issue 2017-09-18 10:57:40 -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
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
Seth Alves
095cd03ee2 Merge pull request #11380 from ctrlaltdavid/fix-controller-typos 
Fix typos in controller modules disabler
 2017-09-16 11:13:15 -07:00
Seth Alves
4fcbaf6f4d Merge pull request #11374 from sethalves/fix-grab-entity-methods 
fix grab entity methods + jshint cleanups
 2017-09-16 11:11:13 -07:00
Seth Alves
04b99ef8a5 Merge pull request #11352 from 1P-Cusack/FogBugz/Case_6107 
[QML] Fixes FogBugz Case 6107: Can't sort on import menu (details below).
 2017-09-16 11:08:59 -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
David Rowe
18b71f0c0f Fix typos in controller modules disabler 2017-09-16 15:34:53 +12:00
Sam Gateau
512e9432ed Merge pull request #11370 from samcake/blue-bis 
Fixing the web surface of the tablet
 2017-09-15 15:36:55 -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
1ca926c780 Merge pull request #11378 from Atlante45/feat/auto-bake 
Fix Asset Server layout on the tablet
 2017-09-15 14:52:47 -07:00
Atlante45
a37642ba44 Pull Auto-Baking changes to TabletAssetServer.qml 2017-09-15 14:43:15 -07:00
Ryan Huffman
2a4f7712c3 Replace magic number for compressed flag in FBXWriter 2017-09-15 14:41:38 -07:00
samcake
524c94cdd4 Adding more comments for future fixmes 2017-09-15 14:35:45 -07:00