David Back
|
1b031ff065
|
Merge pull request #13703 from dback2/editHandleTriggerValues
Edit handles trigger fixes
|
2018-08-01 10:00:16 -07:00 |
|
David Back
|
e8068fea0a
|
block selecting overlays with other hand
|
2018-07-31 17:18:35 -07:00 |
|
David Back
|
ad9ec26781
|
print
|
2018-07-31 11:53:17 -07:00 |
|
David Back
|
7bf7663f09
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues
|
2018-07-31 11:51:26 -07:00 |
|
David Back
|
4a722a62f7
|
use click handler only, remove triggerClicked
|
2018-07-31 11:51:16 -07:00 |
|
Ryan Huffman
|
431cbf2694
|
Merge pull request #13699 from thoys/fix/create/triggerable
MS16809: handle both triggerable and wantsTrigger in CreateApp
|
2018-07-31 10:34:31 -07:00 |
|
John Conklin II
|
09d1964f1d
|
Merge pull request #13670 from ElderOrb/animate_get_more_avatars
Avatarapp: hover animation for 'get more avatars' button
|
2018-07-31 09:51:58 -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 |
|
David Back
|
93335feba1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues
|
2018-07-31 09:46:57 -07:00 |
|
John Conklin II
|
8e277758ad
|
Merge pull request #13700 from danteruiz/fix-grabbing-problem
Impove the way we checkForChildTooFarAway in nearParentGrabEntity.js
|
2018-07-31 09:46:57 -07:00 |
|
Seth Alves
|
4ff9252b47
|
Merge pull request #13718 from jherico/fix/fb15963
Support rendering of 'about' URLs in web entities
|
2018-07-31 09:44:31 -07:00 |
|
John Conklin II
|
221dd3ee88
|
Merge pull request #13673 from ElderOrb/avatarapp-update-messageboxes
FB16992 - Layout changes to the two lightboxes in the Avatar app
|
2018-07-31 09:36:16 -07:00 |
|
David Back
|
03f0116b79
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues
|
2018-07-31 09:28:14 -07:00 |
|
Seth Alves
|
1b47d3f274
|
Merge pull request #13717 from highfidelity/revert-13577-invisibleWebEntities
Revert "Allow empty web entities to be rendered"
|
2018-07-30 15:24:17 -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 |
|
John Conklin II
|
6d7116fad7
|
Merge pull request #13676 from thoys/fix/api/agent
MS15184: Remove deprecated functions in Agent API
|
2018-07-30 14:48:10 -07:00 |
|
John Conklin II
|
200292c18e
|
Merge pull request #13675 from howard-stearns/forget-you
pal refresh fixes
|
2018-07-30 14:38:24 -07:00 |
|
David Back
|
b420ef8cf2
|
fix trigger clicks on vive
|
2018-07-30 13:21:09 -07:00 |
|
David Back
|
bec54cc182
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues
|
2018-07-30 12:26:48 -07:00 |
|
Brad Davis
|
c991053c93
|
Support rendering of 'about' URLs in web entities
|
2018-07-30 11:56:31 -07:00 |
|
Seth Alves
|
a6aaa71d02
|
Revert "Allow empty web entities to be rendered"
|
2018-07-30 11:54:52 -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 |
|
Thijs Wenker
|
d486a0721d
|
Merge pull request #13698 from dback2/resetPropertiesNoSelection
Reset entity property fields when no selection
|
2018-07-30 19:37:12 +02:00 |
|
Dante Ruiz
|
0f46001f9a
|
remove redundent variable
|
2018-07-30 10:29:53 -07:00 |
|
Dante Ruiz
|
4caf613269
|
making requested changes
|
2018-07-30 10:19:27 -07:00 |
|
David Back
|
398c530214
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues
|
2018-07-30 10:18:19 -07:00 |
|
Seth Alves
|
32ec984f82
|
Merge pull request #13577 from dback2/invisibleWebEntities
Allow empty web entities to be rendered
|
2018-07-30 10:12:32 -07:00 |
|
Thijs Wenker
|
92efc1a3b5
|
style and memory leak fixes
|
2018-07-30 18:51:19 +02:00 |
|
Dante Ruiz
|
cf6850de48
|
better stuff
|
2018-07-27 17:53:21 -07:00 |
|
Dante Ruiz
|
887a416656
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem
|
2018-07-27 17:50:12 -07:00 |
|
Dante Ruiz
|
6320401308
|
somewhat better distance from bounding box
|
2018-07-27 17:49:49 -07:00 |
|
SamGondelman
|
3d4639bfdd
|
CR
|
2018-07-27 16:36:22 -07:00 |
|
Howard Stearns
|
e8e04673a4
|
Merge pull request #13683 from zfox23/MS17039_dontDeleteDDV
Implement MS17039: Don't delete entities during DDV when Metaverse API call returns error
|
2018-07-27 15:05:05 -07:00 |
|
SamGondelman
|
1ef54b2fe6
|
back to ray teleport
|
2018-07-27 14:58:56 -07:00 |
|
John Conklin II
|
9c37e30fe6
|
Merge pull request #13678 from ElderOrb/FB17023
FB17023 - Make visible avatar url in the avatar app
|
2018-07-27 14:57:25 -07:00 |
|
John Conklin II
|
fc88165e23
|
Merge pull request #13696 from SamGondelman/particleRot
Particles don't spin with head roll, new spin + rotateWithEntity properties
|
2018-07-27 14:54:48 -07:00 |
|
John Conklin II
|
df917688b6
|
Merge pull request #13707 from AndrewMeadows/fix-ccd
more correct continuous collision detection for thin objects
|
2018-07-27 14:32:41 -07:00 |
|
Thijs Wenker
|
9dce1b64b6
|
Merge pull request #13695 from huffman/fix/create-focus-on-create
Fix edit.js not being able to delete after creating entity
|
2018-07-27 22:43:34 +02:00 |
|
Dante Ruiz
|
30b4815bf9
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem
|
2018-07-27 13:13:10 -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
|
a1f9d87437
|
Merge pull request #13705 from ctrlaltdavid/M17068
Maintain virtual and real world orientations when teleport
|
2018-07-27 12:44:22 -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 |
|
Seth Alves
|
91d509f5a4
|
fix a crash when grabbing a non-dynamic entity with an overlay child
|
2018-07-27 10:35:26 -07:00 |
|
Sam Gateau
|
a95ddb0492
|
Merge pull request #13616 from AndrewMeadows/remove-cruft-001
remove cruft for rendering collision shapes
|
2018-07-27 19:19:44 +02:00 |
|
Seth Alves
|
41af82a7f6
|
Merge pull request #13702 from r3tk0n/17016-flying-settings
17016 flying settings
|
2018-07-27 10:07:13 -07:00 |
|
David Back
|
1d8b7bea65
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues
|
2018-07-27 09:23:26 -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 |
|
Andrew Meadows
|
cf04a91a83
|
use smaller CCD spheres for thin objects
|
2018-07-27 09:02:19 -07:00 |
|