Wayne Chen
|
54aeac5d1f
|
adding fix
|
2018-08-21 15:55:00 -07:00 |
|
John Conklin II
|
b28aa3951f
|
Merge pull request #13802 from jherico/feature/scribe_programs
Migrating to scribe program descriptors
|
2018-08-20 14:48:54 -07:00 |
|
John Conklin II
|
bbf6162361
|
Merge pull request #13632 from Atlante45/fix/udt-rtt
Fix potential reliable connection lockup.
|
2018-08-16 13:15:23 -07:00 |
|
John Conklin II
|
1edf1b4337
|
Merge pull request #13555 from SamGondelman/destroy
Trying to fix dependency shutdown
|
2018-08-16 13:14:58 -07:00 |
|
John Conklin II
|
02f53c4ee5
|
Merge pull request #13808 from dback2/createEntitiesGrabbable
Use Create Entities as Grabbable option when adding asset to world
|
2018-08-16 09:22:23 -07:00 |
|
Sam Gondelman
|
5f4f232602
|
Merge pull request #13604 from huffman/feat/oven-etc2
Add ETC2 support to Oven
|
2018-08-15 13:55:44 -07:00 |
|
John Conklin II
|
032e67fd8e
|
Merge pull request #13748 from ElderOrb/FB16831
FB16831 qml-related warnings in log
|
2018-08-14 16:40:07 -07:00 |
|
Seth Alves
|
3623590e90
|
Merge pull request #13784 from sethalves/far-point-joints
Far point joints
|
2018-08-14 15:40:07 -07:00 |
|
John Conklin II
|
007652632c
|
Merge pull request #13724 from gcalero/android_audio_fixes3
Android audio tests
|
2018-08-14 13:57:59 -07:00 |
|
Alexander Ivash
|
4478733c27
|
fix coding conventions
|
2018-08-14 21:18:54 +03:00 |
|
Seth Alves
|
dce7b6eae6
|
Merge pull request #13714 from sabrina-shanman/safe-teleport-target
Create CollisionPick API
|
2018-08-14 09:56:51 -07:00 |
|
Seth Alves
|
41e9c3a2ad
|
Merge pull request #13820 from AndrewMeadows/dont-try-physics-for-invalid-models
don't attempt physics with invalid modelURL
|
2018-08-14 09:47:37 -07:00 |
|
Seth Alves
|
527b27da96
|
pseudo-joints for far-grab positions
|
2018-08-14 08:55:20 -07:00 |
|
sabrina-shanman
|
2576d502ab
|
Remove unused getter for btCollisionWorld in PhysicsEngine
|
2018-08-13 17:27:57 -07:00 |
|
Ryan Huffman
|
0fcf1517a5
|
Fix TextureCache not correctly choosing gl41 when gl45 is disabled
|
2018-08-13 16:35:21 -07:00 |
|
sabrina-shanman
|
e5cb078133
|
Merge branch 'master' of github.com:highfidelity/hifi into safe-teleport-target
|
2018-08-13 14:51:37 -07:00 |
|
Sabrina Shanman
|
99374c099a
|
Merge pull request #13816 from SamGondelman/fading
Fix parabola shader
|
2018-08-13 14:45:31 -07:00 |
|
Gabriel Calero
|
4b808fe38e
|
Revert "Test if this fixes the choppy audio"
This reverts commit 2e323efe1b.
|
2018-08-13 18:29:05 -03:00 |
|
Seth Alves
|
0a5c96ecc1
|
Merge pull request #13792 from luiscuenca/attachmentsAPImgr
Attachments API returns avatar entities
|
2018-08-13 14:21:13 -07:00 |
|
Andrew Meadows
|
fd9876cb63
|
don't attempt physics with invalid modelURL
|
2018-08-13 13:30:30 -07:00 |
|
SamGondelman
|
86ba8c3d81
|
fix parabola shader
|
2018-08-13 10:08:19 -07:00 |
|
unknown
|
c622a587e3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable
|
2018-08-11 07:59:56 -07:00 |
|
John Conklin II
|
b56d9c3ea5
|
Merge pull request #13807 from SamGondelman/fading
Fixing fading
|
2018-08-10 16:35:10 -07:00 |
|
luiscuenca
|
dd93055d89
|
Convert and load attachments when rig is ready
|
2018-08-10 16:15:30 -07:00 |
|
John Conklin II
|
644ff1eafa
|
Merge pull request #13655 from amantley/animationBlendChanges
New Default Strafe Animations Plus Animation Tuning Support
|
2018-08-10 15:03:30 -07:00 |
|
Gabriel Calero
|
2e323efe1b
|
Test if this fixes the choppy audio
|
2018-08-10 18:57:41 -03:00 |
|
John Conklin II
|
61f0e9323a
|
Merge pull request #13800 from samcake/zvork-shadow
Fixing PR13731 shader error on Mac
|
2018-08-10 14:10:47 -07:00 |
|
Ryan Huffman
|
9fadf58e7b
|
Add threads lib to image lib
|
2018-08-10 13:56:48 -07:00 |
|
Sam Gateau
|
ad5b2ddc69
|
Merge pull request #13711 from AndrewMeadows/myAvatar-vs-backfacing-triangles
MyAvatar's RigidBody ignores collisions with backfacing triangles
|
2018-08-10 12:55:28 -07:00 |
|
unknown
|
5d1cc3696a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable
|
2018-08-10 12:10:57 -07:00 |
|
SamGondelman
|
15070f6374
|
fixing fading
|
2018-08-10 10:52:58 -07:00 |
|
sabrina-shanman
|
e5e1a72598
|
Use 'orientation' for Collision Pick API, not 'rotation'
|
2018-08-10 10:52:21 -07:00 |
|
Wayne Chen
|
6b73a0bba5
|
Merge pull request #13801 from wayne-chen/fixMyAvatarScale-case-17434
MS17434: modifying MyAvatar.scale get property
|
2018-08-10 10:45:53 -07:00 |
|
amantley
|
74186b0162
|
changed back speed to 2.2 m/s and the end frame for strafe left and right to 33, and the end frame for wlk_bkwd to 27
|
2018-08-10 09:56:24 -07:00 |
|
unknown
|
5641c59f5f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable
|
2018-08-10 09:49:37 -07:00 |
|
Sam Gateau
|
c404f94220
|
Merge pull request #13795 from SamGondelman/paint
Remove unused uniform buffer from polylines
|
2018-08-10 09:36:53 -07:00 |
|
sabrina-shanman
|
f902552309
|
Finalize on using 'rotation' in Collision Pick API and add missing jsdoc for CollisionRegion
|
2018-08-10 08:55:29 -07:00 |
|
Brad Davis
|
f03370c826
|
Migrating to scribe program descriptors
|
2018-08-09 17:58:34 -07:00 |
|
Sam
|
cd7ca96c3a
|
Remove the separate depth buffer for in front overlay, only useful for debug and it breaks in mac
|
2018-08-10 02:42:45 +02:00 |
|
Wayne Chen
|
769e7eab03
|
removing domainLimitedScale property and changing read property of scale
|
2018-08-09 17:38:58 -07:00 |
|
amantley
|
c8a31bc59f
|
created a backward walk speed constant 1.6m/s and changed the characteristic speed for strafe right left to 1.3
|
2018-08-09 17:38:57 -07:00 |
|
Wayne Chen
|
d533e3b341
|
adding domainLimitedScale property
|
2018-08-09 17:29:13 -07:00 |
|
John Conklin II
|
2d9cbe91bb
|
Merge pull request #13780 from hyperlogic/bug-fix/perftimer-memory-corruption
Fix memory corruption in PerformanceTimer when Stats are active
|
2018-08-09 17:16:03 -07:00 |
|
sabrina-shanman
|
ad36e23c34
|
Return early when colliding MyAvatar is found in AllContactsCallback
|
2018-08-09 17:00:54 -07:00 |
|
Sam
|
5fd3862c94
|
FIx shader error on mac in shadow.slh
|
2018-08-10 00:45:25 +02:00 |
|
Gabriel Calero
|
6e793a06a9
|
Merge remote-tracking branch 'upstream/master' into android_audio_fixes3
|
2018-08-09 18:47:17 -03:00 |
|
John Conklin II
|
6481aea2f4
|
Merge pull request #13715 from SamGondelman/parabolic
Enable parabolic teleport
|
2018-08-09 13:12:17 -07:00 |
|
Dante Ruiz
|
9a8ebdd021
|
Merge pull request #13739 from dback2/cloneChildrenFix
Fix cloning a parented entity
|
2018-08-09 13:05:28 -07:00 |
|
John Conklin II
|
59977fe1d3
|
Merge pull request #13764 from r3tk0n/17249-safe-landing
Relocate Avatar Spawn Point from the Hips to the Feet
|
2018-08-09 12:45:30 -07:00 |
|
SamGondelman
|
a0dfd76f06
|
variable texture support
|
2018-08-09 12:32:36 -07:00 |
|