Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-29 18:01:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
71064 commits 25 branches 0 tags 1.1 GiB
Commit graph

21804 commits

Author SHA1 Message Date
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
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
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
amantley
f26d6b8c3d cleaned up code and changed the forward offset for the default eyes when there is no neck bone 2018-08-09 12:15:35 -07:00
luiscuenca
9ca0ee05dc Fix wanings 2018-08-09 12:13:03 -07:00
amantley
a3f2fd1f23 removed some print statements and added the code to use the head parent when the neck is missing, this allows for cauterization 2018-08-09 11:33:27 -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
Andrew Meadows
8153e660bf don't simulate/animateScaleChanges for fading avatars 2018-08-09 08:54:28 -07:00
amantley
c774dd7f5b debugging to solve the no-neck crazy scale problem 2018-08-08 17:52: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
Sam Gateau
16bf46ea34 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-08-08 14:22:52 -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
Sam Gateau
9295007d99 fixing the ui script and trying to get shadow 2018-08-08 09:22:31 -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
Simon Walton
790fb43b42 Start of safe landing client work 2018-08-07 11:34:05 -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
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
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
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
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
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
sabrina-shanman
a06f85faa8 Consolidate intersection information in CollisionPickResult to one list, and move variant conversion code to source file 2018-08-02 11:27:04 -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
amantley
6b2c67e5bd more doug support 2018-08-01 18:22:51 -07:00
Simon Walton
88fafc7a1f
Merge pull request #13704 from SimonWalton-HiFi/delay-physics 
Enable physics after ES indicates all nearby entities received
 2018-08-01 18:15:00 -07:00
SamGondelman
1ba28de5b6 try to fix nodelist not getting destroyed 2018-08-01 17:52:27 -07:00
Andrew Meadows
e336c9276d first set shape THEN use it 2018-08-01 17:39:57 -07:00
SamGondelman
8a9c27ed92 Merge remote-tracking branch 'upstream/master' into destroy 2018-08-01 16:07:48 -07:00
Brad Davis
4b317a84d8 Don't allow Web surfaces created by non-client scripts to access files 2018-08-01 15:12:45 -07:00
Andrew Meadows
bd6f00e707 eliminate angular dynamics of other-avatars 2018-08-01 11:58:52 -07:00
John Conklin II
fd1a431729
Merge pull request #13689 from ctrlaltdavid/M15244 
Move scriptable caches' APIs into scripting interfaces
 2018-08-01 11:50:13 -07:00
John Conklin II
fcf32dbc6b
Merge pull request #13642 from ctrlaltdavid/M13352 
Fix HMD.mountedChanged() API signal
 2018-08-01 11:28:11 -07:00
Andrew Meadows
c939699879 ignore other-avatar angularVelocity in physics simulation 2018-08-01 11:22:58 -07:00
SamGondelman
a8c408abe8 correct render bounds for parabolas 2018-08-01 11:09:46 -07:00
Simon Walton
b18c1f0e1e Use defined value for invalid sequence number 2018-08-01 10:10:45 -07:00
Olivier Prat
a3e1eb997d Merge branch 'master' of http://github.com/highfidelity/hifi into shadow 2018-08-01 15:24:26 +02:00
Simon Walton
ed75fe673e Replace int+bool with single atomic int 2018-07-31 18:28:14 -07:00
amantley
02dd2f4f28 added velocity scaling for forward and back 2018-07-31 18:26:44 -07:00
Simon Walton
a320308eaf Fix sequence number encoding issue 
Don't mix QDataStream and readPrimitive. Also fix logic
issues in completion check; move new packet type; don't
reset known sent entities upon initial completion;
other reviewer recommendations.
 2018-07-31 13:54:22 -07:00
John Conklin II
16940cc9b7
Merge pull request #13716 from r3tk0n/17170-flying-crash 
Remove deprecated flying setting from MyAvatar.cpp saveData()
 2018-07-31 09:48:01 -07:00
