Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 01:50:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41800 commits 76 branches 59 tags 1.2 GiB
Commit graph

16872 commits

Author SHA1 Message Date
Atlante45
807698f0bb Make svo loading use ResourceManager 2016-03-28 18:07:48 -07:00
howard-stearns
1b3d9d7ab6 Merge branch 'master' of https://github.com/highfidelity/hifi into import-export-parents 2016-03-28 16:59:20 -07:00
howard-stearns
b09b9a4a0a snapshot after using tree from entity item. 2016-03-28 16:58:20 -07:00
samcake
b34ab28c22 Merge pull request #7456 from zzmp/feat/geocaching 
Add model caching
 2016-03-28 16:28:40 -07:00
Ken Cooke
a51cc9d12a make self-reverb depend on wetDryMix 2016-03-28 16:04:45 -07:00
Atlante45
92ef8cafb1 Make sure pos/rot getters don't crash 2016-03-28 14:37:06 -07:00
howard-stearns
db13b15337 Merge branch 'master' of https://github.com/highfidelity/hifi into import-export-parents 2016-03-28 14:26:18 -07:00
howard-stearns
7a066afa26 Checkpoint for freakin edit.js again. 2016-03-28 14:25:51 -07:00
Clément Brisset
b6ce7a7db8 Merge pull request #7492 from birarda/next-packet-delta 
fix for incorrect next packet delta in udt::SendQueue
 2016-03-28 14:12:04 -07:00
Zach Pomerantz
2de94e672b Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching 2016-03-28 14:08:30 -07:00
howard-stearns
d07967d6d8 Merge branch 'master' of https://github.com/highfidelity/hifi into import-export-parents 2016-03-28 14:02:20 -07:00
Brad Hefta-Gaub
7396fa1cc3 Merge pull request #7493 from zzmp/fix/plugin-check 
Default to desktop when display plugins fail to load
 2016-03-28 13:49:58 -07:00
Clément Brisset
19ccee5d3c Merge pull request #7490 from birarda/udt-fixes 
cleanup unused public keys in ice-server
 2016-03-28 13:48:45 -07:00
Seth Alves
b273d5efd3 fix defaultScripts filename 2016-03-28 13:48:19 -07:00
howard-stearns
c6347eb92a checkpoint for debugging/comparing edit.js 2016-03-28 13:39:43 -07:00
Stephen Birarda
1df7cf5c8d Merge pull request #7484 from Atlante45/fix/atp-req-limit 
Fix segfault with gxx
 2016-03-28 13:31:12 -07:00
Anthony J. Thibault
e77cf54483 Geometry.cpp: rename method 2016-03-28 13:29:28 -07:00
Brad Hefta-Gaub
44b37c332a Merge pull request #7480 from jherico/webchannel_redux 
Webchannel redux
 2016-03-28 13:18:22 -07:00
Atlante45
659d7e7335 Fix segfault with gxx 2016-03-28 13:17:07 -07:00
Atlante45
103c6d89f2 Add Socket include to see debug macro 2016-03-28 13:11:44 -07:00
Seth Alves
cefc5293b0 Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts 2016-03-28 12:23:37 -07:00
Seth Alves
de8153bd75 on windows and osx use default scripts bundled with interface 2016-03-28 12:23:23 -07:00
Brad Hefta-Gaub
b26533bc14 Merge pull request #7481 from samcake/lemon 
Monitoring Tool for rendering engine
 2016-03-28 12:20:07 -07:00
