Commit graph

68330 commits

Author SHA1 Message Date
John Conklin II
c981925c4d
Merge pull request #13287 from gcalero/workaround_buffer_corruption
Workaround for android buffer corruption issue
2018-06-04 09:51:06 -07:00
Zach Fox
64cccc55d4
Merge pull request #13288 from zfox23/MS15529_secondaryCamNotifications
MS15529: Add secondary camera snapshot notification flag
2018-06-04 08:04:26 -07:00
Andrew Meadows
db3520b332 also update queryAACube for 'Held' things 2018-06-01 16:38:57 -07:00
Andrew Meadows
9ae19714b5 also update queryAACube for children of worn entities 2018-06-01 16:38:57 -07:00
Zach Fox
7f344c33a7 Docs update 2018-06-01 13:51:18 -07:00
Zach Fox
96858c9586 MS15529: Add secondary camera snapshot notification flag 2018-06-01 13:38:41 -07:00
Gabriel Calero
85c6202e80 Workaround for android < Oreo 2018-06-01 17:11:14 -03:00
Gabriel Calero
459991988c Fix NullPointerException introduced with the workaround 2018-06-01 15:48:57 -03:00
John Conklin II
ed8d12593d
Merge pull request #12789 from sethalves/fix-collisionless-property
make legacy ignoreForCollision property work right
2018-06-01 11:46:18 -07:00
Gabriel Calero
b2fe5a6d63 Workaround for android buffer corruption issue 2018-06-01 15:00:00 -03:00
Seth Alves
708cbbc984
Merge pull request #13258 from wayne-chen/toggleAdvancedMovementFile-case-15453
JavaScript exception in toggleAdvancedMovementForHandControllers.js
2018-06-01 10:48:24 -07:00
Seth Alves
97b3fdfe68 make legacy collisionless property work right 2018-06-01 09:34:34 -07:00
John Conklin II
194c33bf19
Merge pull request #13254 from danteruiz/add-back-reload-scripts
adding back reload scripts shortcut and clean up AboutUtil
2018-06-01 09:31:13 -07:00
Brad Hefta-Gaub
81d873a273
Merge pull request #13285 from hyperlogic/bug-fix/make-rotation-constraint-tests-pass
Make RotationConstraintTests pass
2018-05-31 21:37:36 -07:00
SamGondelman
86ee5c12d8 merge and update based on sam's changes 2018-05-31 17:53:36 -07:00
Anthony J. Thibault
ddce4750ee Make RotationConstraintTests pass
A previous bug fix made ElbowConstraint::apply() always return true.
Because it as always modifying the rotation via swingTwistDecomposition().
The tests now no longer check for a false value.
2018-05-31 17:14:16 -07:00
Thijs Wenker
3779a4780e Prevent the cursor from being stuck on the most outer edges of the screen 2018-06-01 02:07:02 +02:00
Thijs Wenker
a06c9eccca - fix create-app camera orbit to not jump around on secondary monitor
- style fixes entityCameraTool.js
2018-06-01 00:16:42 +02:00
Wayne Chen
9f20d52d01 adding alternate solution. 2018-05-31 15:05:33 -07:00
Wayne Chen
d66b548fc5 fixing typo in script file. 2018-05-31 15:04:29 -07:00
Sam Gateau
f372e25a9f
Merge pull request #13247 from NissimHadar/DailyTests
Daily tests
2018-05-31 14:50:32 -07:00
David Rowe
3c5a779a98 Don't modify function parameter 2018-06-01 09:36:28 +12:00
John Conklin II
611159f65f
Merge pull request #13188 from SimonWalton-HiFi/placename-crash
Initialize Qt's use of openssl lib before calling RSA code
2018-05-31 14:34:24 -07:00
John Conklin II
ec3f9549f1
Merge pull request #13172 from wayne-chen/getChildrenIDs-issue-1934
Fix EntityScriptingInterface::getChildrenIDs function
2018-05-31 14:27:25 -07:00
Sam Gateau
46d055a488
Merge pull request #12649 from samcake/punk
Fix addressing the avatar mesh visibility switch bug
2018-05-31 14:16:04 -07:00
samcake
386c0f9ab2 Re review adjustments 2018-05-31 12:16:57 -07:00
John Conklin II
9d5d4c52c0
Merge pull request #13262 from danteruiz/add-back-notifactions
adding back notifcations to default scripts
2018-05-31 11:51:46 -07:00
luiscuenca
60758dec8d Check for null pointer 2018-05-31 11:32:45 -07:00
John Conklin II
4175825093
Merge pull request #13215 from AndrewMeadows/activate-on-action-removal
activate RigidBody when removing physics Action
2018-05-31 11:20:03 -07:00
Dante Ruiz
caa7f64865 fixing show overlays menu item 2018-05-31 10:58:04 -07:00
Zach Fox
259803f856 MS14615: Prevent memory overuse when minimized 2018-05-31 10:30:25 -07:00
Cristian Luis Duarte
688fad1776 Android - Fix joystick and view control bug that makes it bounce 2018-05-31 14:11:28 -03:00
Sam Gateau
513acc529e INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine 2018-05-30 23:31:54 -07:00
Sam Gondelman
ae3b933a80 Merge branch 'master' into etc2comp 2018-05-30 17:17:03 -07:00
NissimHadar
bea21e3a68 WIP. 2018-05-30 17:06:49 -07:00
NissimHadar
6717a16098 WIP. 2018-05-30 17:04:19 -07:00
NissimHadar
51b1188bdb WIP. 2018-05-30 17:01:47 -07:00
NissimHadar
df668e44ca WIP. 2018-05-30 16:59:53 -07:00
NissimHadar
c1bc3bd154 WIP. 2018-05-30 16:58:35 -07:00
NissimHadar
d01d774f76 WIP. 2018-05-30 16:51:17 -07:00
NissimHadar
06c167cc68 Add error to failure name. 2018-05-30 16:49:36 -07:00
NissimHadar
78f04f84c5 Merge branch 'master' of github.com:highfidelity/hifi into DailyTests 2018-05-30 16:45:53 -07:00
NissimHadar
c8a04911f4 Interface respects Show Overlay menu checkbox on start up. 2018-05-30 16:45:29 -07:00
Wayne Chen
34120da63f re-adding toggleSpaceMode 2018-05-30 16:06:34 -07:00
samcake
37c1f4fc06 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-30 16:05:46 -07:00
Wayne Chen
be7d06b644 Merge branch 'master' of https://github.com/highfidelity/hifi 2018-05-30 16:02:33 -07:00
John Conklin II
6095a3b319
Merge pull request #13082 from jherico/feature/shader_cache
Shader load time performance optimiziations
2018-05-30 13:55:34 -07:00
Simon Walton
a3324c5616 Remove empty destructor 2018-05-30 13:52:26 -07:00
Simon Walton
8fb5d1b92d Make RSA key-pair class a Runnable that's owned by a threadpool 2018-05-30 13:41:08 -07:00
samcake
457b77ca09 fixing static definition maybe 2018-05-30 13:37:32 -07:00