Cain Kilgore
506226ead0
Merge branch 'master' into 21542
2017-09-20 18:22:34 +01:00
samcake
5b5464fe63
Merge branch 'master' of https://github.com/highfidelity/hifi into blue-bis
2017-09-20 09:39:16 -07:00
samcake
7e4956342c
Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into game_render_interface
2017-09-20 09:38:19 -07:00
Sam Gateau
9a441f5768
Merge pull request #11409 from samcake/blue-bis
...
Moving the render transform evaluation in game loop for Models
2017-09-20 09:37:41 -07:00
druiz17
e78d8bc132
tablet on wiki planet
2017-09-20 09:11:06 -07:00
David Rowe
80f56e48ca
Fix Record app's toolbar button not highlighting when app dialog open
2017-09-20 16:50:19 +12:00
humbletim
708698f079
potential fix for the doppleganger "scrunching into a ball" issue
2017-09-19 23:21:46 -04:00
Clément Brisset
0f3834ded4
Merge pull request #11398 from birarda/bug/localhost-admin
...
flag node as local by IP from UDP header, not IP from packet data
2017-09-19 17:43:21 -07:00
samcake
fd8868f609
Moving the render transform evaualtion in game loop for Models
2017-09-19 17:30:20 -07:00
druiz17
9c66a25d83
fixing and cleanup tablet inputs
2017-09-19 17:03:53 -07:00
Chris Collins
3209a49a7d
Merge pull request #11407 from Atlante45/new-master
...
Update master from stable
2017-09-19 15:55:41 -07:00
Atlante45
23fa2707dd
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2017-09-19 15:45:15 -07:00
Stephen Birarda
fa839b8ee3
Merge pull request #11406 from birarda/feat/auto-bake
...
add memory include for unique_ptr in BakeAssetTask
2017-09-19 15:36:10 -07:00
Stephen Birarda
d4e35edc84
add memory for unique_ptr in BakeAssetTask
2017-09-19 15:08:44 -07:00
Andrew Meadows
3b3a8c8f5e
Merge pull request #11403 from Atlante45/fix/openssl-build-instructions
...
Fix OpenSSL build instructions
2017-09-19 14:29:48 -07:00
vladest
7a36894f76
Make sure audio device not gets unchecked
2017-09-19 23:25:41 +02: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
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
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
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
