Wayne Chen
|
d66b548fc5
|
fixing typo in script file.
|
2018-05-31 15:04:29 -07:00 |
|
Wayne Chen
|
89f7eb0b30
|
Adding fix for enabling saved front/back advanced controls.
|
2018-05-25 09:21:01 -07:00 |
|
John Conklin II
|
3e665fb616
|
Merge pull request #13179 from dback2/cloneables
Server-Managed Cloneables + Cloneable Properties
|
2018-05-23 12:40:27 -07:00 |
|
Liv Erickson
|
604b3cac1c
|
check for null entities in grab, add conversion for old userdata cloneable
|
2018-05-21 16:19:43 -07:00 |
|
Dante Ruiz
|
249d22b4b4
|
Merge branch 'master' of github.com:highfidelity/hifi into menu-updates
|
2018-05-21 10:31:24 -07:00 |
|
David Rowe
|
801a4b9aba
|
Make laser click in sky deselect entity
|
2018-05-17 15:09:23 +12:00 |
|
David Back
|
06fa4efe05
|
add comment
|
2018-05-16 11:39:53 -07:00 |
|
David Back
|
6c946d7ac5
|
prevent continuous clone calls
|
2018-05-16 11:36:57 -07:00 |
|
Dante Ruiz
|
37c51a7246
|
Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates
|
2018-05-16 10:41:40 -07:00 |
|
Dante Ruiz
|
e676348c4f
|
fixing some menu reog bugs
|
2018-05-16 10:40:28 -07:00 |
|
David Back
|
f8fc7bedd7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables
|
2018-05-15 17:31:43 -07:00 |
|
David Back
|
f74e219029
|
rename properties, add clone avatar entity, remove worldEntityProps arg, fix clone ID cleanup on delete
|
2018-05-15 17:24:14 -07:00 |
|
vladest
|
7ea6181520
|
Merge branch 'master' into menu-updates
|
2018-05-15 21:54:45 +02:00 |
|
Seth Alves
|
6da59d15e5
|
Merge pull request #13167 from dback2/lowercaseUnequip
Desktop equip: fix unequipping with capital U
|
2018-05-15 10:55:19 -07:00 |
|
David Back
|
ac78e14585
|
fix unequipping with capital U
|
2018-05-14 11:44:25 -07:00 |
|
Seth Alves
|
898dec29cb
|
don't cache value of getControllerJointIndex at startup, because the script may run before the data is available. Instead, refresh the data every few seconds
|
2018-05-11 17:07:51 -07:00 |
|
vladest
|
62aa2df836
|
Merge branch 'master' into menu-updates
|
2018-05-10 10:36:38 +02:00 |
|
Dante Ruiz
|
a593209ec1
|
remove highlight when point to the sky
|
2018-05-07 15:33:12 -07:00 |
|
Dante Ruiz
|
607de3dfb4
|
Merge branch 'RC67' of github.com:highfidelity/hifi into RC67
|
2018-05-04 14:20:57 -07:00 |
|
Dante Ruiz
|
6414fcaae5
|
fix-another-highlighting-issue
|
2018-05-04 14:20:17 -07:00 |
|
Dante Ruiz
|
a57c72df6e
|
fix entity highlighting during edit mode
|
2018-05-04 08:53:49 -07:00 |
|
Dante Ruiz
|
cffb008c31
|
fixing edge case
|
2018-05-03 13:07:32 -07:00 |
|
Dante Ruiz
|
4793cddde6
|
fix highlighting issues
|
2018-05-03 11:27:07 -07:00 |
|
vladest
|
617b49fe14
|
Added mouse sensivity UI. Reworked advanced movements. TODO: properties interface complitely broken in Tablet mode
|
2018-05-01 21:22:48 +02:00 |
|
David Back
|
61afd12eeb
|
change to not left button
|
2018-04-27 16:06:27 -07:00 |
|
David Back
|
0962e1fc16
|
ignore right clicks
|
2018-04-27 16:06:14 -07:00 |
|
David Back
|
8d49d1c118
|
change to not left button
|
2018-04-27 13:32:05 -07:00 |
|
David Back
|
78436ebcbf
|
ignore right clicks
|
2018-04-27 11:30:45 -07:00 |
|
David Back
|
71dc75b208
|
fix disconnect clear entities
|
2018-04-24 14:25:33 -07:00 |
|
David Back
|
e21c451815
|
ensure deleted or cleared entities properly unequipped
|
2018-04-23 16:56:18 -07:00 |
|
David Back
|
8950c31378
|
fix mouse equipping while someone else far grabbing
|
2018-04-19 16:29:49 -07:00 |
|
David Back
|
8cbe0f4633
|
safer clear grab actions
|
2018-04-19 11:17:26 -07:00 |
|
David Back
|
d1bb11562b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip
|
2018-04-19 09:36:19 -07:00 |
|
David Back
|
bf21a4cf56
|
tabs
|
2018-04-18 15:05:29 -07:00 |
|
David Back
|
4a37c4ba18
|
add entityIsEquipped utils for grab.js check
|
2018-04-18 15:00:10 -07:00 |
|
Dante Ruiz
|
cf22f61361
|
adding cleanup of selection
|
2018-04-18 13:30:14 -07:00 |
|
unknown
|
278a6b763f
|
ensure target mouse entity has equip data
|
2018-04-17 16:26:33 -07:00 |
|
unknown
|
9e4914975b
|
missing reset flag on end equip, remove mouseEquip check on unequip via U
|
2018-04-17 16:13:10 -07:00 |
|
David Back
|
e86ef1c2d6
|
fix bracket
|
2018-04-16 13:33:17 -07:00 |
|
David Back
|
ad85e2b053
|
pre PR adjustments
|
2018-04-16 13:12:33 -07:00 |
|
David Back
|
78c0ec5770
|
remove animations
|
2018-04-16 12:56:22 -07:00 |
|
Dante Ruiz
|
08ea72d71f
|
Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting
|
2018-04-13 15:39:14 -07:00 |
|
David Back
|
76c7ec69ce
|
Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip
|
2018-04-13 14:28:14 -07:00 |
|
David Back
|
243b3637c4
|
fix grab.js change
|
2018-04-12 12:41:36 -07:00 |
|
Dante Ruiz
|
43b92299d6
|
changing highlighting percentage
|
2018-04-12 10:35:29 -07:00 |
|
Dante Ruiz
|
7243160dac
|
making requested changes
|
2018-04-11 14:42:26 -07:00 |
|
Dante Ruiz
|
cdc248129c
|
fix grab.js
|
2018-04-11 14:25:06 -07:00 |
|
Dante Ruiz
|
ba9d5d18bc
|
make requested changes
|
2018-04-11 13:30:21 -07:00 |
|
David Back
|
59971869f5
|
desktop equip
|
2018-04-10 19:06:27 -07:00 |
|
Dante Ruiz
|
447163bd07
|
clean up scripts
|
2018-04-10 09:23:40 -07:00 |
|