Anthony J. Thibault
745d2ff395
Remove handControllerGrab.js, see controllerDispatcher.js instead.
2017-09-13 17:36:56 -07:00
Brad Davis
e595541da0
Remove old versions of the VC Runtime from the installation directory
2017-09-13 17:21:54 -07:00
anshuman64
d3dbd431d6
Merge pull request #11279 from druiz17/controller-dispatcher-1
...
handControllerGrab Refactor -> controllerDispatcher
2017-09-13 16:56:57 -07:00
druiz17
1b288ef860
make garbbing radius the same as master
2017-09-13 16:15:36 -07:00
Stephen Birarda
7b36105793
Merge pull request #11347 from Atlante45/feat/auto-bake
...
Finalize auto baking UI
2017-09-13 16:05:38 -07:00
druiz17
310dbce65d
fixed merge conflict
2017-09-13 15:55:04 -07:00
Chris Collins
84998a3360
Merge pull request #11351 from Atlante45/new-master
...
Update master from stable
2017-09-13 14:28:44 -07:00
Anthony J. Thibault
a505a16232
Don't rescale tablet, in desktop mode, when sensorToWorldScale changes.
2017-09-13 14:22:49 -07:00
Anthony J. Thibault
ae2d0e89b4
Fixes for desktop tablet
2017-09-13 14:18:00 -07:00
Stephen Birarda
bfb4dd0cdb
disable warning c4267 when including draco
2017-09-13 14:00:41 -07:00
Stephen Birarda
c365e1718e
set include dir for draco the same across the board
2017-09-13 13:51:26 -07:00
Stephen Birarda
1e6154fbc8
make draco compile flags OS X only
2017-09-13 13:45:26 -07:00
Stephen Birarda
4066c9392d
output from oven into folder with model name
2017-09-13 13:34:15 -07:00
LaShonda Hopper
33c8e90e34
[QML] Fixes FogBugz Case 6107: Can't sort on import menu (details below).
...
Looking through the log revealed the following warning:
".../qml/dialogs/FileDialog.qml:489: Error: Cannot assign to non-existent property 'sortOrder'"
There was some refactoring to address some HMD functionality in 51b44d9051b44d90https://highfidelity.fogbugz.com/f/cases/6107
Reviewed-by: Leander Hasty <leander@1stplayable.com>
Changes Committed:
modified: interface/resources/qml/dialogs/FileDialog.qml
2017-09-13 16:25:36 -04:00
Atlante45
d3966ce8c2
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2017-09-13 13:14:25 -07:00
Melissa Brown
49ab8af428
Merge pull request #11344 from Menithal/21536
...
21536: Clap App!
2017-09-13 12:54:31 -07:00
Anthony J. Thibault
de5f0ad987
WebTablet.js: calcSpawnInfo works more consistently.
2017-09-13 12:01:41 -07:00
Menithal
59746c564b
21536: Applied forgotten beutify to file
2017-09-13 21:24:24 +03:00
David Kelly
030b39050a
Merge pull request #11343 from davidkelly/dk/oneFileWallet
...
Wallet updates
2017-09-13 11:15:03 -07:00
Chris Collins
1b608a7d35
Merge pull request #11315 from highfidelity/RC-54
...
Beta Release 54 - Includes up to Developer Release 7078
2017-09-13 10:36:28 -07:00
Atlante45
c04a6b5b88
Add error tooltip
2017-09-13 09:54:56 -07:00
Atlante45
9e11ae311e
Fix error reporting
2017-09-13 09:54:55 -07:00
Atlante45
2e84f48539
Fix QML errors
2017-09-13 09:54:55 -07:00
Atlante45
9f2b0258e9
Update baking status with the correct checkmark glyph
2017-09-13 09:54:55 -07:00
Atlante45
944a4fd49d
Update hifi glyphs + font reference
2017-09-13 09:54:55 -07:00
Atlante45
7d9daea0f6
Transmit baking errors to interface for display.
2017-09-13 09:54:54 -07:00
Atlante45
48e58febc6
Remove deprecated AutoBaker
2017-09-13 09:54:54 -07:00
Anthony J. Thibault
9a1fa9b2f2
Fix for stylus intersection with tablet and home button for scaled tablets
2017-09-13 09:52:20 -07:00
David Kelly
bce92a622e
cr feedback
2017-09-13 09:45:02 -07:00
Stephen Birarda
dc86c6fe73
fixes for warnings in FBXReader/FBXWriter
2017-09-13 09:16:58 -07: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
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
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
druiz17
b3ff5c86f7
fixed secondary triggers and chest lid
2017-09-12 14:43:06 -07:00
druiz17
0b360f455c
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-12 14:38:07 -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
Clément Brisset
c1685d827e
Merge pull request #11288 from birarda/feat/bake-with-compression
...
enable compression in image library from Asset Server
2017-09-12 14:08:03 -07:00
druiz17
cc7bb9a1bf
Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man
2017-09-12 13:16:03 -07:00
