Commit graph

871 commits

Author SHA1 Message Date
Andrew Meadows
d64729372a ShapeInfo name changes 2016-06-20 17:29:20 -07:00
Brad Hefta-Gaub
06cb625d09 Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision
Improved Avatar Mixer Rotation Precision
2016-05-25 17:14:12 -07:00
David Rowe
b9aa667c55 Fix QML test environment 2016-05-25 10:37:30 +12:00
Brad Hefta-Gaub
b8b39b962d Merge pull request #7868 from jherico/entity_shape
Add a generic shape primitive
2016-05-24 08:40:58 -07:00
Brad Hefta-Gaub
49ded9c4df Merge pull request #7873 from ctrlaltdavid/20917
restyle file browser
2016-05-24 08:40:38 -07:00
David Rowe
504516b627 Merge branch 'master' into 20917 2016-05-24 08:03:54 +12:00
Anthony J. Thibault
a1c32f8c44 Merge branch 'master' into tony/improved-avatar-mixer-precision 2016-05-23 10:24:52 -07:00
Brad Davis
2c703e963c More shapes 2016-05-22 19:48:59 -07:00
Brad Davis
cd1e910844 Add a generic shape primitive 2016-05-21 23:46:44 -07:00
Seth Alves
40e862cf9e quiet gcc 5 warnings 2016-05-21 16:53:01 -07:00
Brad Davis
07562f72af Doing a pass over the input plugins and controller code 2016-05-20 14:50:23 -07:00
David Rowe
17b3101ca5 Merge branch 'master' into 20917 2016-05-20 18:50:01 +12:00
Atlante45
8be6bc6460 Add missing overrides 2016-05-19 22:00:22 -07:00
Anthony J. Thibault
818d1f4601 Added six byte quaternion compression routines & tests 2016-05-16 17:48:54 -07:00
Brad Davis
5ba8372c21 Moving GL backend out of GPU 2016-05-16 12:54:17 -07:00
David Rowe
88130ee5c8 Merge branch 'master' into 20917 2016-05-14 12:13:39 +12:00
Brad Davis
85272a87ba Merge pull request #7859 from samcake/lemon
Introduce the "Unlit" shading model support and apply it to Web Enitities
2016-05-12 15:09:50 -07:00
David Rowe
8f214a6b14 Merge branch 'master' into 99997 2016-05-12 17:50:34 +12:00
Brad Hefta-Gaub
d656f61c64 Merge pull request #7759 from jherico/app_plugin_type
Don't expose raw pointer to the display plugin
2016-05-11 14:49:22 -07:00
samcake
1ec9ef560e Fixing the srgb color format conversion for web entities 2016-05-11 10:46:54 -07:00
David Rowe
b8c0ec86af Hide file filter if only 1 file type 2016-05-10 15:09:13 +12:00
David Rowe
6e59abc8f6 Switch file selection dialog over to using UI Toolkit files 2016-05-10 12:13:46 +12:00
Brad Davis
c54d0bc993 Don't expose raw pointer to the display plugin 2016-05-08 10:35:31 -07:00
Atlante45
df2683d989 Fix compile error 2016-05-05 16:09:45 -07:00
Anthony J. Thibault
d9063b199e GeometryUtils: coneSphereAngle test 2016-04-26 13:31:06 -07:00
Brad Hefta-Gaub
c410242fb2 Merge pull request #7688 from jherico/texture_derez
Reducing GPU texture memory footprint
2016-04-22 13:20:54 -07:00
David Rowe
a7b82e8cae Decouple ui and shared libraries 2016-04-22 12:58:47 +12:00
Brad Davis
6c30194916 Support lowering the minimum mip of a texture at runtime 2016-04-21 14:46:12 -07:00
Brad Davis
b50f835d35 Warning and error fixes 2016-04-17 10:22:26 -07:00
Brad Davis
75c99fe416 Working on GPU library test code 2016-04-17 10:20:01 -07:00
Atlante45
afdfef1482 Make sure we don't use raw resource ptr 2016-04-12 13:51:11 -07:00
Zach Pomerantz
be489e8728 Codify qt qml version in one header 2016-04-07 17:35:31 -07:00
David Rowe
2ac9f282c7 Merge branch 'master' into 20855 2016-03-31 17:00:09 +13:00
Anthony J. Thibault
f4d834b07b OctreeTests: added unit tests for EntityTreeElement child accessors 2016-03-30 16:15:29 -07:00
David Rowe
510d167c87 Merge branch 'master' into 20855 2016-03-31 08:43:35 +13:00
Anthony J. Thibault
c671fe7966 Updated AABox tests 2016-03-26 13:36:56 -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
David Rowe
9280443425 Merge branch 'master' into 20855 2016-03-25 09:06:20 +13:00
Andrew Meadows
ecfe198e35 patch btCompoundShape memory leak 2016-03-23 14:39:49 -07:00
Andrew Meadows
119ef24d5d cleanup ShapeManager API and fix bitrot in tests 2016-03-23 14:39:49 -07:00
Andrew Meadows
a52ac3cc50 remove excess whitespace 2016-03-23 14:39:49 -07:00
David Rowe
42b606c09d Merge branch 'master' into 20855 2016-03-22 18:51:07 +13:00
Anthony J. Thibault
df5afffc77 AnimUtil: prevent accumulateTime from looping forever
This might happen with large dts, large timeScales.
2016-03-21 11:58:13 -07:00
David Rowe
3fa678a652 Style tabs and background 2016-03-19 14:52:40 +13:00
Bradley Austin Davis
7045680bc7 Reduce crashes on switching display plugins 2016-03-17 10:13:52 -07:00
Andrew Meadows
71a81331d1 unit tests for dynamic twist limit adjustment 2016-03-11 14:47:48 -08:00
Andrew Meadows
749dcf2c1d dynamic adjustment for swing 2016-03-11 14:47:47 -08:00
Andrew Meadows
df9ccf76ab fix animation-tests 2016-03-11 14:47:47 -08:00
Zach Pomerantz
755efd1840 Update test shaders 2016-03-10 23:03:03 -08:00
Stephen Birarda
a9dd88d834 Merge pull request #7320 from zzmp/feat/shader-includes
Compile shaders into separate dir for inclusion
2016-03-10 21:07:49 -08:00