Zach Pomerantz
931cad34d1 Check plugin activation success 2016-03-28 12:05:58 -07:00
samcake
aa085f6955 Putting members of the ENgineStats class NOT public so they can keep their name proudly 2016-03-28 11:52:31 -07:00
samcake
b5028acde1 CLeaning up the location of the global variables, moved them to the gpu::COntext class as static 2016-03-28 11:45:07 -07:00
Stephen Birarda
c0b92486f9 fix incorrect next packet delta 2016-03-28 11:09:32 -07:00
Brad Davis
5343dfef24 PR feedback on 7480 2016-03-28 10:19:38 -07:00
Brad Davis
ae82298e1b Working on the App JS <-> HTML JS communication 2016-03-28 10:09:22 -07:00
Stephen Birarda
3e4b4a0fc7 cleanup un-used public keys in ice-server 2016-03-28 10:03:05 -07:00
Anthony J. Thibault
f5a86666a1 Model: fix for collision mesh rendering 2016-03-28 09:56:15 -07:00
Zach Pomerantz
77bb8bafbb Catch and report GL errors in QML render 2016-03-27 17:56:44 -07:00
Zach Pomerantz
d6640ac520 Update Model::_hasTransparentTextures 2016-03-27 16:38:45 -07:00
Andrew Meadows
5ac0640cbe check for time machine 2016-03-27 16:33:53 -07:00
samcake
5a3896b1de FIxing warnigns 2016-03-27 09:35:13 -07:00
Anthony J. Thibault
49a4d104a6 Minimize diff with master 2016-03-26 13:27:05 -07:00
Anthony J. Thibault
bf433487fa Dynamic bound update for skinned mesh 
* Use all cluster matrices to compute bound for skinned mesh.
  This is far less expensive then doing per-vertex work, but it's not free, for avatars especially.
* Remove skinnedMeshBound, compute it instead.
* Compute clusterMatrices in render update, because we need them to update bounds.
 2016-03-26 12:22:02 -07:00
Anthony J. Thibault
b4e70d9101 WIP: checkpoint 
* bug fix in AABox::operator+=
* added AABox::emiggen
* Avatar now has a default bound for it's skinned mesh.
* WIP: AABox tests;  NEED MORE
* Model: split collision and model mesh render items.
  Because ModelMeshRenderItems need special handling to update bounds for animated joints.
