Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-20 22:21:04 +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
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
Luis Cuenca
68bce3c09c Qmap initialized 2017-09-13 07:04:50 -07:00
Olivier Prat
aab63bf109 Added support for R11G11B10F and RGB9E5 cubemaps. Weird colors though but it doesn't crash 2017-09-13 14:32:22 +02:00
David Kelly
7550374f8f Merge branch 'master' of https://github.com/highfidelity/hifi into dk/oneFileWallet 2017-09-13 04:49:13 -07:00
Artur Gomes
b65520e788 Merge remote-tracking branch 'upstream/master' 2017-09-13 12:32:17 +01: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
Luis Cuenca
f25288178b endif fixed 2017-09-12 21:35:34 -07:00
David Rowe
709e7e7d90 Add undo/redo for clone 2017-09-13 15:25:40 +12:00
Luis Cuenca
e1ac16498e Corrected Ubuntu Errors 
Corrected:
-endif
-extra qualification
-invalid initialization of non-const reference
 2017-09-12 20:19:44 -07:00
David Rowe
003c1c7bc5 Add undo/redo for group/ungroup 2017-09-13 15:16:16 +12: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
David Rowe
8c9026c892 Add undo/redo for scaling 2017-09-13 14:13:48 +12:00
David Rowe
97b2988005 Miscellaneous fixes 2017-09-13 14:13:23 +12:00
Stephen Birarda
b253d3b57c fix material triangle index insertion 2017-09-12 17:44:53 -07:00
SamGondelman
a955381726 Merge remote-tracking branch 'upstream/master' into textAA 2017-09-12 16:50:16 -07:00
SamGondelman
1b85a453ab working on text3d overlays and entities 2017-09-12 16:49:51 -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
samcake
216d74c112 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-12 14:36:12 -07:00
samcake
10b1e3f561 Trying to implement differnet solution to the transform updates problem and debug 2017-09-12 14:35:25 -07:00
David Rowe
d718ea6928 Add undo/redo for move 2017-09-13 09:17:28 +12: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
Daniela
6941a10639 Add SensorToWorldScale factor to the bounding box dimensions in AvatarMixerSlave. 2017-09-12 21:10:19 +01:00
Dante Ruiz
bf32f65efe Merge pull request #11341 from vladest/flickable_off 
Flickable off
 2017-09-12 13:09:06 -07:00
Menithal
40beb4bca8 Some minor tweaks 2017-09-12 22:12:30 +03:00
Artur Gomes
6e5eb1d918 Made the number of points per line 70 again for test purposes. 2017-09-12 20:03:32 +01:00
Chris Collins
bb26cf2179 Merge pull request #11342 from Atlante45/RC-54 
Fix RC-54 conflict with stable
 2017-09-12 11:48:13 -07:00
Menithal
79603765c4 Removed unused check 2017-09-12 21:40:15 +03:00
Menithal
5aab3f3cf3 Switched from marketplace links to local 2017-09-12 21:24:14 +03:00
Menithal
ca2d22a192 Updated Scripts 2017-09-12 21:22:40 +03:00
Daniela
5a918a3033 Add SensorToWorldScale factor to the bounding box dimensions. 2017-09-12 19:00:57 +01:00
David Kelly
187ed71a8a more cleanup, plus now keyfile associated with user directly 2017-09-12 10:55:27 -07:00
Dante Ruiz
d90f6320a9 Merge pull request #8 from sethalves/controller-dispatcher-1 
Controller dispatcher 1
 2017-09-12 10:54:10 -07:00
Atlante45
c170cc2eb1 Merge branch 'stable' of https://github.com/highfidelity/hifi into RC-54 2017-09-12 10:53:04 -07:00
druiz17
b634292261 fixing some small issues 2017-09-12 10:53:04 -07:00
Seth Alves
e9918ca599 add profiling to controller-dispatcher 2017-09-12 10:52:52 -07:00
Seth Alves
a9aa6df93e Merge branch 'controller-dispatcher-1' of github.com:sethalves/hifi into controller-dispatcher-1 2017-09-12 10:44:29 -07:00
Seth Alves
315f874824 add profiling to controller-dispatcher 2017-09-12 10:44:09 -07:00