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

21947 commits

Author SHA1 Message Date
Zach Fox
297da90118 Semicolons lol 2017-04-10 22:15:44 -07:00
Zach Fox
bc75ff4462 Checkpoint 2017-04-10 22:15:44 -07:00
Zach Fox
177445c371 Does this work? 2017-04-10 22:15:44 -07:00
Stephen Birarda
4ed22ad7ac move audio loudness to AvatarData, change AvatarData to ScriptOwnership 2017-04-10 22:15:44 -07:00
Zach Fox
1ed53113a9 Commit for birarda - testing QSharedPointer instead; doesn't work right now 2017-04-10 22:15:44 -07:00
Zach Fox
6ddd7a612c Initial pass at fix looks promising 2017-04-10 22:15:44 -07:00
Ryan Huffman
af11f5f327 Update avatar mixer packet version for stick+ball avatar 2017-04-10 21:27:47 -07:00
Sam Cake
5d7accca2b Avoiding the mac compilation problem maybe 2017-04-10 21:12:00 -07:00
samcake
4a47737d0b REfining the Config behavior, trying to pr next 2017-04-10 19:01:49 -07:00
Stephen Birarda
602d65a71a Merge pull request #10001 from birarda/cleanup-ebp 
cleanup EncodeBitstreamParams to use nodeData when possible
 2017-04-10 15:54:30 -07:00
Ryan Huffman
8463fffc8c Merge pull request #10185 from highfidelity/revert-10116-bug/rel-ext-textures 
Revert "fix relative/absolute path handling for external FBX textures"
 2017-04-10 15:30:40 -07:00
Seth Alves
b9afcd3f0a Merge pull request #10178 from sethalves/fix-compound-collision-hulls 
Fix compound collision hulls
 2017-04-10 15:28:48 -07:00
Stephen Birarda
e86db26224 Revert "fix relative/absolute path handling for external FBX textures" 2017-04-10 14:31:02 -07:00
Seth Alves
8a3a52cbcf make getCollisionGeometryResource a separate call from getGeometryResource rather than passing a bool 2017-04-10 13:54:24 -07:00
Seth Alves
6bd841857f added a comment 2017-04-10 13:50:36 -07:00
Dante Ruiz
e0f19944bc Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix 2017-04-10 20:58:46 +01:00
Dante Ruiz
4e94aaa9e8 finished allowing to go back to previous app 2017-04-10 20:58:10 +01:00
Seth Alves
05bf1930ca Merge pull request #10169 from hyperlogic/feature/absolute-default-joints-in-object-frame 
Added accessor to get Avatar default pose in avatar space
 2017-04-10 12:55:02 -07:00
Andrew Meadows
e20fcca959 Merge pull request #10179 from jherico/avatar_rendering 
Creating new avatar rendering library, prepping for crowd rendering project
 2017-04-10 11:29:08 -07:00
Bradley Austin Davis
0ca0874c52 Creating new avatar rendering library, prepping for crowd rendering project 2017-04-10 10:55:04 -07:00
Seth Alves
717436e0fd use QUrl rather than just munging the url with a string-append 2017-04-10 10:54:30 -07:00
Seth Alves
554b23357c add combineParts flag to getGeometryResource. append ?collsion-hull to urls that are used as compound collision hulls 2017-04-10 10:14:36 -07:00
samcake
16e6f0900d Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis 2017-04-10 10:12:23 -07:00
Seth Alves
36940b4dfe revert commit that broke sendToScript 2017-04-10 09:11:23 -07:00
Sam Cake
e7fb18bd2f MOving forward with the TaskConcept and TaskModel, all working 2017-04-10 02:51:19 -07:00
Sam Cake
a458828590 MOving forward with the TaskConcept and TaskModel, all working 2017-04-10 02:30:13 -07:00
Seth Alves
0ae8a20b53 Merge branch 'master' of github.com:highfidelity/hifi into fix-compound-collision-hulls 2017-04-09 18:08:02 -07:00
Seth Alves
a1cab2c0d1 working toward fixing compound hulls 2017-04-09 17:23:56 -07:00
Sam Cake
b65448bcbe Trying to improve the Job/Task classes and testing it with the ZoneRenderer 2017-04-09 11:08:35 -07:00
Brad Hefta-Gaub
0d4649ded8 Merge pull request #10079 from jherico/entity_thread_safety 
Thread safety for property getter/setters on entities
 2017-04-07 19:01:07 -07:00