Olivier Prat
30600dff93 Non shadow casters now increase shadow scene bounds only in light direction 2018-07-31 15:23:27 +02:00
Simon Walton
8c512ec19b Send spherical view from Interface rather than creating in ES 2018-07-30 18:03:45 -07:00
Clement
9e84603ca4 Make proper -v and -h options for interface 2018-07-30 17:18:32 -07:00
sabrina-shanman
de7d974336 Re-name EntityIntersection to ContactTestResult and remove its default constructor, plus update related variables 2018-07-30 16:45:31 -07:00
sabrina-shanman
fadc094a01 Do not work with raw pointer in CollisionPickResult::compareAndProcessNewResult 2018-07-30 15:10:21 -07:00
John Conklin II
bd2ab38bfe
Merge pull request #13701 from ElderOrb/FB16702 
FB16702 - Avatar App does not save Animation JSON Override URL
 2018-07-30 14:51:32 -07:00
sabrina-shanman
41a8deb575 Fix Linux build warnings 2018-07-30 14:51:04 -07:00
amantley
541d2deed5 added the parent alpha into the child animation weight, removed extra hand overlay print outs 2018-07-30 14:45:25 -07:00
r3tk0n
63de16bac5 Remove deprecated flying setting from MyAvatar.cpp saveData() 2018-07-30 11:40:15 -07:00
Sam Gondelman
8201997a16
Merge pull request #13660 from SamGondelman/parabolic 
Parabolic Picking + Pointers
 2018-07-30 10:49:02 -07:00
Simon Walton
be1bbc07c2 Don't wait for (nonexistant) ES when in serverless mode 2018-07-30 10:20:55 -07:00
Simon Walton
2ac6ca3291 Remove old physics-enabling code 2018-07-27 17:32:35 -07:00
amantley
637a214165 added the anim stack print out static object for the list of motion and weights 2018-07-27 17:25:00 -07:00
SamGondelman
3d4639bfdd CR 2018-07-27 16:36:22 -07:00
SamGondelman
1ef54b2fe6 back to ray teleport 2018-07-27 14:58:56 -07:00
Simon Walton
5315b020ec Use locking for the OctreePacketProcessor additions 2018-07-27 14:51:24 -07:00
John Conklin II
021e09d083
Merge pull request #13708 from sethalves/fix-grab-entity-w-child-overlay-crash 
fix a crash when grabbing a non-dynamic entity with an overlay child
 2018-07-27 12:49:14 -07:00
John Conklin II
9770331259
Merge pull request #13687 from danteruiz/fix-script-memory-issue 
Fix ScriptEngine begin held onto after script stopped runnning
 2018-07-27 12:31:31 -07:00
John Conklin II
d4cbbfe4c1
Merge pull request #13692 from amantley/leanBackSittingFix 
Fix For Unnatural Hips Behaviour When Sitting In HMD
 2018-07-27 12:30:31 -07:00
Simon Walton
3d390203e2 More fixes for clang & gcc 
C++14 issues, I think.
 2018-07-27 11:34:08 -07:00
Seth Alves
91d509f5a4 fix a crash when grabbing a non-dynamic entity with an overlay child 2018-07-27 10:35:26 -07:00
Seth Alves
41af82a7f6
Merge pull request #13702 from r3tk0n/17016-flying-settings 
17016 flying settings
 2018-07-27 10:07:13 -07:00
Sam Gondelman
3284f7b9d6
Merge pull request #13654 from huffman/fix/mirror-mode-create 
Fix computePickRay when in mirror mode
 2018-07-27 09:05:58 -07:00
amantley
b28ce40f09 adding the anim stack print out feature half way done 2018-07-27 08:46:40 -07:00
Simon Walton
0cec9a72d6 Implement client-side enable physics once indicated EntityData has arrived 
Also now use Entity Server Protocol sequence numbers.
 2018-07-26 18:10:38 -07:00
