Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-29 02:26:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
70998 commits 6 branches 1 tag 1.1 GiB
Commit graph

29179 commits

Author SHA1 Message Date
sabrina-shanman
83ededfd37 Pass collision filter flags into AllContactsCallback for more efficient collision filtering 2018-08-15 11:12:50 -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
Sam Gateau
12f1b99283 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-08-10 16:41:08 -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
Sam Gateau
d5cfe95a0a merging with master 2018-08-10 15:03:33 -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
Simon Walton
3c665b7de8 Don't delete sequence numbers outside of range as range may change 2018-08-10 14:40:08 -07: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
Ryan Huffman
44a9b1df0e Fix choice of target backend in TextureCache on OSX 2018-08-09 12:30:42 -07:00
SamGondelman
bd4a3a5b32 remove unused uniform buffer from polylines 2018-08-09 12:20:36 -07:00
John Conklin II
17189b403a
Merge pull request #13786 from hyperlogic/bug-fix/remove-tip-constraint-enforcement 
In CCD IK chains, remove the LeftHand and RightHand constraint
 2018-08-09 10:49:55 -07:00
luiscuenca
8c121a531d Turn attachments into avatar entities 2018-08-09 10:35:15 -07:00
SamGondelman
bba806f78c merge with master, fix uniform slots, use varyings for sigma 2018-08-08 22:27:22 -07:00
David Back
8db0711b5b set grabbable user data in addModelEntity, pass grabbable from asset browser 2018-08-08 16:33:47 -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
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
Sam Gondelman
16b483b338
Merge pull request #13766 from SamGondelman/shaders 
Miscellaneous shader fixes
 2018-08-08 11:34:36 -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
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
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
Olivier Prat
2584ce4c96 Merged with master 2018-08-08 08:42:44 +02: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
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
SamGondelman
6ff0b9d417 fix debug tools 2018-08-07 15:25:56 -07:00
amantley
1353406254 more whitespace 2018-08-07 12:56:28 -07:00
amantley
4ad73fd821 removed whitespace 2018-08-07 12:51:23 -07:00
Sam Gateau
f286e3370b Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-08-07 11:56:47 -07:00
SamGondelman
de10dfb032 don't bind materials during shadow pass 2018-08-07 11:17:18 -07:00
Sam Gateau
07cb0db425 Fix bug with texel opaque and transparent cut off shader function 2018-08-07 11:16:50 -07:00
amantley
a61909446a Merge remote-tracking branch 'upstream/master' into animationBlendChanges 2018-08-07 10:40:22 -07:00
amantley
84619e7adc cleaned up to match coding standards 2018-08-07 10:40:11 -07:00
SamGondelman
82029b4cb0 fix v1 and transparent procedurals 2018-08-07 09:28:40 -07:00
Sam Gateau
aac49e901b merging with master (andthe big shader pr) 2018-08-07 09:16:30 -07:00
Gabriel
cb215d3190
Set audio buffer size to 20 ms for android 
CALLBACK_ACCELERATOR_RATIO = 0.5
 2018-08-07 11:49:56 -03:00
Gabriel
5bb9accd30
Fix low volume issue in Samsung 
Make Qt use QT_ANDROID_PRESET_VOICE_RECOGNITION device in order to set SL_ANDROID_RECORDING_PRESET_VOICE_RECOGNITION in OpenSL ES
 2018-08-07 10:57:51 -03:00
r3tk0n
1aa9fcd41a
Fix a typo 
In jsdoc comments for getWorldFeetPosition() in Avatar.h
 2018-08-06 21:23:06 -07:00
MuteTab
d04ac2b8ed Fixed jsdoc comments for Avatar::getWorldFeetPosition 2018-08-06 19:40:47 -07:00
amantley
1ad6b041cd updated the elipes equation code for determining the forward speed of the avatar. We can now set the max forward == walkSpeed, max side and backwards == walkBackwardsSpeed and the sprint speed == sprintSpeed 2018-08-06 18:36:32 -07:00
Anthony Thibault
079b276c2b
Merge pull request #13733 from luiscuenca/fixElbowPoleVector3 
Elbow pole vectors improvements
 2018-08-06 17:33:03 -07:00