* Model: dynamically update the bound for rigidly bound animated meshes
* Rig: added access to geometryToRigTransform
* RenderableModelEntityItem: try to update bounds for skinned mesh to be the entity dimentions (this doesn't seem to be working)
* Geometry.cpp: removed unused bounds parameter in evalPartBounds
* ModelMeshPartPayload: bounds updating
   * non-animated: use existing _localBound
   * rigid bound mesh: use _localBound transformed by clusterMatrix joint transform
   * fully skinned mesh: use _skinnedMeshBound provided by the application.
 2016-03-25 21:29:20 -07:00
samcake
c96d5b093c Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-25 18:42:00 -07:00
samcake
7361304084 Cleaning up for review 2016-03-25 18:38:52 -07:00
Brad Hefta-Gaub
bb42d84bbd Merge pull request #7479 from sethalves/fix-logging-crash 
fix locking in GenericQueueThread::process
 2016-03-25 17:56:10 -07:00
Brad Hefta-Gaub
9a66d779ae Merge pull request #7463 from zzmp/guard/bugsplat-2177 
Guard against lack of GL support to avoid crash
 2016-03-25 16:31:14 -07:00
Seth Alves
1532800a4e Merge branch 'master' of github.com:highfidelity/hifi into fix-logging-crash 2016-03-25 16:17:58 -07:00
Philip Rosedale
44c6f81c0f Merge pull request #7457 from ZappoMan/reduceFalsePositiveDeadlocks 
make the deadlock watchdog more generous
 2016-03-25 16:10:37 -07:00
Philip Rosedale
dfb09f134a Merge pull request #7476 from ZappoMan/bugFixes 
fix a couple of model bugs
 2016-03-25 15:58:52 -07:00
samcake
c23640249e Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-25 15:29:01 -07:00
samcake
9b58d50fd4 BUilding a more complete set of tools to monitor performances 2016-03-25 15:28:06 -07:00
Zach Pomerantz
b252139704 LMK when running with old GL version 2016-03-25 14:42:58 -07:00
Clément Brisset
82f22b42e1 Merge pull request #7465 from sethalves/redo-polyvox-locking 
Redo polyvox locking
 2016-03-25 14:35:27 -07:00
Zach Pomerantz
1405daa4ee Add guards when checking vsync 2016-03-25 14:18:12 -07:00
Seth Alves
f3ba16ab3e fix locking around polyvox state flags 2016-03-25 14:06:57 -07:00
Ryan Huffman
306425b940 Merge pull request #7475 from birarda/udt-fixes 
guard long sleeps in udt::SendQueue
 2016-03-25 13:56:45 -07:00
Seth Alves
d97ab1e2fc Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking 2016-03-25 13:53:01 -07:00
Stephen Birarda
d9abc79b5d return for AccountManager sendRequest if threads do not match 2016-03-25 13:37:13 -07:00
Zach Pomerantz
b90f2b2e0a Use correct textureBaseUrl 2016-03-25 13:17:29 -07:00
Stephen Birarda
044fb983d7 cast chrono durations to qint64 2016-03-25 13:07:54 -07:00
Stephen Birarda
ce4d56fb90 add warning for long sendqueue sleeps 2016-03-25 13:06:21 -07:00
Brad Hefta-Gaub
541c1e5c6f Merge branch 'master' of https://github.com/highfidelity/hifi into reduceFalsePositiveDeadlocks 2016-03-25 13:03:31 -07:00
Zach Pomerantz
fac54b6ee3 Maintain parity with tex changes 2016-03-25 13:00:18 -07:00
Zach Pomerantz
c5e5195db1 Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching 2016-03-25 12:07:00 -07:00
Zach Pomerantz
581bbea36e Accomodate the caching Model 2016-03-25 11:57:40 -07:00
Zach Pomerantz
a262d9960c Mind differently tex'ed instances 2016-03-25 11:47:33 -07:00
Zach Pomerantz
af55547766 Copy material schema buffers as new ref 2016-03-25 11:46:24 -07:00
Philip Rosedale
4893d1f09e Merge pull request #7474 from zzmp/fix/drop-network-data 
Drop network data after processing
 2016-03-25 11:43:58 -07:00
Brad Hefta-Gaub
4ebb114a8e also fix joint simulation from 3rd party editors 2016-03-25 11:43:32 -07:00
Stephen Birarda
74e041e9aa cast chrono durations to int explicitly 2016-03-25 11:41:41 -07:00
Seth Alves
13eddef312 fix locking in GenericQueueThread::process 2016-03-25 11:37:04 -07:00
Philip Rosedale
e891fd219b Merge pull request #7472 from AndrewMeadows/delete-mortal-entities 
expire mortal entities correctly
 2016-03-25 11:33:07 -07:00
Brad Hefta-Gaub
759fac228c fix the doppelganger 2016-03-25 11:29:14 -07:00
Andrew Meadows
7064b29a2d Merge pull request #7473 from jherico/revert_webchannel 
Revert "Build a better event bridge"
 2016-03-25 11:29:06 -07:00
Brad Hefta-Gaub
6c6131c7b3 fix the doppelganger 2016-03-25 11:22:54 -07:00
Zach Pomerantz
864def31ea Don't refresh NetworkGeometry with cache 2016-03-25 10:56:20 -07:00
Stephen Birarda
d8859def37 fix for AccountManagerAuth::Type register, consts 2016-03-25 10:47:06 -07:00
Brad Hefta-Gaub
984d6ae48f fix model resizing bug 2016-03-25 10:46:14 -07:00
Stephen Birarda
0043a84234 guard the SendQueue sleep and send a user activity when weird 2016-03-25 10:22:14 -07:00
Zach Pomerantz
5d306a74d5 Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching 2016-03-25 10:09:37 -07:00
Chris Collins
2a85170a46 Merge pull request #7470 from zzmp/fix/tex-json 
Accept textures as list or json
 2016-03-25 10:05:12 -07:00
Zach Pomerantz
aad40f5de0 Drop network data after processing 2016-03-25 09:58:34 -07:00
Brad Davis
a47614c9b6 Revert "Build a better event bridge" 
This reverts commit a43fde0803.
 2016-03-25 09:48:25 -07:00
samcake
093f5d0019 Merge pull request #7460 from hyperlogic/tony/skip-culling-render-config 
CullTask: added ability to disable culling during rendering.
 2016-03-25 09:40:35 -07:00
Anthony J. Thibault
c00a412d3b Fix misleading comments for _skipCulling case. 2016-03-25 09:10:46 -07:00
Andrew Meadows
6c36d55fea Merge pull request #7459 from kencooke/master 
Fix Reverb Zone settings to work correctly with new reverb
 2016-03-25 08:17:45 -07:00
samcake
9fb1a9a2a8 Merge and many more counters 2016-03-25 03:02:18 -07:00
Seth Alves
ae6d6f4bb3 added comments, minor cleanups 2016-03-24 21:37:46 -07:00
Seth Alves
c57aa565df Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking 2016-03-24 21:37:25 -07:00
Brad Hefta-Gaub
fb09ad51b3 CR feedback 2016-03-24 21:14:07 -07:00
Andrew Meadows
ac5c055a1e don't verify simulated bit when adding to delete list 2016-03-24 21:12:22 -07:00
Andrew Meadows
d3d724530a minor optimiztion 2016-03-24 21:12:22 -07:00
Brad Hefta-Gaub
cd5beabf10 Revert "Drop resource data after load" 2016-03-24 20:37:16 -07:00
samcake
3f844d7a82 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-24 20:36:29 -07:00
Seth Alves
e0ab875ca8 Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking 2016-03-24 19:43:30 -07:00
Zach Pomerantz
413c3b88cf Accept textures as list or json 2016-03-24 19:40:02 -07:00
Zach Pomerantz
c625d36bd8 Persist material transform/params 2016-03-24 19:28:44 -07:00
Seth Alves
1b88284bf7 more threading cleanups 2016-03-24 19:14:25 -07:00
Zach Pomerantz
eeeb175bb8 Derive NetworkMaterial, avoid copying it 2016-03-24 18:50:44 -07:00
Zach Pomerantz
3402635f99 Lock geometry on blender 2016-03-24 18:50:43 -07:00
Brad Hefta-Gaub
7de8a2267f one more try 2016-03-24 18:09:14 -07:00
Brad Hefta-Gaub
17a2ed7dd0 Merge pull request #7467 from zzmp/clean/drop-data 
Drop resource data after load
 2016-03-24 17:52:19 -07:00
Brad Davis
0ac70049c7 Merge pull request #7431 from hyperlogic/tony/vive-rendering-work 
OpenVR rendering & Nsight instrumentation improvements
 2016-03-24 17:44:30 -07:00
Brad Hefta-Gaub
d26fe77803 Merge pull request #7454 from jherico/qml_crashes 
Fix async issues related to JS <-> App <-> QML <-> HTML communication
 2016-03-24 17:32:38 -07:00
Seth Alves
f8fe7b5868 add back getMesh call 2016-03-24 17:22:34 -07:00
Brad Hefta-Gaub
06a6a8462f more cleanup 2016-03-24 16:34:09 -07:00
Brad Hefta-Gaub
2b595fb329 break out thread safe moving average to get around unix build hell 2016-03-24 16:26:28 -07:00
Zach Pomerantz
afc853572a Drop resource data after load 2016-03-24 15:50:51 -07:00
Zach Pomerantz
8d0e419a5c Clean image-reader to drop image sooner 2016-03-24 15:50:48 -07:00
Seth Alves
6abed67c05 cleanups 2016-03-24 15:46:30 -07:00
Brad Hefta-Gaub
8691aa6905 fix unix build and CR feedback 2016-03-24 15:45:44 -07:00
Seth Alves
7c910fcf5e further reworking of polyvox threading 2016-03-24 15:28:19 -07:00
Zach Pomerantz
a34e6773a9 Add messageBox for no gl support 2016-03-24 15:13:38 -07:00
Zach Pomerantz
aa038bac58 Don't cache nested geometries 2016-03-24 14:34:25 -07:00
Brad Hefta-Gaub
6eed8fb429 fix unix build 2016-03-24 13:30:20 -07:00
Anthony J. Thibault
c302c803b0 CullTask: added ability to disable culling during rendering. 
You can use the following JavaScript to disable culling:

    Render.RenderDeferredTask.CullSceneSelection.skipCulling = true
 2016-03-24 13:20:29 -07:00
Ken Cooke
c6ca984782 Fix Reverb Zone settings to work correctly with new reverb. 2016-03-24 12:59:52 -07:00
Brad Hefta-Gaub
208b594ef8 make the deadlock watchdog more generous and add some logging so we can see heatbeats on slow machines 2016-03-24 12:37:07 -07:00
Zach Pomerantz
4d47126ae4 Don't mark failed models loaded, emit failure 2016-03-24 12:17:55 -07:00
Zach Pomerantz
3e9e083df5 Update users of NetworkGeometry 2016-03-24 11:35:41 -07:00
Zach Pomerantz
7f05e4453b Fetch model geometries through cache 2016-03-24 11:35:40 -07:00
Brad Davis
a43fde0803 Build a better event bridge 2016-03-24 11:01:06 -07:00
Clément Brisset
caf2595e13 Merge pull request #7452 from birarda/udt-fixes 
fix unecessary re-sends at capacity on udt, race in SendQueue timeout check
 2016-03-24 11:00:57 -07:00
Ozan
003af03b33 Merge pull request #7400 from Menithal/default-use-pre-post 
Set UserAnimPreAndPostRotations true by Default
 2016-03-24 09:57:03 -07:00
Seth Alves
bd178640f1 Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking 2016-03-24 09:51:31 -07:00
Zach Pomerantz
fc8b34f8c7 Move tex alpha detection to cv method 2016-03-24 09:48:33 -07:00
Brad Davis
8bbabf186f Fix async issues related to JS / QML object lifetimes 2016-03-24 09:38:54 -07:00
Philip Rosedale
f8f0e48af9 Merge pull request #7453 from Atlante45/fix/atp-req-limit 
Make ATP respect request limit
 2016-03-24 09:20:30 -07:00
Seth Alves
1aadebb4e7 Merge pull request #7445 from AndrewMeadows/shape-management 
fix memory leak in ShapeManager
 2016-03-24 08:45:49 -07:00
Philip Rosedale
0e2d9d8aaa Merge pull request #7432 from samcake/orange 
Fix some Model loading issues with the translucent textures
 2016-03-24 08:41:35 -07:00
Andrew Meadows
21c770f37b Merge pull request #7441 from zzmp/clean/resource-reinsert 
Restrict Resource reinsertion
 2016-03-24 08:41:12 -07:00
Philip Rosedale
61205e0e37 Merge pull request #7450 from ZappoMan/reduceLogSpam 
reduce log spam
 2016-03-24 00:19:09 -07:00
Philip Rosedale
366810a20c Merge pull request #7447 from ZappoMan/fixNonAnimatedMotorProteins 
fix animated motor proteins
 2016-03-24 00:11:26 -07:00
Seth Alves
462da3aaf3 don't call getMesh from render 2016-03-23 22:46:43 -07:00
Seth Alves
2d7f32a554 redo polyvox locking 2016-03-23 22:03:27 -07:00
Brad Hefta-Gaub
2b0670718f Merge pull request #7449 from howard-stearns/report-previous-session-data 
Report previous session data
 2016-03-23 20:58:51 -07:00
Atlante45
69c516caaf Have ATP respect request limit 2016-03-23 19:09:28 -07:00
Stephen Birarda
ef3f5e0221 fix for race in last receiver response 2016-03-23 18:23:30 -07:00
Anthony J. Thibault
de3144cde5 Merge branch 'master' into tony/vive-rendering-work 2016-03-23 18:13:59 -07:00
Stephen Birarda
1b322c8d01 don't oversend because of packet pairs 2016-03-23 18:07:28 -07:00
samcake
add811e404 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-23 17:52:27 -07:00
Brad Hefta-Gaub
62a56ecbfa fix typos 2016-03-23 17:45:22 -07:00
Stephen Birarda
57da7c2ba7 add handling for short circuit loss in SendQueue 2016-03-23 17:29:46 -07:00
Brad Hefta-Gaub
574642a6e4 Merge pull request #7440 from zzmp/feat/resource-finished 
Add finished signal to Resource loading
 2016-03-23 17:17:53 -07:00
Anthony J. Thibault
73725106f0 OpenGLDisplayPlugin: For non-threaded present use fetchAndReleasewithGpuWait 2016-03-23 17:13:29 -07:00
Anthony J. Thibault
8bb387dc74 Revert GLEscrow changes 2016-03-23 17:11:16 -07:00
Brad Hefta-Gaub
fdd0b48ae1 reduce log spam 2016-03-23 17:06:03 -07:00
howard-stearns
c435ca212a Report previous session time. 2016-03-23 16:59:17 -07:00
samcake
22191a2864 When an albedo texture is replaced from script,make sure its aloha channel is checked for opacity 2016-03-23 16:12:43 -07:00
samcake
40f04f871f Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-23 16:04:26 -07:00
Anthony J. Thibault
0d37515784 Merge branch 'master' into tony/vive-rendering-work 2016-03-23 15:59:59 -07:00
samcake
1e46b0803c fixing repported issues during review 2016-03-23 15:59:57 -07:00
Brad Hefta-Gaub
3fa3b40f43 fix non-animated motor proteins 2016-03-23 15:56:31 -07:00
howard-stearns
550738776c Pass whether or not previous session crashed to the UserActivityLogger. 2016-03-23 15:56:29 -07:00