Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-20 14:41:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61951 commits 72 branches 59 tags 1.2 GiB
Commit graph

61951 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Daniela
4568541737 Remove redundant variables. 2017-09-19 18:47:02 +01:00
Daniela
1426e10024 Fix texture loading issue with upstream master. Tune amount of points. 2017-09-19 17:47:00 +01:00
druiz17
e2921661e9 scaling entities 2017-09-19 09:35:22 -07: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
Daniela
7e53f0b7dc Clean up. 2017-09-19 15:29:17 +01:00
vladest
5202d024a7 Merge branch 'master' into tablet_extended_sounds 2017-09-19 15:55:37 +02:00
Daniela
52aebe34a8 Merge branch 'feature/ant-man2' of https://github.com/hyperlogic/hifi into feature/ant-man2 2017-09-19 13:03:11 +01:00
David Rowe
c56fda88fa Merge branch 'master' into vr-edit-a 2017-09-19 16:17:04 +12: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
Anthony J. Thibault
30a5f4b746 remove USE_N_SCALE preprocessor check 2017-09-18 13:30:34 -07:00
Anthony J. Thibault
6b00350938 Merge branch 'master' into feature/ant-man2 2017-09-18 13:29:43 -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
vladest
e26118254f Implemented Audio injector in Tablet scripting interface. Added missed sound events 2017-09-18 19:40:06 +02: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
bb214d7bf3 Merge branch 'master' into tablet_extended_sounds 2017-09-17 16:16:03 +02:00
vladest
1cde504c74 Memleak fix. Cleanup 2017-09-16 22:57:26 +02:00
vladest
a8d24d9161 Cleanup 2017-09-16 22:41:18 +02:00
vladest
5585265349 Merge branch 'master' into modal_dialogs_async 2017-09-16 22:06:49 +02:00