Sam Gateau
00c5b6f5f4
Merge pull request #13743 from SamGondelman/transparent 
Fix primitives always drawing as transparents
 2018-08-06 16:28:30 -07:00
SamGondelman
a7dec8fb75 parabola and particle shader fixes 2018-08-06 15:49:52 -07:00
Sam Gateau
09d33177fc Adjust Workload and better representation of the workload debuging features 2018-08-06 15:36:25 -07:00
MuteTab
40889c8f09 Added getWorldFeetPosition() function to Avatar 2018-08-06 15:35:54 -07:00
Sam Gondelman
7dd80d0180
Merge pull request #13240 from jherico/feature/glsl_layouts 
Update shader pipeline, improve mac startup time
 2018-08-06 15:30:46 -07:00
Brad Davis
dcdc3a323c Use defines for packed textures to satisfy both GLES and GL 4.1 2018-08-06 14:35:36 -07:00
amantley
f1990378fd merged the json from the ik 2 bone pr into the new animation json 2018-08-06 14:27:09 -07:00
SamGondelman
e3756a6dae Merge branch 'destroy' of github.com:SamGondelman/hifi into destroy 2018-08-06 11:21:51 -07:00
SamGondelman
9806bce403 weak pointers to nodeList 2018-08-06 11:21:32 -07:00
Brad Davis
a0ef0c0b13 Fix procedurals 2018-08-06 10:31:14 -07:00
Sam Gondelman
2edefe3209
Merge branch 'master' into destroy 2018-08-06 09:51:14 -07:00
SamGondelman
6b7f5b662e jsdoc fixes 2018-08-06 09:41:05 -07:00
amantley
08889b627a Merge remote-tracking branch 'upstream/master' into animationBlendChanges 2018-08-06 09:16:53 -07:00
Angus Antley
a63b213d65 fixed the weight calculation for the hand overlays. to do: check the blends in hmd mode 2018-08-06 15:18:17 +01:00
Olivier Prat
c56bb9a855 Small optimization by using squared distance and not distance in depth sort 2018-08-06 08:20:21 +02:00
Olivier Prat
8eb7ceb66a Fixed the bug with the thin dark lines at cascade shadow switches (hopefully) 2018-08-05 12:06:36 +02:00
Ken Cooke
496724f0db formatting cleanup 2018-08-04 20:15:04 -07:00
Ken Cooke
2121e201d5 fix assert when azimuth is negative subnormal 2018-08-04 20:09:27 -07:00
Olivier Prat
d457cf45d5 Fixed bug with NaN shadow anti frustum leading to disappearing shadows on some occasions 2018-08-04 16:51:05 +02:00
Olivier Prat
92e64510ec Fixed draw frustum and draw aabb code 2018-08-04 15:58:24 +02:00
sabrina-shanman
870940b3a0 Merge branch 'master' into safe-teleport-target 2018-08-03 18:14:43 -07:00
amantley
bac9d195be working on the hand blend alphas, something is wrong with the print out 2018-08-03 17:56:49 -07:00
sabrina-shanman
cf34a2cffd Do not const cast CollisionRegion 2018-08-03 17:55:54 -07:00
John Conklin II
3a6a72a079
Merge pull request #13643 from SimonWalton-HiFi/user-setting-hmac 
Add DS option to disable HMAC packet authentication
 2018-08-03 17:45:32 -07:00
amantley
375d726535 added the new animations for strafe and walk to the resource file and updated the avatar-animation.json file 2018-08-03 16:48:43 -07:00
MiladNazeri
a7a8214983
Merge pull request #13637 from ctrlaltdavid/M08513-a 
Audio API JSDoc
 2018-08-03 16:38:03 -07:00
