Nissim
935180bf09
Fixed my bloody stupid mistake...
2017-10-17 15:02:05 -07:00
Nissim
a641d6de66
Variable rename.
2017-10-17 09:18:29 -07:00
Nissim
1b42572f99
Merge branch 'hazeZone' of https://github.com/NissimHadar/hifi into hazeZone
...
# Conflicts:
# scripts/system/html/js/entityProperties.js
2017-10-16 14:29:56 -07:00
Nissim
fd2b0da76d
First version.
2017-10-16 12:20:31 -07:00
Nissim Hadar
9c9dfc7211
Replace light blend with glare.
2017-10-13 13:36:46 -07:00
Nissim Hadar
c76229934c
Changed blend-in colour and blend-out colour to colour and glare colour
2017-10-13 12:21:00 -07:00
Nissim Hadar
dc45c7af75
Implemented radio-buttons.
2017-10-12 11:18:18 -07:00
Nissim Hadar
a21995db24
Added checkbox for altitude effect.
2017-10-11 22:10:58 -07:00
Nissim Hadar
96fd3123e8
Changed haze altitude to ceiling.
2017-10-11 20:36:24 -07:00
Nissim Hadar
7d5a887f43
Refactoring.
2017-10-09 17:25:19 -07:00
Nissim Hadar
bfdd489682
Fixed color selector bug.
2017-10-06 13:18:12 -07:00
Nissim Hadar
320c888ce4
Added checkbox to allow separate control of keylight attenuation.
2017-10-05 20:31:45 -07:00
Nissim Hadar
f261477aa2
Adding sun attenuation.
2017-10-05 17:55:24 -07:00
Nissim Hadar
e15699192d
Added blend angle and altitude reference base.
2017-10-05 14:18:03 -07:00
Nissim Hadar
2e2364e03f
WIP - adding haze blend out colour
2017-10-05 13:20:21 -07:00
Nissim Hadar
cbaae2c79b
WIP - haze colour.
2017-10-05 12:59:56 -07:00
Nissim Hadar
395d9cbd6b
WIP - haze colour.
2017-10-05 12:13:37 -07:00
Nissim Hadar
512b469dc6
Added haze colour selector.
2017-10-05 11:31:49 -07:00
Nissim Hadar
595530161a
WIP - adding background blend.
...
Haze altitude works.
2017-10-05 09:28:55 -07:00
Nissim Hadar
4d8a1db895
Merge branch 'master' into hazeZone
...
# Conflicts:
# libraries/entities-renderer/src/RenderableModelEntityItem.cpp
2017-09-27 17:50:51 -07:00
Seth Alves
ce3e5eb1a3
set grabbable and other checkboxes correctly if userData is blank or malformed. near-trigger blocks near-grab
2017-09-26 18:56:27 -07:00
Nissim Hadar
27af4685e7
Added range and altitude to UI.
2017-09-25 09:32:52 -07:00
Nissim Hadar
6cbf087708
First version with combo for Haze Mode.
2017-09-24 15:08:22 -07:00
Nissim Hadar
5e1d470553
WIP
2017-09-22 09:48:22 -07:00
Thijs Wenker
af4bc59307
clone local avatar entities
2017-09-14 23:31:51 +02:00
Menithal
dc5e374485
Merge remote-tracking branch 'upstream/master' into 21484
2017-08-17 22:28:43 +03:00
Andrew Meadows
71ba6ba10a
Merge pull request #10807 from jmo7/21356
...
21356 - Reorder Edit.js
2017-08-08 15:15:37 -07:00
Menithal
982d4a451f
Updated Protocol to add allowTranslation
...
There still is a bug for the value no actually updating
2017-08-08 23:47:37 +03:00
Seth Alves
184c3d855d
Merge pull request #11061 from TurnMeUp-OG/21470
...
Fix tablet focus issue when property menu is open and field is selected
2017-08-01 15:10:26 -07:00
jmo
003c483ec6
stray tabs changed to spaces, and long comment split to multiple lines
2017-07-27 15:21:58 -06:00
scromie@turnmeupgames.com
33ff5917be
fix
2017-07-26 19:34:20 +03:00
milad
1ce1204a64
WORKLIST ISSUE # 21471 : FIX PARENT JOINT IN EDIT JS
...
In entityPropeties.js
line #1079 says:
elParentJointIndex.addEventListener('change', createEmitNumberPropertyUpdateFunction('parentJointIndex'));
The problem should be fixed by changing it to:
elParentJointIndex.addEventListener('change', createEmitNumberPropertyUpdateFunction('parentJointIndex', 0));
createEmitNumberPropertyUpdateFunction() is parsing the value as a
float to a default decimal position of 4. Looks like it only accepts
integers. By adding in that 0 as a second argument, it should coerce the
value to one that will be recognized by the UI/backend.
2017-07-24 10:06:44 -05:00
jmo
a2b1b2e0f9
21356 - Reorder Edit.js
...
Made changes to the 3 sub files for the properties tabs. Although
visually the exiting menu looked like it was in different sections,
structurally it was all just one run of item after item, with a fair
amount of div-itis. I added in fieldsets to provide true groups and
replaced much of the div-ities with aditional feidlsets as they are the
smeantic element to use here.
2017-07-10 15:49:26 -06:00
David Rowe
58c4a2f12a
Fix icon for polylines in entities editor properties page
2017-06-03 06:26:13 +12:00
Thijs Wenker
5c5aaf3254
Fix hidden dynamic property whenever the item is clone-able / DRYing propertyUpdates
2017-05-31 20:18:42 +02:00
hiflex
a4406906f3
Fix the Face Camera checkbox on the text entity properties tab.
...
The checkbox appeared unchecked even if the underlying property was true.
2017-05-11 20:12:10 -05:00
Seth Alves
d792559d9a
have edit.js resend properties of selected entity to entityProperties.js once it's ready
2017-03-10 09:59:23 -08:00
Seth Alves
66d44ac6f0
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-08 09:26:51 -08:00
Menithal
d85cb645b0
Changed limit logic, default limit is now 0
...
Clones now have a named based on the original entity id
Limit is now calculated from the source instance, instead of just clone
name to avoid a single box being calculated as something else
Default limit is now 0, which disables limit
2017-03-04 11:42:43 +02:00
Seth Alves
3b581a8dfe
merge from upstream
2017-03-02 16:35:44 -08:00
Seth Alves
155a310852
Merge pull request #9761 from Menithal/21166
...
WL#21166 Cloneable Equipment
2017-03-02 16:33:13 -08:00
Menithal
9c31f66b75
Addressed CR of 9684
2017-03-02 21:39:56 +02:00
Menithal
231ebef117
Removed stray debugPrint
2017-03-02 01:01:57 +02:00
Menithal
f538ac24f3
Various Properties
2017-03-01 22:07:02 +02:00
Menithal
1d8be2aeaa
Added missing dynamic
2017-02-26 19:17:46 +02:00
Menithal
10151c3f5b
Added Multi-userdata field updater
2017-02-24 08:04:03 +02:00
Menithal
4d98cc436b
Finished up Edit.js
2017-02-23 23:20:21 +02:00
Menithal
e95e50ad6e
Preliminary work on edit.js to allow for new param
2017-02-23 10:34:04 +02:00
Menithal
9b8503eba5
Initial Grab Clone
2017-02-19 18:18:38 +02:00
Menithal
dcbe3c622d
Added Hotkey Listening to the webview
...
Ctrl + P and Ctrl + Shift + P are now available even if the edit window
has been selected
2017-02-18 11:51:19 +02:00