Triplelexx
11af0a421b
Merge branch 'master' into 20769
2016-04-03 22:57:55 +01: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
Zach Pomerantz
11867aa71d
Compile shaders to their own folders
2016-03-10 20:10:54 -08:00
Anthony J. Thibault
4a78300607
MyAvatar: Allow user to raise hands directly overhead.
...
Previously we were using a infinitely tall vertical cylinder
to push hand IK targets out of the body, this had the
side-effect of preventing the hands from being raised over
the head. Now, we collide against the same 3d capsule
used by the physics system for avatar collisions.
2016-03-10 10:20:17 -08:00
Brad Davis
d428f3b96f
Working on crash bugs
2016-03-09 14:00:05 -08:00
Seth Alves
efdef52081
Merge pull request #7269 from ctrlaltdavid/20822
...
Restyle bookmark dialogs
2016-03-09 07:31:15 -08:00
David Rowe
edc50f102d
Fix "duplicate bookmark" dialog
2016-03-09 11:55:09 +13:00
David Rowe
10e4e5e3a7
Use OffscreenUI icon enum instead of QMessageBox icon enum
2016-03-09 11:33:55 +13:00
David Rowe
03fb6b1444
Add ability to have icons in query dialogs
...
Add icon to bookmark dialogs' titles.
2016-03-09 10:45:14 +13:00
Brad Davis
28103cf5ef
Migrate composition of the overlay and pointer to the present thread
2016-03-07 17:14:41 -08:00
David Rowe
ba1e8db34a
Add QML UI test dialogs for creating and deleting bookmarks
2016-03-08 13:51:13 +13:00
David Rowe
c83ed578db
Merge branch 'master' into 20812
2016-03-03 02:01:20 +13:00
David Rowe
247ba7d3dd
Merge branch 'master' into 20812
2016-02-27 11:05:47 +13:00
samcake
3ee6f9d6f2
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-25 23:48:53 -08:00
Andrew Meadows
f964df6c97
final names for ViewFrustum intersection tests
2016-02-25 18:09:35 -08:00
Andrew Meadows
5d1e283508
namechange TouchesKeyhole to IntersectsKeyhole
2016-02-25 18:09:35 -08:00
Andrew Meadows
2591c5ee3e
cleanup names that use "keyhole"
2016-02-25 18:09:35 -08:00
Andrew Meadows
9409339230
add ViewFrustum::cubeInKeyhole()
2016-02-25 18:09:35 -08:00
Andrew Meadows
669cc75596
adding ViewFrustumTests
2016-02-25 18:09:35 -08:00
Andrew Meadows
92581587b1
cleaned up AACubeTests, added AABoxTests
2016-02-25 18:09:35 -08:00
Andrew Meadows
5c11963de2
add unit tests for AACube
2016-02-25 18:09:35 -08:00
Andrew Meadows
dfdf375853
use shapeInFrustum() names again
...
but at the same time make the code more redable
also: add some more efficient shape-touches-view methods
and cleanup some whitespace
2016-02-25 18:09:35 -08:00
Andrew Meadows
8200babf78
fix warning about unused variable
2016-02-25 18:09:35 -08:00
David Rowe
4cc36d1df0
Update QML UI test environment for Settings > General dialog
2016-02-25 17:13:48 +13:00
samcake
ae6e625894
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-24 17:30:40 -08:00
samcake
a0d7ce145e
Adding support for emissive and occlusion maps, on to pr land
2016-02-24 17:30:29 -08:00
David Rowe
49c229897f
Give the "change avatar?" confirmation dialog a default action
2016-02-23 17:55:36 +13:00
David Rowe
26a46207c2
Set up QML tests for message box modal dialog restyling
2016-02-22 17:03:48 +13:00
samcake
39a7852979
MOving forward with PBR rendering, cleaning up the lighting shaders and the packi/unpack deferredBuffer shaders
2016-02-19 18:43:07 -08:00
Triplelexx
087e2e7f66
revise touchscreen camera control manipulation
...
Touchscreen camera control is now via a touchscreen device. Input must
be enabled with the menu option. Currently supports dragging and
gesturing to control avatar camera. Gesturing is handled by integration
of the Qt implementation.
2016-02-19 13:47:28 +00:00
David Rowe
54b27f3ac3
Merge branch 'master' into 20805
2016-02-18 23:35:37 +13:00
David Rowe
c07b1f9b1e
Tidying
2016-02-18 23:06:26 +13:00
David Rowe
42a44e0f67
First pass at restyling dialog frame
...
"Pin" button is implemented but disabled (as it was before).
2016-02-13 15:15:01 +13:00
