Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 19:55:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
70819 commits 25 branches 0 tags 1.1 GiB
Commit graph

26381 commits

Author SHA1 Message Date
luiscuenca
dd93055d89 Convert and load attachments when rig is ready 2018-08-10 16:15:30 -07:00
Sam Gateau
d5c5bd714f
Merge pull request #13785 from AndrewMeadows/no-update-fading-avatars 
don't call Avatar::simulate() on fading avatars
 2018-08-10 15:44:07 -07:00
Simon Walton
05fa7fdf0e Clean-up 2018-08-10 15:43:51 -07:00
Zach Fox
096be16bb1 Only restart timer if feedMouseArea doesn't contain mouse 2018-08-10 15:32:44 -07:00
Zach Fox
1a6a55680c PropagateComposedEvents 2018-08-10 15:30:32 -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
David Rowe
3a356de49f Don't auto-action entry in HMD file dialog when single-click on it 2018-08-11 09:46:11 +12: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
unknown
8c185aa04e fix menu option 2018-08-10 12:13:09 -07:00
unknown
5d1cc3696a Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable 2018-08-10 12:10:57 -07:00
unknown
45b9871fdb when adding asset to world set grabbable 2018-08-10 12:10:49 -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
Zach Fox
f514fde6fd
Merge pull request #13789 from zfox23/MS17469_listModelFix 
v0.72.0: Fix MS17469: Fix conditionals for needing more paginated results when ListView changes
 2018-08-10 10:24:01 -07:00
David Kelly
2b5ecd6b5f remove extraneous log 2018-08-10 10:12:32 -07:00
Simon Walton
a8b9568c92 Add some locking 2018-08-10 10:11:46 -07:00
Zach Fox
e39dd250cd Things will 'just work' once backend is in place 2018-08-10 10:01:09 -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
Zach Fox
9124e5cf22 Merge branch 'master' of github.com:highfidelity/hifi into autoScrollGoTo 2018-08-10 09:47:10 -07:00
Zach Fox
1699d3ed6a Wording change in Availability 2018-08-10 09:35:40 -07:00
Brad Davis
f03370c826 Migrating to scribe program descriptors 2018-08-09 17:58:34 -07:00
sabrina-shanman
660178e5bb Remove 'plane' from list of supported Collision Pick shapeTypes, since it turns out ShapeFactory does not support it 2018-08-09 17:41:46 -07: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
sabrina-shanman
4c367fa443 Fix outdated explanation of when CollisionPickResult.intersects is true 2018-08-09 17:26:54 -07:00
sabrina-shanman
b32b811fff Move up buildObjectIntersectionsMap in CollisionPick.cpp 2018-08-09 17:24:09 -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
26ae688d59 Refactor CollisionPickResult::toVariantMap 2018-08-09 17:11:32 -07:00
sabrina-shanman
c5e9f02372 Finalize Collision Pick API naming convention for intersectingObjects 2018-08-09 16:59:23 -07:00
Simon Walton
875407b3fe New approach to physics readiness - now (mostly) working 2018-08-09 16:24:04 -07:00
Alexia Mandeville
38973f0840 Adding icon states to emote app, active state 2018-08-09 16:00:36 -07:00
sabrina-shanman
4f077080b0 Change API naming for intersectingObjects in CollisionPickResult and update docs 2018-08-09 15:29:21 -07:00
sabrina-shanman
4d31863484 Fix missing jsdoc note for getPrevPickResult on existence of ParabolaPickResult 2018-08-09 15:08:27 -07:00
David Kelly
3b7d1cb6cf Only update gain if it really changed 
and only fire UserActivity if we really do change the gain
 2018-08-09 14:55:07 -07:00
John Conklin II
6481aea2f4
Merge pull request #13715 from SamGondelman/parabolic 
Enable parabolic teleport
 2018-08-09 13:12:17 -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
David Back
9779ce1b80
Merge pull request #13777 from dback2/reloadContentScriptCache 
Clear script cache with reload content
 2018-08-09 12:19:39 -07:00