samcake
e6844f4294 Cleaning up the basic jobs of render 2017-04-07 18:35:27 -07:00
Dante Ruiz
86c67a3017 tablet pages 2017-04-08 02:01:21 +01:00
Chris Collins
8e12f62cbb Merge pull request #10153 from druiz17/goto-fix 
Ability to toggle goto with the crt-l and enter keys
 2017-04-07 16:36:41 -07:00
Seth Alves
8d00f0ab8f allow obj reader to either combine meshes or keep parts separate 2017-04-07 15:59:01 -07:00
Anthony J. Thibault
a06df1a400 Bug fix for passing quats from script to C++ via the animationStateHandler 2017-04-07 14:13:00 -07:00
Seth Alves
03065ee6c8 Merge pull request #9938 from kunalgosar/jsRenderBug 
Stop WebEntities Running Files and Commands
 2017-04-07 13:44:03 -07:00
samcake
58cec3fb96 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis 2017-04-07 11:55:08 -07:00
Andrew Meadows
662c34c266 fix avatar scale animation and avatar render debug 2017-04-07 11:06:16 -07:00
Andrew Meadows
b9c7d6351f Merge pull request #10135 from samcake/ambient 
Rename render::PendingChanges to render::Transaction
 2017-04-07 09:54:10 -07:00
samcake
f82310545c Revert "Revert "Fixing the rendering bug triggered with Nvidia driver 381.65"" 2017-04-07 02:03:58 -07:00
samcake
ab3d39951e Revert "Fixing the rendering bug triggered with Nvidia driver 381.65" 2017-04-07 02:03:31 -07:00
samcake
ac9b181786 Merge pull request #10157 from samcake/brown 2017-04-07 02:01:05 -07:00
Sam Cake
b1a4bc329b Introducing a fix to the graphics bug 2017-04-07 01:10:18 -07:00
Sam Cake
da1355dc32 Introducing a fix to the graphics bug 2017-04-07 01:03:07 -07:00
Triplelexx
27a404d0ea remove extra lines 2017-04-07 07:09:18 +01:00
Triplelexx
279997d905 change display plugin to deactivate when window minimized 2017-04-07 06:49:28 +01:00
samcake
aae7349c40 trying to understand the bug with nvidia new driver 2017-04-06 18:31:03 -07:00
samcake
cb94e1009d Adding a job... 2017-04-06 18:10:28 -07:00
Al Bernstein
c628b23895 removed whitespace 2017-04-06 17:21:58 -07:00
Al Bernstein
e737456dcd used thread safe moving average for the quaternions 2017-04-06 16:56:03 -07:00
samcake
0254c3372f Merge pull request #10143 from jherico/ktx_crash 
Don't crash if KTX file is invalid
 2017-04-06 16:28:19 -07:00
Al Bernstein
de1fdfacca made requested changes in PR10147 2017-04-06 16:18:40 -07:00
Chris Collins
4e9e3cccea Merge pull request #10116 from birarda/bug/rel-ext-textures 
fix relative/absolute path handling for external FBX textures
 2017-04-06 15:58:02 -07:00
Dante Ruiz
22521526ec removed stray space 2017-04-06 23:41:30 +01:00
Seth Alves
b1a015affd Merge pull request #10117 from huffman/fix/unlock-propagation 
Fix entity "unlock" edits not being propagated to clients
 2017-04-06 15:28:05 -07:00
samcake
6fc965072c Adding the Selection, and not the Tag concept fro real, and beeing able to reset it from the Transaction and simply communicating the ranked zones to the engine through a selection, ready to be used by the ZOneREnderer 2017-04-06 15:19:55 -07:00
Dante Ruiz
a89081601c fix merge issues 2017-04-06 22:31:47 +01:00
Dante Ruiz
52fd446d4d toggle goto in tablet 2017-04-06 22:27:37 +01:00
Seth Alves
3c6429cdf3 Merge pull request #10103 from vladest/master-qml-bugfixes 
Master qml bugfixes
 2017-04-06 14:22:06 -07:00
Chris Collins
494c8d868e Merge pull request #10126 from samcake/brown 
Fixing the rendering of Image3D overlay when drawn in the scene
 2017-04-06 13:40:09 -07:00
samcake
158084369a Merge branch 'ambient' of https://github.com/samcake/hifi into ambient-bis 2017-04-06 11:34:35 -07:00
samcake
19d080c4cc Merging 2017-04-06 11:33:41 -07:00
samcake
91f315f9ce Adding the concept of selection to the scene 2017-04-06 11:27:48 -07:00
David Kelly
34a2cefb98 Merge pull request #10132 from davidkelly/dk/analyticsForConnections 
initial analytics for connections
 2017-04-06 10:45:39 -07:00