SamGondelman
f5364f752f fix scaling 2018-07-26 18:01:24 -07:00
Alexander Ivash
29f7cab7df FB16702 - Avatar App does not save Animation JSON Override URL 
note: PR also changes logic of 'hint' - previously it showed hard-coded senseless text, now - current value of 'animation URL'
 2018-07-27 02:08:44 +03:00
r3tk0n
f3d0d9b4a0 Clean up garbage comments. 2018-07-26 15:37:42 -07:00
r3tk0n
f8c611b1d0 Divorce HMD and Desktop flying settings, implement setters and getters, change loadData and saveData in MyAvatar.cpp 2018-07-26 15:35:12 -07:00
SamGondelman
6a52b7b8f3 CR improvements 2018-07-26 12:15:12 -07:00
amantley
12cb212dc7 used avatar constants from AvatarConstants.h to initialize tpposehips and tposerightfoot, and added space between multiplication to meet coding standards 2018-07-26 12:05:17 -07:00
Anthony Thibault
6c92949aed
Merge pull request #13672 from luiscuenca/fixElbowPoleVector 
Redesign and enable hand's Pole Vectors for elbow simulation
 2018-07-26 11:51:33 -07:00
David Rowe
baf88ab508 Revise scriptable resource caches' interfaces 2018-07-26 16:12:16 +12:00
Simon Walton
a15e78a0f4 Missed an identifier change 2018-07-25 17:36:53 -07:00
sabrina-shanman
de6d30e160 Add JS docs for CollisionPick API 2018-07-25 16:49:41 -07:00
NissimHadar
ce53b44b02 CR comments. 2018-07-25 15:58:46 -07:00
SamGondelman
9b41cb5554 improve model picking performance, scale parabola v/a with avatar, improve followNormal behavior, turn off followNormal on teleport, remove 1 m no teleport spot 2018-07-25 15:19:25 -07:00
NissimHadar
630df7c233 Corrects loading of texture and default visibility. 2018-07-25 13:28:23 -07:00
sabrina-shanman
8f993e4740 Change meaning/naming of collision points in CollisionPick API to better match spec and be more clear 2018-07-25 11:45:13 -07:00
amantley
37540c79b3 removed print statement and added const upper leg fraction 2018-07-25 10:51:19 -07:00
amantley
c5599623f7 added a reset when the hips go below 1/3 of the default avatar height of the hips also reset the vertical this prevents real life sitting 2018-07-25 10:29:29 -07:00
Dante Ruiz
a21a475784 Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-hmd-issue 2018-07-25 08:44:28 -07:00
Dante Ruiz
8da1db31df fix audio page being in desktop when your in HMD 2018-07-25 08:44:11 -07:00
David Rowe
16e06de9cd Move scriptable caches into scripting interfaces 
Removed non-working getResource() API functions.
 2018-07-25 22:10:14 +12:00
amantley
b91df1b2d4 cleaned up stray files and old hud code 2018-07-24 17:25:27 -07:00
amantley
91b9865f27 Merge remote-tracking branch 'upstream/master' into animationBlendChanges 2018-07-24 17:14:24 -07:00
Simon Walton
47e99cdeac Initial code for AC side of Enabling Physics plan 
When interface sets query flag send only entities
close to main frustrum origin, until no more available,
then send unreliabe sequence # reliably.
 2018-07-24 16:50:37 -07:00
Dante Ruiz
b750a005cf fix script memory issue 2018-07-24 16:31:12 -07:00
sabrina-shanman
083991dc1a Fix CollisionPick not detecting when collision points for collision models are loaded 2018-07-24 15:50:18 -07:00
sabrina-shanman
5ec277e458 Move bullet references in collision pick API to PhysicsEngine 2018-07-24 15:47:49 -07:00
SamGondelman
fbcddf1445 test gradual normal interpolation 2018-07-24 14:15:49 -07:00
SamGondelman
645f905239 cleanup, model performance improvements 2018-07-24 13:25:49 -07:00
John Conklin II
99c26e6363
Merge pull request #13674 from r3tk0n/16984-CompositorHelper 
Added _aboutToQuit guard on eventFilter()
 2018-07-24 11:37:19 -07:00
