Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 03:43:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
59059 commits 76 branches 59 tags 1.2 GiB
Commit graph

59059 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Clément Brisset
9816070e70 Merge pull request #11366 from Atlante45/feat/auto-bake 
Update feat/auto-bake with master
 2017-09-14 15:36:32 -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
Seth Alves
10494cf3e0 Merge pull request #11359 from vladest/fix_runningscripts_selection 
use selection model of TreeView
 2017-09-14 11:22:08 -07:00
Seth Alves
11df5a447e Merge pull request #11310 from ElderOrb/case6718 
6718 PR11082: Help text cannot be dismissed by clicking on the text i…
 2017-09-14 11:17:48 -07:00
Seth Alves
dbaf60a957 Merge pull request #11363 from ElderOrb/lint-fix 
add missing comma
 2017-09-14 09:10:14 -07:00
beholder
61c5395f44 add missing comma 2017-09-14 18:48:43 +03:00
Thijs Wenker
523d099f70 Merge pull request #11355 from jherico/crash/zone-keylight 
Fix race condition accessing QString sub-properties in zones
 2017-09-14 16:03:05 +02:00
Thijs Wenker
ddb4b2d2be Merge pull request #11354 from hyperlogic/bug-fix/good-riddance 
Remove handControllerGrab.js, see controllerDispatcher.js instead.
 2017-09-14 15:42:30 +02:00
vladest
7233c47257 use selection model of TreeView 2017-09-14 15:36:12 +02:00
Brad Davis
f4d8216501 Fix race condition accessing QString sub-properties in zones 2017-09-13 18:06:21 -07:00
Anthony J. Thibault
745d2ff395 Remove handControllerGrab.js, see controllerDispatcher.js instead. 2017-09-13 17:36:56 -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
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
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
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
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