Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-06-04 00:00:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
59280 commits 22 branches 28 tags 1.2 GiB
Commit graph

59280 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Stephen Birarda
2105f2da92 change unique ID for material and second tex coord 2017-09-12 10:27:07 -07:00
Stephen Birarda
f9cc82c992 use draco 1.1.0 in external 2017-09-12 10:25:44 -07:00
vladest
92a83328c0 Follow naming convention 2017-09-12 19:17:49 +02:00
Daniela
c88c70aa6f Add SensorToWorldScale factor to the bounding box dimensions. 2017-09-12 18:11:45 +01:00
Seth Alves
2850029f26 add profiling to controller-dispatcher 2017-09-12 10:00:32 -07:00
Ryan Huffman
9243cf7590 Remove extraneous logging in FBXWriter 2017-09-12 09:45:46 -07:00
Ryan Huffman
2d9d432221 Update FBXBaker to remove unused nodes from the Geometry node 2017-09-12 09:45:24 -07:00
Ryan Huffman
8fc8b8100d Fix FBXBaker failing on bad mesh data and draco meshes that can't be encoded 2017-09-12 09:44:44 -07:00
Seth Alves
14965da1b2 Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1 2017-09-12 09:23:39 -07:00
David Kelly
61e8458d13 some cleanup 2017-09-12 08:08:41 -07:00
vladest
08deba35ae Take in account current WebEngine profile to make sure all features are in place, like download 2017-09-12 16:22:53 +02:00
vladest
17a923b9de Temporarily disable WebView flickable until new solution will be investigated 2017-09-12 15:48:47 +02:00
Anthony J. Thibault
bb5e808051 Fix for some of tablet size issues, on switching domains. 2017-09-11 18:59:52 -07:00
beholder
deee6aab1a 7469 Mouse Pointer Depth is Incorrect in HMD Mode 2017-09-12 04:24:18 +03:00
Bradley Austin Davis
45a2c3d5d9 Modifying SDL initialization due to crash on OSX 2017-09-11 17:17:16 -07:00
Bradley Austin Davis
0f465da92f Various Mac fixes 2017-09-11 17:17:07 -07:00
Bradley Austin Davis
3a75dcf84d Fix crashes in entity rendering on OSX 2017-09-11 17:17:00 -07:00
David Kelly
5c12403b7c first working pass at single file. Cleanup needed 2017-09-11 16:40:21 -07:00
Anthony J. Thibault
b81f85e1ae Merge branch 'master' into feature/ant-man 2017-09-11 15:14:03 -07:00
druiz17
684aef23dc Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1 2017-09-11 15:08:37 -07:00
druiz17
d78262f2f5 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-11 15:07:39 -07:00
druiz17
a46e41607c fixed teleport, added avatar scaling, allow laser to be used on tablet when stylus is shown 2017-09-11 15:07:14 -07:00
Menithal
30c979bd31 Added Clap App to Repository 
Addede Clap App Icons to tablet icons (there needs to be another way to
do this than link directly to link or use this method!)
Added module as valid global to eslintrc
 2017-09-11 23:48:30 +03:00
David Kelly
4acbc2bfba Just write the image file in the format we will use later 2017-09-11 13:03:21 -07:00
anshuman64
996277b34c Merge pull request #11335 from vladest/menu_fix 
Make sure root item is created before lambda gets called for desktop …
 2017-09-11 12:47:40 -07:00
Stephen Birarda
1b2ba3acb6 force libc++ for OS X draco build 2017-09-11 12:07:57 -07:00
Ryan Huffman
b1d0df06d9 Add error handling in FBXBaker for empty nodes and failed draco compression 2017-09-11 12:07:41 -07:00
Ryan Huffman
ebd925b966 Add proper per face materials and texCoords1 to fbx baking 2017-09-11 10:52:59 -07:00
vladest
34c1cb6579 Typos and naming fixes 2017-09-11 19:42:05 +02:00