SamGondelman
318ef907b8 parabola/polyvox, fixing some bugs 2018-07-24 10:08:35 -07:00
sabrina-shanman
a1202d9bd5 Do not use dynamic cast with bullet objects, and add missing template syntax 2018-07-24 09:07:18 -07:00
luiscuenca
e7d70a832d Pole Vectors always calculated when arms are crossed 2018-07-24 08:58:17 -07:00
amantley
aa92865b21 added the code to display the alphas for the motion blends 2018-07-23 17:45:24 -07:00
John Conklin II
2ac9463830
Merge pull request #13653 from ElderOrb/fake-wearables-fix 
FB16870: Avatar Wearables showing incorrect number
 2018-07-23 15:55:11 -07:00
John Conklin II
27b35d84cc
Merge pull request #13652 from r3tk0n/16206-flying-settings 
MS16206 - Enable flight by default in desktop, controls menu changes re: flying
 2018-07-23 15:19:46 -07:00
MuteTab
52e5bdb360 Added _aboutToQuit guard on eventFilter() 2018-07-23 14:27:38 -07:00
luiscuenca
2adb334034 unused code deleted 2018-07-23 14:25:30 -07:00
sabrina-shanman
a3560d1a1b Remove wrong template from RigidBodyResultCallback function definitions 2018-07-23 13:47:02 -07:00
sabrina-shanman
66f355e5ba Move bullet callbacks for collision picks to source file 2018-07-23 13:33:16 -07:00
sabrina-shanman
ca30bb59af Remove unused Bullet callbacks for collision picking 2018-07-23 13:25:09 -07:00
luiscuenca
9d2d7c3aa4 Redesign and enable hand's Pole Vectors for elbow simulation 2018-07-23 13:16:11 -07:00
sabrina-shanman
7f743de150 Fix CollisionRegion serialization/deserialization issues and CollisionPick implicit cast warning 2018-07-23 12:59:23 -07:00
Alexander Ivash
33c858774b fix coding standard compliance 2018-07-23 21:01:43 +03:00
Seth Alves
ae83c33621
Merge pull request #13646 from sethalves/put-back-old-style-attachment-dialog-master 
put back old-style avatar-attachments menu-item
 2018-07-23 10:25:23 -07:00
r3tk0n
bc91affa70 Bring this PR inline with RC70.1 PR. 2018-07-20 15:13:44 -07:00
SamGondelman
763e6465a2 followNormal, fixin stuff 2018-07-20 10:41:24 -07:00
Alexander Ivash
f5717b7648 add check for SELF_ID 2018-07-20 19:33:16 +03:00
Alexander Ivash
849c91d8f6 remove not necessary EntityTreeRenderer from removeAvatarEntities's condition 2018-07-20 19:32:58 +03:00
r3tk0n
3108d650de
Restore original menu string for flying 
Restore the original menu string for flying as it apparently *does* effect jumping.
 2018-07-20 08:29:11 -07:00
Cristian Luis Duarte
9bb4bada8a Merge remote-tracking branch 'hifi/master' into android_loading_stuck 2018-07-19 21:45:03 -03:00
Cristian Luis Duarte
eb5cc00fff newlines 2018-07-19 21:24:29 -03:00
Alexander Ivash
fb8640de47 FB16870: Avatar Wearables showing incorrect number 2018-07-20 02:51:17 +03:00
Cristian Luis Duarte
6d239f40fb Android - Freeze at startup problem - remove logs 2018-07-19 20:47:05 -03:00
Ryan Huffman
1f259d235d Fix computePickRay when in mirror mode 
In mirror mode the view frustum is unaffected - instead we flip the
final image. To compensate for this, we need to flip the x coordinate of
our pick point when picking in mirror mode.
 2018-07-19 15:30:11 -07:00