Bradley Austin Davis
fc51b93691 Fix OSX build 2018-08-03 16:15:58 -07:00
Sam Gateau
c1951da2bb
Merge pull request #13737 from jherico/fix/fb16633_a 
Don't allow Web surfaces created by non-client scripts to access files
 2018-08-03 15:25:41 -07:00
Brad Davis
a1cd39f4c2 Fix some explicit bindings that should be binding, not location 2018-08-03 14:58:12 -07:00
Brad Davis
6ed7512112 Fix build failures after parabola merge 2018-08-03 14:58:12 -07:00
Brad Davis
df031b5d93 Fix procedural rendering with custom uniforms 2018-08-03 14:58:12 -07:00
Brad Davis
eca803503c Fix resolution scaling 2018-08-03 14:58:12 -07:00
Brad Davis
8eb97dc79c PR feedback 2018-08-03 14:58:12 -07:00
Brad Davis
a1a1a03bbc Fixing crash on exit, deferred debugging tool 2018-08-03 14:58:11 -07:00
Brad Davis
ae8f841912 Shader refactoring for explicit bindings 2018-08-03 14:58:11 -07:00
Brad Davis
04e84f1d23 Moving to cmake time shader compiling 2018-08-03 14:58:11 -07:00
Brad Davis
d6bcdcde3f Fix DISABLE_QML behavior 2018-08-03 14:58:11 -07:00
John Conklin II
243bd5ea69
Merge pull request #13536 from SimonWalton-HiFi/script-engine-thread-agent 
ScriptsModel instances should be created & destroyed on the same thread (for Agent)
 2018-08-03 13:32:11 -07:00
sabrina-shanman
b7d5804edb Format if..else statements 2018-08-03 12:55:11 -07:00
David Rowe
fdd6b7e07b Delete erroneous merge file 2018-08-04 07:29:57 +12:00
David Rowe
2270255d88 JSDoc review 2018-08-04 07:22:12 +12:00
amantley
76b182f03b added the hmd strafe to the rig code 2018-08-03 12:12:01 -07:00
sabrina-shanman
0b40608650 Fix collision picks not working with MyAvatar 2018-08-03 12:05:58 -07:00
Bradley Austin Davis
8e9c1e5c0a Fix out of date comment 2018-08-03 11:38:39 -07:00
Olivier Prat
cb24046eea Reorder some functions 2018-08-03 18:51:31 +02:00
Sam Gateau
2013f1bd33
Merge pull request #13732 from AndrewMeadows/other-avatar-physics 
reduce physics simulation cost of other-avatars
 2018-08-03 09:33:59 -07:00
Olivier Prat
f2a01021f3 Improvement of debug shadow script 2018-08-03 18:01:22 +02:00
Alexander Ivash
5a2506e94f FB16831 qml-related warnings in log 
fix is based on exposing C++ objects to QML before root object is created (as root object might already require C++ objects)
 2018-08-03 17:10:41 +03:00
Brad Davis
3c7f1a0c4b Merge remote-tracking branch 'upstream/master' into destroy 2018-08-02 15:34:19 -07:00
David Rowe
32e3bb0e1d Merge branch 'master' into M08513-a 
# Conflicts:
#	libraries/audio/src/SoundCache.h
 2018-08-03 10:29:32 +12:00
amantley
096cb0db81 working on strafe left and right transitions 2018-08-02 13:32:06 -07:00
SamGondelman
2f358f3380 fix shapes always drawing as transparents 2018-08-02 12:16:01 -07:00
amantley
bd88d5f15b merging with ik leg fix code in master 2018-08-02 09:48:04 -07:00
Olivier Prat
0c8d8e985f Merge branch 'master' of http://github.com/highfidelity/hifi into shadow 2018-08-02 17:14:31 +02:00
Gabriel
f0d058cb61
Set buffer to 10 ms for android (CALLBACK_ACCELERATOR_RATIO = 1.0) 2018-08-02 11:29:56 -03:00