Commit graph

69555 commits

Author SHA1 Message Date
Sam Gateau
07299291fc clarifying the engine inspector and engine profiler 2018-07-06 19:29:06 +02:00
Sam Gateau
36eb4eafc6 Merge branch 'master' of github.com:highfidelity/hifi into one 2018-07-06 10:53:39 +02:00
Sam Gateau
2eec5b01fa debugging and fixing the problem to get Config for complex path 2018-07-06 10:53:09 +02:00
John Conklin II
a97d4f655a
Merge pull request #13548 from luiscuenca/slantedAvatarFix
Fix avatar become more and more slanted over time while in HMD mode
2018-07-05 15:53:45 -07:00
Stephen Birarda
9fc5ba0d8b
Merge pull request #13554 from birarda/bug/conflicted-pr-build
grab correct commit hash for conflicting PR
2018-07-05 15:43:32 -07:00
Clément Brisset
f2a3907e3d
Merge pull request #13357 from SimonWalton-HiFi/memcheck-fixes
Entity Script Server memory leak when taking down EntityTree
2018-07-05 15:30:45 -07:00
Stephen Birarda
b4b0131065 grab correct commit hash for conflicting PR 2018-07-05 14:33:21 -07:00
John Conklin II
dfa0b96a93
Merge pull request #13546 from sethalves/fix-display-controller-buttons
keep buttons from drifing away from in-world display of controllers
2018-07-05 13:09:07 -07:00
luiscuenca
b2e02e20cc Fix inaccurate delta rotation axis 2018-07-05 11:47:10 -07:00
Seth Alves
73071df857 when displaying the in-world controller model, make buttons and joysticks be children of the base controller model, rather than children of the avatar 2018-07-05 10:07:49 -07:00
Zach Fox
01c4b57d11
Merge pull request #13539 from zfox23/MS16413_snapPrintFall
Implement MS16413: Improve angularVelocity of printed Snaps
2018-07-05 09:50:06 -07:00
Anthony Thibault
f56c0a3a3f
Merge pull request #13502 from luiscuenca/eyelidFix
Fix closed eyelids when head is tilted down
2018-07-05 08:50:22 -07:00
Sam Gateau
c7c1cdd8c3
Merge pull request #13529 from Zvork/transparent
Fix number of rendering issues with some transparent objects on Mac and AMD GPUs
2018-07-05 17:20:24 +02:00
Sam Gateau
d2a66b9e7d Moving the paintGL to a true GraphicsEngine::render_performFrame() 2018-07-04 17:26:24 +02:00
Sam Gateau
8fd6c1fea2 Merge branch 'master' of github.com:highfidelity/hifi into one 2018-07-04 11:35:20 +02:00
Sam Gateau
f9bd6f5d03 slowly clening up 2018-07-04 11:34:58 +02:00
Anthony Thibault
c840670a54
Merge pull request #13519 from hyperlogic/bug-fix/stable-pole-vector-smoothing
Bug fix for unexpected avatar knee shifts for users wearing Vive Trackers.
2018-07-03 21:50:57 -07:00
Wayne Chen
70917198b2
Merge pull request #13540 from wayne-chen/fixFlyDownMapping-case-14555
Updating keyboard mapping .jpg to reflect keyboard/mouse mapping
2018-07-03 17:33:28 -07:00
Wayne Chen
cfa54c2905 adding updated keyboard mapping .jpg to repo 2018-07-03 16:28:19 -07:00
John Conklin II
d34d7388a1
Merge pull request #13537 from r3tk0n/move_hide_overlays_menu
Moved "Show Overlays" menu item to Developer Menu
2018-07-03 15:59:02 -07:00
Thijs Wenker
446b82abd6
Merge pull request #13410 from dback2/editHandleToggleFix
Fix toggling edit handles between local/world space
2018-07-04 00:23:21 +02:00
Zach Fox
6efb895708 Implement MS16413: Improve angularVelocity of printed Snaps 2018-07-03 13:43:04 -07:00
Clément Brisset
ee03670215
Merge pull request #13492 from SimonWalton-HiFi/script-engine-thread
ScriptsModel instances should be created & destroyed on the same thread (for ESS)
2018-07-03 13:30:29 -07:00
Stephen Birarda
e3c6402d0e
Merge pull request #13522 from birarda/bug/android-version-code-master
add version code for increasing android appVersionCode
2018-07-03 13:15:52 -07:00
John Conklin II
65daee2353
Merge pull request #13513 from vladest/double_asset_server_fix
Tablet Asset Server dialog was instantiated twice
2018-07-03 13:14:12 -07:00
John Conklin II
6737647a56
Merge pull request #13524 from danteruiz/fix-calibration
fix configuration page
2018-07-03 13:13:48 -07:00
John Conklin II
8f838397a4
Merge pull request #13525 from AndrewMeadows/slow-kinematics
fix for erroneous deactivation of slow-spinning kinematic objects
2018-07-03 12:05:42 -07:00
r3tk0n
4426173021 Moved "Show Overlays" menu item to Developer Menu 2018-07-03 11:56:34 -07:00
amantley
3424f412aa
Merge pull request #13437 from amantley/lurchfix
Fix for Avatar Lean in Direction of Movement: Bug 16075 (for RC70)
2018-07-03 19:38:01 +01:00
Seth Alves
62ec693280
Merge pull request #13526 from wayne-chen/fixStillOnlySnap-case-15860
fixing still only snap in snap app
2018-07-03 11:36:25 -07:00
Stephen Birarda
3a4ce9cf5d
Merge pull request #13516 from SimonWalton-HiFi/friends-case-sensitivity
Use case-insensitive matching on friends lists in DomainGatekeeper
2018-07-03 10:29:22 -07:00
Wayne Chen
03a80ce6e3
Merge pull request #13532 from wayne-chen/removeRayPickPrintStatement
Remove ray pick print statement
2018-07-03 09:57:47 -07:00
Bradley Austin Davis
61005d456b
Merge pull request #13530 from samcake/punk
Really add safe check for targetDisplayPLugin
2018-07-03 09:41:25 -07:00
Sam Gondelman
5daf84d690
Merge pull request #13523 from SamGondelman/blur
Fix blurry tablet if overlay is drawing
2018-07-03 09:19:32 -07:00
Wayne Chen
2bbc5b6137 remove ray pick print statement - it bloats the debug window 2018-07-03 09:11:57 -07:00
Olivier Prat
aa115786e3 Invalidate uniform buffer cache when binding camera correction 2018-07-03 17:27:27 +02:00
Sam Gateau
96b26c94eb Really add safe check for targetDisplayPLugin 2018-07-03 16:59:40 +02:00
Olivier Prat
bda0c0a89f Discard fragments all the time if opacity is under threshold 2018-07-03 16:51:56 +02:00
Sam Gateau
c231463fca Merge with master 2018-07-03 12:55:19 +02:00
Sam Gateau
0f3cb0fb84 INtroducing th eGraphics Engine to group al the graphics related (render and gpu) elements 2018-07-03 12:50:52 +02:00
Olivier Prat
74a9b03a5e Merge branch 'master' of http://github.com/highfidelity/hifi into transparent 2018-07-03 09:26:29 +02:00
Wayne Chen
aefa52b4c9 fixing still only snap in snap app 2018-07-02 17:00:31 -07:00
Wayne Chen
d9cf838e93 Merge branch 'master' of https://github.com/highfidelity/hifi 2018-07-02 16:56:31 -07:00
Wayne Chen
2f75e1988f Merge branch 'master' of https://github.com/wayne-chen/hifi 2018-07-02 16:56:07 -07:00
Simon Walton
91e8f1f0f8 Ensure 'verifiedUsername' is always lower case 2018-07-02 15:30:58 -07:00
John Conklin II
3f975cfa84
Merge pull request #13506 from sabrina-shanman/fix-osx-crash-on-exit
Fix Mac Crashes On Shutdown
2018-07-02 15:27:26 -07:00
Andrew Meadows
ff6c309d8b add comment 2018-07-02 15:20:51 -07:00
Anthony J. Thibault
3a88582f42 Bug fix for feet poleVector smoothing.
This bug was introduced when I renamed the variable from poleVector to sensorPoleVector for readablity.
2018-07-02 15:16:47 -07:00
Andrew Meadows
5b4b0a7c25 fix server-side bug in kinematics 2018-07-02 15:04:11 -07:00
Andrew Meadows
9c32a38fb6 fix deactivation slow-spinning kinematics 2018-07-02 15:04:11 -07:00