SamGondelman
956c1511b6 Merge remote-tracking branch 'upstream/master' into parabolic 2018-07-19 15:23:25 -07:00
MuteTab
dfcf47e8ee Removed useless comment. 2018-07-19 14:44:32 -07:00
MuteTab
8d65e14193 Remove one change, turned out to be unnecessary. 2018-07-19 14:43:46 -07:00
MuteTab
3080539b63 Make getFlyingEnabled() always true when in desktop. 2018-07-19 14:40:20 -07:00
MuteTab
b70b424447 Added new menu classification for VR vs non-VR movement. 2018-07-19 14:27:49 -07:00
Qliemillar
e779e42d90
Merge pull request #13635 from NissimHadar/bug16645 
Fix for bug16645 "disturbing flash when adding an overlay (even when everything is cached)"
 2018-07-19 14:43:04 -06:00
David Rowe
a3e677e64f Code review 2018-07-20 08:32:21 +12:00
MuteTab
63089df2dd Re-added missing semi-colon. 2018-07-19 12:42:45 -07:00
MuteTab
a99f9310da Add first-run checks for flying settings. 2018-07-19 12:41:24 -07:00
SamGondelman
39fa3420ec pointer rendering, update teleport.js 2018-07-19 12:02:39 -07:00
Brad Davis
63fa54ceda Fix for audio continuing on destroyed Web 3D overlays 2018-07-19 11:50:18 -07:00
Seth Alves
965c35292c put back old-style avatar-attachments menu-item 2018-07-19 11:32:19 -07:00
sabrina-shanman
f33ee55f9e Create CollisionPick API 2018-07-19 10:33:21 -07:00
David Rowe
5e624246a8 Fix HMD.mountedChanged() API signal 2018-07-19 13:00:57 +12:00
NissimHadar
4c0b7ca24c Updated per Samuel's/Austin's comments. 2018-07-18 17:30:46 -07:00
amantley
5ec7ab3a7d removed the other way of computing the average lookat which used a ring buffer 2018-07-18 17:20:47 -07:00
amantley
a8c4f4e650 removed extra whitespace 2018-07-18 17:10:09 -07:00
amantley
7cc724a27b added properties to allow the toggling of the debug draw the look at vector, and the reset moving average look at on step detection 2018-07-18 17:08:04 -07:00
NissimHadar
a882931c6b Only show overlay if textures have loaded 2018-07-18 15:02:02 -07:00
David Rowe
835fb927b7 Merge branch 'master' into 21899 2018-07-19 09:34:37 +12:00
David Rowe
396382afd7 Fill in Audio API JSDoc 2018-07-19 09:31:48 +12:00
NissimHadar
446ef97fc5 Only show overlay if textures have loaded 2018-07-18 13:54:03 -07:00
Wayne Chen
c104e95ef4 Merge branch 'master' of https://github.com/highfidelity/hifi into loginDialogBrowser-case-16537 2018-07-18 09:06:22 -07:00
amantley
ef2d3c9f16 Merge remote-tracking branch 'upstream/master' into rotateFilterChange 
synching with master
 2018-07-18 09:00:18 -07:00
Qliemillar
080d664341
Merge pull request #13619 from luiscuenca/handTouchDisabler 
Allow creators to disable hand touch from javascript
 2018-07-18 08:16:37 -06:00
amantley
33f9acde67 latest 2018-07-17 17:42:11 -07:00
luiscuenca
e3594fe1b7 mutex added 2018-07-17 17:23:03 -07:00
Wayne Chen
3b7f88a4a8 Merge branch 'master' of https://github.com/highfidelity/hifi into loginDialogBrowser-case-16537 2018-07-17 17:08:43 -07:00
luiscuenca
ba884f8a94 Forgotten coment 2018-07-17 16:42:59 -07:00
luiscuenca
6225435385 some ortographic fixes 2018-07-17 16:38:34 -07:00