Commit graph

68283 commits

Author SHA1 Message Date
Stephen Birarda
e82edb8b66 add domain packet dissector, improve entity dissector 2018-06-08 11:58:09 -07:00
Seth Alves
b70ffa5bae
Merge pull request #13297 from ctrlaltdavid/21835
Remove some deprecated functions from the Controller API
2018-06-06 14:06:34 -07:00
Sam Gondelman
b4afabee68
Merge pull request #13294 from SamGondelman/overlays
Add isGroupCulled property to ModelOverlays
2018-06-06 13:52:33 -07:00
Sam Gateau
a1899e80c0
Merge pull request #13290 from AndrewMeadows/update-queryAACube
update server-side bounding box more correctly for grabbed things
2018-06-06 11:46:09 -07:00
Sam Gateau
c145c0c1b8
Merge pull request #13186 from SamGondelman/etc2comp
Android: Local texture compression using Etc2Comp
2018-06-06 11:13:50 -07:00
Seth Alves
6c8e514367
Merge pull request #13224 from danteruiz/fix-key-conflicts
Allow using the key 1,2,3 to swicth views and also to enter text in web entity or overlay
2018-06-06 11:08:04 -07:00
MiladNazeri
082c1fce52
Merge pull request #13251 from ctrlaltdavid/21880
JSDoc updates
2018-06-05 19:04:54 -07:00
John Conklin II
07927767c9
Merge pull request #13302 from zfox23/MS15500_missingUserNamePAL
Fix MS15500: Ensure Connection usernames show up in PAL
2018-06-05 15:04:46 -07:00
Zach Fox
2932ce177d Fix MS15500: Ensure Connection usernames show up in PAL 2018-06-05 10:57:25 -07:00
SamGondelman
968758a022 CR 2018-06-05 09:35:17 -07:00
Ken Cooke
aa19794a94
Merge pull request #13243 from danteruiz/fix-copy-paste-cut-delete
fix copy delete cut paste commands and menus
2018-06-05 09:17:34 -07:00
Ken Cooke
83dda420ba
Merge pull request #13256 from danteruiz/remove-dead-code
remove dead code in Application::keyPressEvent
2018-06-05 09:16:28 -07:00
David Rowe
a7a0cfeef2 Remove some deprecated functions from the Controller API 2018-06-05 10:56:19 +12:00
Sam Gondelman
38e7b31c32
Merge pull request #13176 from SimonWalton-HiFi/low-connectivity
Try reducing concurrent downloads
2018-06-04 14:48:46 -07:00
David Rowe
b5028a9626 Merge branch 'master' into 21880
# Conflicts:
# interface./src/scripting/WindowScriptingInterface.h
2018-06-05 09:13:54 +12:00
SamGondelman
bde3382657 merge with master 2018-06-04 12:55:17 -07:00
SamGondelman
8af1beca8d add isGroupCulled for model overlays 2018-06-04 12:07:57 -07:00
John Conklin II
08fcad1932
Merge pull request #13227 from SamGondelman/entityMirror
Add local-only isVisibleInSecondaryCamera flag to entities
2018-06-04 11:06:00 -07:00
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
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
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
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
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