luiscuenca
9ca0ee05dc Fix wanings 2018-08-09 12:13:03 -07:00
Zach Fox
c0e2b3a240 Happening Now -> Featured 2018-08-09 11:49:29 -07:00
Simon Walton
4395e1fa26 Safe Landing checkpoint 2018-08-09 11:11:58 -07:00
luiscuenca
8c121a531d Turn attachments into avatar entities 2018-08-09 10:35:15 -07:00
Zach Fox
4248f342b4 Fix MS17469: Fix conditionals for needing more paginated results when ListView changes 2018-08-09 10:22:09 -07:00
Andrew Meadows
8153e660bf don't simulate/animateScaleChanges for fading avatars 2018-08-09 08:54:28 -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
Andrew Meadows
9b0dcb45ba don't update fading avatars 2018-08-08 14:00:44 -07:00
Simon Walton
88bd4e3d9a WIP - safe landing infrastructure 2018-08-08 12:32:45 -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
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
Olivier Prat
2584ce4c96 Merged with master 2018-08-08 08:42:44 +02:00
sabrina-shanman
69812d04ae Reduce scope of CollisionPick shapeType to primitive shapes 2018-08-07 17:42:38 -07:00
r3tk0n
32165dff40 Fixed rotations in MyAvatar::goToFeetLocation() 2018-08-07 14:31:48 -07:00
amantley
1353406254 more whitespace 2018-08-07 12:56:28 -07:00
David Back
a905a76c70 reload script cache with reload content 2018-08-07 11:53:11 -07:00
Zach Fox
af9dc8acca Turn on only for Annoucements 2018-08-07 11:51:38 -07:00
Zach Fox
4cee6b720a Implement auto-scrolling on Places cards (TODO for Connections) 2018-08-07 11:50:38 -07:00
Simon Walton
790fb43b42 Start of safe landing client work 2018-08-07 11:34:05 -07:00
Dante Ruiz
8c5eefcc95 some file and code cleanup 2018-08-07 10:58:45 -07:00
Dante Ruiz
d78c571df6 revert to use overlays instead of entities for tablet highlighting 2018-08-07 10:56:53 -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
MuteTab
b590ff793a New function for changing location in domains such that the AVatar's leg-length is taken into account. 2018-08-06 20:26:44 -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
MuteTab
de5c7f6dcd Change lambda for address manager position getter. 2018-08-06 16:02:00 -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
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
sabrina-shanman
577379dcb4 Do not re-calculate intersects flag in CollisionPickResult copy constructor 2018-08-06 10:53:03 -07:00
sabrina-shanman
c40db2e8f0 Add pick filtering to CollisionPick 2018-08-06 10:50:23 -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
sabrina-shanman
658ef4e9e6 Remove redundant namespace qualifier on CollisionPickResult::toVariantMap() in header file 2018-08-06 08:54:55 -07:00
John Conklin II
00a8b73814
Merge pull request #13751 from danteruiz/fix-flying 
fix flying
 2018-08-03 19:27:47 -07:00
sabrina-shanman
870940b3a0 Merge branch 'master' into safe-teleport-target 2018-08-03 18:14:43 -07:00
Dante Ruiz
9bebd1e623 making changes 2018-08-03 18:11:55 -07:00
sabrina-shanman
a460cfac29 Do not store physics engine pointer in PickScriptingInterface 2018-08-03 17:55:54 -07:00
sabrina-shanman
c6b24496c8 Add 'loaded' parameter to CollisionPickResult to indicate if the collision region is loaded 2018-08-03 17:56:01 -07:00
sabrina-shanman
e7766039b9 Pass pick variant map into unsuccessful/default collision results 2018-08-03 17:55:54 -07:00
sabrina-shanman
cf34a2cffd Do not const cast CollisionRegion 2018-08-03 17:55:54 -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
David Rowe
f9d9324a14 Improve text in Avatar app's pop-ups 2018-08-04 10:55:57 +12:00
Dante Ruiz
f30b552e19 fix-flying 2018-08-03 15:50:11 -07:00
Sam Gateau
aac4ff0b7e
Merge pull request #13749 from samcake/punk 
Fix the other avatars not being removed when Avatar mixer reset
 2018-08-03 15:37:13 -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
Alexia Mandeville
b3426f695b Making icon bigger 2018-08-03 15:12:18 -07:00
Brad Davis
6ed7512112 Fix build failures after parabola merge 2018-08-03 14:58:12 -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
Alexia Mandeville
c58322387a Increase stroke width on icon 2018-08-03 13:05:20 -07: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
Sam Gateau
da252a70c1 Same as https://github.com/highfidelity/hifi/pull/13747 2018-08-03 09:22:29 -07:00