samcake
b8cb79113e Nitpicking on the correct name maybe... 2017-04-06 10:30:24 -07:00
Brad Davis
057a9feaf1 Don't crash if KTX file is invalid 2017-04-06 10:09:57 -07:00
samcake
3de760abcb Introduucing the tag to the scene 2017-04-05 18:35:06 -07:00
Anthony Thibault
be2fdd9388 Merge pull request #10063 from hyperlogic/feature/vive-tracked-objects 
Vive: Expose all 16 tracked poses to the controller system
 2017-04-05 16:53:47 -07:00
Stephen Birarda
e4021c168e add special handling for abs drive letter paths from windows 2017-04-05 16:52:22 -07:00
Dante Ruiz
90f5d02c99 goto toggle option 2017-04-06 00:13:53 +01:00
samcake
8267db6ce5 Add a description of the Transaction class 2017-04-05 14:19:00 -07:00
samcake
026e7bc249 Add a description of the Transaction class 2017-04-05 14:17:26 -07:00
samcake
5629cf425e Cleaning up the files updated 2017-04-05 13:49:07 -07:00
samcake
309c6b8d9b Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-04-05 13:11:12 -07:00
samcake
6122155880 Renaming the PendingCHanges class to Transaction 2017-04-05 13:10:31 -07:00
David Kelly
1b6bf90843 initial analytics for connections 2017-04-05 11:10:06 -07:00
Seth Alves
384f404602 Merge pull request #10109 from mittens/21240 
OBJ Loader Rewrite to Support Multiple Materials
 2017-04-04 15:56:44 -07:00
Brad Davis
15f7e895aa More thread safety 2017-04-04 15:09:21 -07:00
Stephen Birarda
70eada0f76 replace backslashes in parsed fbx relative filepaths 2017-04-04 15:01:18 -07:00
Stephen Birarda
0b57b98970 change readFBX calls to use QUrl where possible 2017-04-04 14:53:14 -07:00
Stephen Birarda
137e73cf21 check absolute path before relative path 2017-04-04 14:42:03 -07:00
Stephen Birarda
0a7100e2d8 pass URLs to readFBX, not just URL path 2017-04-04 14:34:10 -07:00
Brad Davis
cd7c1643a3 More thread safety 2017-04-04 14:03:30 -07:00
Stephen Birarda
4e07a6a865 add new logic for absolute texture paths in FBX 2017-04-04 14:02:00 -07:00
Brad Davis
54200c03a7 Fixing deadlock 2017-04-04 13:53:49 -07:00
samcake
8b4696f4ec Merge and solve conflicts 2017-04-04 13:28:03 -07:00
samcake
6385a702cd FIxing the bug for image3D overlay drawn in scene 2017-04-04 12:56:43 -07:00
kunalgosar
19ab7526d3 apply profile to relevant entities 2017-04-04 11:54:21 -07:00
samcake
b18d82bd19 adding different shaders for transparent for simpel 2017-04-04 11:50:38 -07:00
Stephen Birarda
b9783d768e remove fileOnUrl since it is no longer used 2017-04-04 11:08:30 -07:00
Anthony J. Thibault
c58fdb590a Fix for sliding feet when leaning in HMD mode. 2017-04-04 11:00:34 -07:00
Stephen Birarda
c7a28a527a cleanup Agent recording handling, make loadRecording async 2017-04-04 10:56:25 -07:00
Brad Davis
fe84232ab4 More work on thread safety 2017-04-04 10:50:56 -07:00
Brad Davis
d89104f69c Use getters instead of direct member access 2017-04-04 10:50:55 -07:00
Brad Davis
03c6275268 more thread safety 2017-04-04 10:50:54 -07:00
Brad Davis
172fab6789 Thread safety for property getter/setters on entities 2017-04-04 10:50:53 -07:00
Seth Alves
b0b214012c Merge pull request #10118 from hyperlogic/bug-fix/tablet-restart-scripts 
Fix broken eventBridge on tablet after Reload All Scripts.
 2017-04-04 10:45:08 -07:00
Vladyslav Stelmakhovskyi
aa487faad1 Fixed No such signal QmlWindow_QMLTYPE_490::resized(QSizeF) and No such signal QmlWindow_QMLTYPE_490::moved(QVector2D) warnings 2017-04-04 16:59:09 +02:00
trent
362ffba117 Fixes to OBJReader.cpp style inconsistencies. 2017-04-03 21:54:19 -04:00
samcake
a882beb2fd Trying to fix the overlay Image3D shading pipeline used 2017-04-03 17:35:28 -07:00