Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 21:59:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
59086 commits 25 branches 0 tags 1.1 GiB
Commit graph

59086 commits

This branch
This branch
All branches
Author SHA1 Message Date
druiz17
42ef397b5e fixed include path 2017-09-08 15:13:19 -07:00
Seth Alves
967d3f69d3 suppress repeated 'item could not be rendered' messages 2017-09-08 14:13:58 -07:00
David Kelly
99cdbbe306 and lets fix the purchases flow too 2017-09-08 14:00:09 -07:00
druiz17
5d1a5eea4c added test file 2017-09-08 13:45:45 -07:00
druiz17
b3e2c7ac56 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-08 13:30:48 -07:00
druiz17
e33012e522 laser on tablet update 2017-09-08 13:30:30 -07:00
David Kelly
c142215935 oops -- this is a windows-only thing (like so many other problems) 2017-09-08 12:52:12 -07:00
Sam Gateau
ed8aa8b74d Merge pull request #11160 from Zvork/outline 
Outline effect
 2017-09-08 12:32:01 -07:00
druiz17
dbb91e5953 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-08 11:50:43 -07:00
druiz17
f0c12e50dd some small bug fixes 2017-09-08 11:50:19 -07:00
David Kelly
3e0b222ec4 fix wallet for new openssl 2017-09-08 11:44:19 -07:00
Anthony J. Thibault
559ac6786d Fix MyAvatar getting stuck in T-pose on loading 
Before this change, there was a race condition between the main thread calling Model::initWhenReady,
and the render thread calling Avatar::fixupModelsInScene().  They both would end up setting the
Model::_addedToScene flag.  This race caused Model::initWhenReady() to never return true, which
resulted in the MyAvatar class never initializing the animation system.
 2017-09-08 11:44:06 -07:00
Bradley Austin Davis
48b6586d01 Modifying SDL initialization due to crash on OSX 2017-09-08 11:36:32 -07:00
Stephen Birarda
09d18b5ba9 handle special include path for Draco on WIN 2017-09-08 09:47:16 -07:00
Stephen Birarda
91f4551598 add draco to the oven tool 2017-09-08 09:46:55 -07:00
Stephen Birarda
0d7b50cfb6 remove old texture type method 2017-09-08 09:44:19 -07:00
David Kelly
db0ecb61fd Merge pull request #11325 from davidkelly/dk/UserHfcAccountRework 
Use new hfc account endpoint
 2017-09-08 09:03:53 -07:00
David Kelly
45c8dd9dd4 cr feedback 2017-09-08 05:28:41 -07:00
Olivier Prat
d6d36cbd43 Outline working on voxels 2017-09-08 11:14:06 +02:00
David Kelly
bb07a586ca warning, plus salting passphrase now 2017-09-07 19:24:31 -07:00
Stephen Birarda
3cf77f377c remove FBX SDK from CMake files 2017-09-07 18:46:44 -07:00
Stephen Birarda
b153d1e177 use FBXReader/FBXWriter for texture baking in FBXBaker 2017-09-07 18:38:29 -07:00
David Kelly
efdc340c5c Use new hfc account endpoint 2017-09-07 18:15:04 -07:00
Melissa Brown
cb2911f3e0 Merge pull request #11305 from cain-kilgore/delete-test-plan 
Deleted unnecessary Test Plan 2.docx
 2017-09-07 16:59:53 -07:00
Bradley Austin Davis
eb8b892571 Various Mac fixes 2017-09-07 14:45:35 -07:00
druiz17
ef050a09f9 made requested changes and also allow entities/overlays to be grabbed by the grip button 2017-09-07 14:42:46 -07:00
Bradley Austin Davis
37b184d982 Fix crashes in entity rendering on OSX 2017-09-07 14:32:50 -07:00
Ryan Huffman
7214f57376 Update FBXBaker::exportScene with FBXWriter 2017-09-07 14:12:15 -07:00
Ryan Huffman
b60d68c714 Replace FBX SDK loading of file in FBXBaker with FBXReader 2017-09-07 14:00:09 -07:00
Ryan Huffman
49e09f4838 Remove FBXBaker and TextureBaker from oven 2017-09-07 13:12:07 -07:00
Ryan Huffman
7a55c867be Fix _fbxNode rename to _rootNode in FBXReader 2017-09-07 12:56:46 -07:00
Ryan Huffman
aa1aad0a09 Add FBXWriter for serializing FBXNode 2017-09-07 12:56:36 -07:00
Brad Hefta-Gaub
ca00349abc Merge pull request #11248 from birarda/feat/install-remember-custom 
remember if express or custom was selected for install
 2017-09-07 12:43:01 -07:00
Brad Hefta-Gaub
6a1fe81832 Merge pull request #11210 from AndrewMeadows/mtwabp-OctreeSendThread-002 
split packet construction from packet sending in OctreeSendThread
 2017-09-07 12:36:29 -07:00
Brad Hefta-Gaub
b316f366fc Merge pull request #11198 from druiz17/oculus-tablet-position 
fixed tablet spawn position for oculus menu button
 2017-09-07 12:30:33 -07:00
Stephen Birarda
bd36ba19b3 fix dereference of end iterator 2017-09-07 12:07:58 -07:00
Stephen Birarda
e4de869db6 fix iterator find from merge 2017-09-07 12:07:58 -07:00
Stephen Birarda
1508edb459 use store/load to be clearer about atomics 2017-09-07 12:07:58 -07:00
Stephen Birarda
7859b3b11f remove image compression choices from Interface settings 2017-09-07 12:07:57 -07:00
Stephen Birarda
e25b4700d9 re-set defaults in texture baking when AssetServer done 2017-09-07 12:07:57 -07:00
Stephen Birarda
26b74db864 enable compression in image library from Asset Server 2017-09-07 12:07:57 -07:00
Stephen Birarda
5e1decb02b Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake 2017-09-07 12:06:53 -07:00
Thijs Wenker
e2229b3c38 Merge pull request #11302 from cain-kilgore/21523 
WL 21523 - Update text in the "How to Quit The Sandbox" Prompt
 2017-09-07 21:04:34 +02:00
Chris Collins
12d720805c Merge pull request #11319 from jherico/async_qml_load_crash 
Fix potential crash on asynchronous QML loads
 2017-09-07 12:03:10 -07:00
Brad Hefta-Gaub
c5098abfb9 Merge pull request #10937 from kencooke/zzmp-audio/peak-values 
Add peak values for all input devices in selection dialog
 2017-09-07 11:58:50 -07:00
Brad Hefta-Gaub
3b16ebcc90 Merge pull request #11287 from jherico/vcpkg_ssl 
Migrate to vcpkg version of OpenSSL
 2017-09-07 11:53:09 -07:00
Brad Hefta-Gaub
7cce45017b Merge pull request #11244 from birarda/bug/ice-dns-fail 
add a timeout for ICE server DNS lookup
 2017-09-07 11:09:05 -07:00
Cain Kilgore
84f37b9663 Changed string name 2017-09-07 18:53:05 +01:00
Brad Hefta-Gaub
fce8715457 Merge pull request #11306 from ElderOrb/case7385 
7385 - Collect Stats on "Exit VR" button
 2017-09-07 10:18:58 -07:00
Olivier Prat
7fb7ebca57 Fixed warning on Mac 2017-09-07 19:03:22 +02:00