SamGondelman
bba806f78c
merge with master, fix uniform slots, use varyings for sigma
2018-08-08 22:27:22 -07:00
Anthony Thibault
90b0bd333f
Merge pull request #13774 from danteruiz/revert-tablet-material-entity
...
Revert to using overlays instead of material entities for button highlighting.
2018-08-08 17:33:26 -07:00
David Back
8db0711b5b
set grabbable user data in addModelEntity, pass grabbable from asset browser
2018-08-08 16:33:47 -07:00
NissimHadar
bf53f24918
WIP -documentation
2018-08-08 14:51:30 -07:00
SamGondelman
a0c3c09b05
Merge remote-tracking branch 'upstream/master' into bloom
2018-08-08 14:44:02 -07:00
Sam Gateau
16bf46ea34
Merge branch 'master' of github.com:highfidelity/hifi into punk
2018-08-08 14:22:52 -07:00
Ryan Huffman
2ba2c4b68a
Fix TextureCache not compressing textures on Android
2018-08-08 14:06:34 -07:00
Andrew Meadows
9b0dcb45ba
don't update fading avatars
2018-08-08 14:00:44 -07:00
Anthony J. Thibault
3fa3cd8cfd
In CCD IK chains, remove the LeftHand and RightHand constraint completely.
...
When used in combination with the elbow pole vector, this was causing the hand to never properly reach its rotation target.
It was also having side effects causing the elbow to never straighten properly to reach its position target.
There is possibly a bug in how this tip constraint is enforced and I've verified that there are no ill effects in removing it.
2018-08-08 13:56:47 -07:00
David Back
a04ffd969e
deselect when reselecting same entity, fix indents
2018-08-08 13:32:38 -07:00
Ryan Huffman
544a6504f2
Merge pull request #13760 from ctrlaltdavid/M16932
...
Render Touch controllers at physical hands's locations
2018-08-08 13:11:21 -07:00
David Back
adc2c9c6fc
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListCtrlReselection
2018-08-08 12:41:54 -07:00
Simon Walton
88bd4e3d9a
WIP - safe landing infrastructure
2018-08-08 12:32:45 -07:00
Cristian Luis Duarte
1a261bea04
Android - People screen renaming
2018-08-08 15:41:28 -03:00
Sam Gondelman
16b483b338
Merge pull request #13766 from SamGondelman/shaders
...
Miscellaneous shader fixes
2018-08-08 11:34:36 -07:00
NissimHadar
4cdc6196e4
WIP - adding help.
2018-08-08 11:07:21 -07:00
sabrina-shanman
5b6916177c
Add support for rotation as CollisionRegion parameter and make it the default
2018-08-08 10:47:13 -07:00
sabrina-shanman
22142a84b8
Remove JS documentation on 'loaded' parameter referencing unsupported model collision pick
2018-08-08 10:42:26 -07:00
Stephen Birarda
e686df6fb9
Merge pull request #13720 from Atlante45/feat/test-tool
...
Stack tester changes
2018-08-08 13:40:05 -04:00
sabrina-shanman
6249d1c3aa
Initialize btCollisionWorld::ContactResultCallback BEFORE AllContactsCallback variables
2018-08-08 10:32:26 -07:00
Ryan Huffman
6be0c43fca
Update generateIrradiance to take a BackendTarget
2018-08-08 10:00:02 -07:00
Ryan Huffman
26e69de81e
Add braces around std::array intialization to suppress warning
2018-08-08 10:00:02 -07:00
Ryan Huffman
140b9be1c4
Update BackendTarget to include version
2018-08-08 10:00:02 -07:00
Ryan Huffman
f1e63f489b
Update image::processImage to use compress flag for GLES
2018-08-08 10:00:01 -07:00
Ryan Huffman
9ea08f1850
Add ETC2 support to Oven
2018-08-08 10:00:01 -07:00
Anthony J. Thibault
c4c3581285
Fix memory corruption in PerformanceTimer when Stats are active
...
PerformanceTimer was neither thread safe nor re-entrant. Because it was being used increasingly on render and worker threads it has increased the likelihood of heap corruption.
I was able to identify this by enabling full page heap verification using the gflags app.
https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/enable-page-heap
2018-08-08 09:53:26 -07:00
SamGondelman
397ff6fb3b
Merge branch 'bloom' of github.com:SamGondelman/hifi into bloom
2018-08-08 09:30:22 -07:00
Sam Gateau
7efd5964bd
Merge branch 'master' of github.com:highfidelity/hifi into punk
2018-08-08 09:28:14 -07:00
Sam Gateau
9295007d99
fixing the ui script and trying to get shadow
2018-08-08 09:22:31 -07:00
amantley
297e5b2e2f
removed print statements
2018-08-08 09:18:28 -07:00
Andrew Meadows
49a1d0a18a
MyAvatar RigidBody ignores backfacing triangles
2018-08-08 09:11:09 -07:00
sabrina-shanman
4ffe164569
Address Mac/Linux build warnings
2018-08-08 08:56:35 -07:00
NissimHadar
65d4a061a2
WIP - working on help.
2018-08-08 08:25:12 -07:00
Olivier Prat
2584ce4c96
Merged with master
2018-08-08 08:42:44 +02:00
NissimHadar
1f4c0ebeb5
WIP - working on Help.
2018-08-07 22:55:45 -07:00
SamGondelman
fb75b42059
working on enabling bloom
2018-08-07 22:26:30 -07:00
SamGondelman
2959a406d7
working on enabling bloom
2018-08-07 21:52:05 -07:00
Clément Brisset
e9f23a43f6
Merge pull request #13726 from Atlante45/fix/angle-between
...
Fix angleBetween potential NaN return value
2018-08-07 18:31:57 -07:00
amantley
274bf33318
fix for the avatar scale reset when we re-enter hmd mode
2018-08-07 18:29:51 -07:00
SamGondelman
0dd8d2d3d4
working on enabling bloom
2018-08-07 18:18:58 -07:00
sabrina-shanman
69812d04ae
Reduce scope of CollisionPick shapeType to primitive shapes
2018-08-07 17:42:38 -07:00
NissimHadar
76e0e8d3fa
WIP - working on Help.
2018-08-07 17:13:34 -07:00
NissimHadar
b8c7971ebe
WIP - working on Help.
2018-08-07 17:03:44 -07:00
NissimHadar
cd186aa657
Removed unneeded MD file.
2018-08-07 15:56:49 -07:00
Sam Gondelman
9ec0b05fe4
Merge pull request #13776 from samcake/black
...
Fix bug with texel opaque and transparent cut off shader function
2018-08-07 15:52:18 -07:00
Sam Gondelman
da71572d2c
Merge pull request #13775 from SamGondelman/shadows
...
Don't bind materials during shadow pass
2018-08-07 15:43:48 -07:00
SamGondelman
6ff0b9d417
fix debug tools
2018-08-07 15:25:56 -07:00
NissimHadar
4eaa06fbc5
Merge pull request #13725 from NissimHadar/exportToTestRail
...
Export test suite to TestRail
2018-08-07 15:20:47 -07:00
r3tk0n
32165dff40
Fixed rotations in MyAvatar::goToFeetLocation()
2018-08-07 14:31:48 -07:00
NissimHadar
cce17eb181
Added tabbed interface.
2018-08-07 14:20:45 -07:00
