Seth Alves
|
527b27da96
|
pseudo-joints for far-grab positions
|
2018-08-14 08:55:20 -07:00 |
|
Seth Alves
|
54fa7dd0b6
|
Merge pull request #13817 from sethalves/fix-desktop-handshake
fix desktop press-x handshake
|
2018-08-14 08:42:10 -07:00 |
|
John Conklin II
|
73ef2ff09c
|
Merge pull request #13804 from thoys/fix/create/cantMoveFocusCameraOutPastLowLimit
MS17291: Create-app increase focus distance limit
|
2018-08-13 14:58:17 -07:00 |
|
Seth Alves
|
4fa0c96046
|
fix desktop press-x handshake
|
2018-08-13 11:57:48 -07:00 |
|
Thijs Wenker
|
221dfb8979
|
typo fix
|
2018-08-11 05:46:48 +02:00 |
|
Thijs Wenker
|
a20be5b50d
|
remove rotation for newly created entities
|
2018-08-11 02:28:01 +02:00 |
|
Thijs Wenker
|
f26188d5b8
|
added comment for limit choice
|
2018-08-11 01:54:13 +02:00 |
|
Dante Ruiz
|
75cc1c62c0
|
mostly done interstitial page
|
2018-08-10 16:53:34 -07:00 |
|
Thijs Wenker
|
876079bb81
|
deactivate Create App when desktop windows are closed
|
2018-08-11 00:41:50 +02:00 |
|
Ryan Huffman
|
c0ac76bf4a
|
Merge pull request #13797 from dback2/rotationRingSize
Edit handle rotation ring size
|
2018-08-10 13:53:10 -07:00 |
|
David Back
|
1d0da4042a
|
Merge pull request #13771 from dback2/entityListCtrlReselection
Reselecting same entity in list will unselect it
|
2018-08-10 10:41:57 -07:00 |
|
Dante Ruiz
|
46297c6b22
|
interstitial page
|
2018-08-10 10:20:39 -07:00 |
|
John Conklin II
|
de0cdf6d8d
|
Merge pull request #13793 from wayne-chen/fixWebTabletJSBug
Fixing web tablet JavaScript error
|
2018-08-10 09:31:17 -07:00 |
|
Alexander Ivash
|
ce6c8c72f5
|
ensure selection of newly-added wearable always happens after pushing updated wearables list to UI
|
2018-08-10 19:09:47 +03:00 |
|
Alexander Ivash
|
90fb0d7be6
|
add possibility to add wearable from external url
|
2018-08-10 17:59:11 +03:00 |
|
Thijs Wenker
|
925cfc9b23
|
Set a max focus distance value of 14km to not lose the edit handles by far-clipping
|
2018-08-10 16:45:27 +02:00 |
|
Alexander Ivash
|
0a28361dc8
|
treat ModelEntityItem-s with relayParentJoints as wearables
|
2018-08-10 12:58:45 +03:00 |
|
John Conklin II
|
6c647c8185
|
Merge pull request #13768 from thoys/fix/create/triggerable-reset
MS17413 Triggerable value does not reset on entity deselect
|
2018-08-09 17:13:34 -07:00 |
|
Dante Ruiz
|
353121be7d
|
making some changes
|
2018-08-09 16:29:37 -07:00 |
|
Alexia Mandeville
|
38973f0840
|
Adding icon states to emote app, active state
|
2018-08-09 16:00:36 -07:00 |
|
John Conklin II
|
6447bcab5b
|
Merge pull request #13765 from dback2/serverScriptStatus
Fix server script status
|
2018-08-09 14:51:17 -07:00 |
|
John Conklin II
|
f31776516b
|
Merge pull request #13791 from dback2/editHandlesAlpha
Alpha 1 for edit handles
|
2018-08-09 14:50:43 -07:00 |
|
David Back
|
cc953ab691
|
Merge branch 'master' of https://github.com/highfidelity/hifi into rotationRingSize
|
2018-08-09 13:36:13 -07:00 |
|
David Back
|
e36e9aa68f
|
tweak rotation ring size
|
2018-08-09 13:35:55 -07:00 |
|
John Conklin II
|
6481aea2f4
|
Merge pull request #13715 from SamGondelman/parabolic
Enable parabolic teleport
|
2018-08-09 13:12:17 -07:00 |
|
Dante Ruiz
|
9a8ebdd021
|
Merge pull request #13739 from dback2/cloneChildrenFix
Fix cloning a parented entity
|
2018-08-09 13:05:28 -07:00 |
|
John Conklin II
|
f4f0c5fcad
|
Merge pull request #13767 from ctrlaltdavid/M15772
Fix entity stay highlighted after hand leaves when far grabbing another
|
2018-08-09 12:53:41 -07:00 |
|
Wayne Chen
|
2a6ff90a2c
|
fixing web tablet error
|
2018-08-09 11:30:10 -07:00 |
|
David Back
|
a6d944e034
|
use alpha 1 for edit handles
|
2018-08-09 10:32:34 -07:00 |
|
John Conklin II
|
34697b6b07
|
Merge pull request #13770 from huffman/fix/edit-duplicate-fix
Fix duplicating multiple entities causing infinite looping
|
2018-08-09 09:07:37 -07:00 |
|
Dante Ruiz
|
faa5411757
|
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
|
2018-08-09 08:42:14 -07:00 |
|
Dante Ruiz
|
0fed48bd0e
|
improving interstitial page
|
2018-08-08 18:15:27 -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 |
|
SamGondelman
|
a0c3c09b05
|
Merge remote-tracking branch 'upstream/master' into bloom
|
2018-08-08 14:44:02 -07:00 |
|
David Back
|
a04ffd969e
|
deselect when reselecting same entity, fix indents
|
2018-08-08 13:32:38 -07:00 |
|
Ryan Huffman
|
544a6504f2
|
Merge pull request #13760 from ctrlaltdavid/M16932
Render Touch controllers at physical hands's locations
|
2018-08-08 13:11:21 -07:00 |
|
David Back
|
adc2c9c6fc
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListCtrlReselection
|
2018-08-08 12:41:54 -07:00 |
|
SamGondelman
|
2959a406d7
|
working on enabling bloom
|
2018-08-07 21:52:05 -07:00 |
|
Dante Ruiz
|
a9fd034f09
|
switching to location api
|
2018-08-07 16:02:54 -07:00 |
|
David Back
|
3c5c5d8552
|
Merge pull request #13750 from dback2/editLogSpamFix
Fix edit log spam with -1 hand
|
2018-08-07 13:51:39 -07:00 |
|
David Rowe
|
a7170a5892
|
Fix typo
|
2018-08-08 08:49:29 +12:00 |
|
Dante Ruiz
|
269afb9a49
|
remove tablet material entities code remove create
|
2018-08-07 11:19:22 -07:00 |
|
Dante Ruiz
|
8c5eefcc95
|
some file and code cleanup
|
2018-08-07 10:58:45 -07:00 |
|
Dante Ruiz
|
d78c571df6
|
revert to use overlays instead of entities for tablet highlighting
|
2018-08-07 10:56:53 -07:00 |
|
Thijs Wenker
|
9c96a10f6c
|
Fix for angularVelocity zeroing out on duplication or undo
|
2018-08-07 19:35:49 +02:00 |
|
David Back
|
d88615219c
|
CR changes
|
2018-08-07 10:19:48 -07:00 |
|
David Back
|
174519e86e
|
fix reselecting same entity in list
|
2018-08-07 09:56:51 -07:00 |
|
Ryan Huffman
|
61fdce9c11
|
Fix duplicating multiple entities causing infinite looping
|
2018-08-07 09:52:14 -07:00 |
|
Thijs Wenker
|
95c32c8e45
|
fix reset triggerable checkbox
|
2018-08-07 17:23:49 +02:00 |
|
David Rowe
|
c9c23b8db3
|
Fix entity stay highlighted after hand leaves when far grabbing another
|
2018-08-07 15:34:17 +12:00 |
|
David Back
|
f9e25d36e7
|
use wrapper emitScriptEvent, change to Fetching
|
2018-08-06 17:52:27 -07:00 |
|
Dante Ruiz
|
6a4a56cee3
|
imporving the interstitial page script
|
2018-08-06 17:42:21 -07:00 |
|
David Back
|
e5abd9d57d
|
fix server script status event, use [ Getting status ]
|
2018-08-06 17:03:32 -07:00 |
|
David Back
|
112327a3c1
|
Merge pull request #13735 from dback2/entityCameraKeyFix
Use key codes for entity camera keys
|
2018-08-06 14:07:48 -07:00 |
|
David Rowe
|
83ed572a33
|
Render Touch controllers at physical hands's locations
|
2018-08-04 19:27:44 +12:00 |
|
David Back
|
0565e0400c
|
fix edit log spam with -1 hand
|
2018-08-03 11:08:56 -07:00 |
|
Dante Ruiz
|
a2717e2efa
|
editing interstitialPage.js
|
2018-08-03 10:47:20 -07:00 |
|
Dante Ruiz
|
683b42e35b
|
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
|
2018-08-03 09:59:35 -07:00 |
|
Dante Ruiz
|
b9cfbfb3be
|
adding interstitial page file to default sctipts
|
2018-08-03 09:59:21 -07:00 |
|
David Back
|
0b9e520b53
|
fix grab cloning parented entitiy
|
2018-08-01 16:00:25 -07:00 |
|
John Conklin II
|
f02e91806c
|
Merge pull request #13686 from huffman/fix/undo-create-entity
Fix added entities not being undoable in Create
|
2018-08-01 13:11:17 -07:00 |
|
David Back
|
cdbf75666f
|
new line
|
2018-08-01 12:46:49 -07:00 |
|
David Back
|
f946bb73ef
|
remove constants
|
2018-08-01 12:46:17 -07:00 |
|
David Back
|
97e45643b0
|
spacing
|
2018-08-01 12:44:40 -07:00 |
|
David Back
|
ca3151ae39
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityCameraKeyFix
|
2018-08-01 12:43:04 -07:00 |
|
David Back
|
3e9e00f1d6
|
use key codes for entity camera keys
|
2018-08-01 12:42:50 -07:00 |
|
Thijs Wenker
|
c562a6945d
|
Merge pull request #13671 from huffman/fix/create-copy-follows-user
Fix duplication not working as expected on grabbed entities
|
2018-08-01 19:25:33 +02:00 |
|
SamGondelman
|
e11030bbc3
|
mukul's changes, enable parabolic teleport
|
2018-08-01 09:46:17 -07:00 |
|
Ryan Huffman
|
6369cee0d1
|
Fix added entities not being undoable in Create
|
2018-08-01 09:40:29 -07:00 |
|
David Back
|
e8068fea0a
|
block selecting overlays with other hand
|
2018-07-31 17:18:35 -07:00 |
|
Ryan Huffman
|
bbdc7ba380
|
Fix Uuid null comparison and dangling comma in Create tool
|
2018-07-31 13:57:27 -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
|
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 |
|
David Back
|
03f0116b79
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues
|
2018-07-31 09:28:14 -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
|
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 |
|
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 |
|
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
|
1ef54b2fe6
|
back to ray teleport
|
2018-07-27 14:58:56 -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 |
|
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 |
|
Ryan Huffman
|
103f9e04fa
|
Fix duplication not working as expected on grabbed entities
|
2018-07-27 13:32:12 -07:00 |
|
Dante Ruiz
|
30b4815bf9
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem
|
2018-07-27 13:13:10 -07:00 |
|
David Rowe
|
3bfdd3ff58
|
Maintain virtual and real world orientations when teleport
|
2018-07-27 15:18:40 +12:00 |
|
David Back
|
cd842afc1c
|
prevent both hands triggering same time, allow one to trigger after other
|
2018-07-26 17:52:25 -07:00 |
|
David Back
|
dcdf734114
|
remove unneeded
|
2018-07-26 16:43:07 -07:00 |
|
David Back
|
82e5d6ad29
|
use triggerClicks from controllers for edit handles
|
2018-07-26 16:38:25 -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 |
|
Dante Ruiz
|
74bb2301b0
|
minimize diff
|
2018-07-26 16:05:56 -07:00 |
|