Commit graph

125 commits

Author SHA1 Message Date
Nissim Hadar
3ec8faa1b9 Added checkbox for altitude effect of haze. 2017-10-11 20:47:39 -07:00
Nissim Hadar
96fd3123e8 Changed haze altitude to ceiling. 2017-10-11 20:36:24 -07:00
Nissim Hadar
2f4ddd84f8 Renamed haze colours and moved checkbox for glare. 2017-10-11 19:32:09 -07:00
Nissim Hadar
748f97364b Moved Bakground Blend to end of Haze fields. 2017-10-11 19:20:46 -07:00
Nissim Hadar
832f9fb6e3 Renamed HAZE_MODE_RANGE_ONLY to HAZE_MODE_ENABLED. 2017-10-11 19:10:51 -07:00
Nissim Hadar
ea6b9ed28e Removed ...ALTITUDE_MODE from combo. 2017-10-11 18:58:59 -07:00
Nissim Hadar
1a932fbaf0 Corrected error in html. 2017-10-09 19:10:30 -07:00
Nissim Hadar
7d5a887f43 Refactoring. 2017-10-09 17:25:19 -07:00
Nissim Hadar
320c888ce4 Added checkbox to allow separate control of keylight attenuation. 2017-10-05 20:31:45 -07:00
Nissim Hadar
3afab3c1d3 Keylight attenuation implemented. 2017-10-05 18:25:02 -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
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
b7af6a58a6 WIP - adding background blend 2017-10-05 09:16:14 -07:00
Nissim Hadar
8b72e3044a WIP - implementing range+altitude mode. 2017-10-04 22:26:53 -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
e47dfeaeab Merge remote-tracking branch 'upstream/stable' into 21484 2017-08-24 21:37:20 +03:00
vladest
b7a048c6ea Adopt clonable settings to new styling 2017-08-22 11:23:55 -07:00
Menithal
dc5e374485 Merge remote-tracking branch 'upstream/master' into 21484 2017-08-17 22:28:43 +03: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
VRCat\VRKitten
e4e4ead4af 'Untabified' files 2017-08-02 16:56:02 -06: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
Liv
27d4edd2d0 Add circle and cone to entity shape list 2017-05-31 16:25:11 -07:00
Liv
d3e900e42f Adding first pass on cone shape 2017-05-25 12:54:49 -07:00
Liv
417d9ec80b Surface cylinder option for primitive shape to html 2017-05-25 11:04:25 -07:00
Seth Alves
3b581a8dfe merge from upstream 2017-03-02 16:35:44 -08: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
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
Seth Alves
12b8a77488 in edit.js, convert entity property ID to be a text-field so the data can be copied 2017-02-15 16:29:50 -08:00
David Kelly
5184cbe615 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2 2017-02-15 12:08:55 -07:00
humbletim
831bf93500 * refactor ScriptCache per FIXMEs
* include error details in BatchLoader results
* update EntityServerScript properties in edtior to reflect more granular statuses
* ScriptEngine plumbing in prep for require/module integration
2017-02-11 04:47:31 -05:00
David Kelly
61e558e568 Entity Edit Filters for zones
Part 1 - just put them in the zones entities.  Next I'll hook them
up and actually filter...
2017-02-08 09:53:25 -07:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
Ryan Huffman
d108fabd0b Update the name of the collision shapes used in edit.js properties
Update the names to be consistent with what is shown on the add model
dialog.
2017-01-23 13:56:48 -08:00
Ryan Huffman
c015ac1bd5 Add display of server script status to edit.js 2017-01-19 13:27:44 -08:00
Ryan Huffman
71e039951c Add reload server scripts button to edit.js 2017-01-17 14:47:57 -08:00
Ryan Huffman
142c7da523 Add serverScripts property support to edit.js 2017-01-17 14:47:06 -08:00
David Rowe
c6558ebebd Reinstate "reload" button for entity scripts in entities editor 2016-10-21 11:14:57 +13:00
David Rowe
a94d77ee12 Raise and lower keyboard in entities editor 2016-09-28 17:57:53 +13:00
Anthony J. Thibault
c2af948e25 Merge branch 'master' into feature/handheld-marketplace 2016-08-24 16:07:04 -07:00
James B. Pollack
5305ec7feb html beautify 2016-08-24 14:51:15 -07:00
James B. Pollack
477ed88284 remove autosave, disable save button until change 2016-08-23 14:34:28 -07:00
Anthony J. Thibault
d607abc8f7 Add dpi to edit.js
Also, cap the maximum webEntity texture size to 4096
2016-08-23 10:10:27 -07:00
James B. Pollack
d9a39553bd style edits and saved message 2016-08-23 00:14:53 -07:00
James B. Pollack
d0a25e7783 fix switching entities 2016-08-22 23:51:35 -07:00
James B. Pollack
4b61cc9f5f new user data editor 2016-08-22 17:30:08 -07:00
Zach Pomerantz
6965fb0520 refactor system html to split js/css 2016-08-09 15:23:31 -07:00
James B. Pollack
bde46adee8 update description 2016-08-08 11:31:43 -07:00
James B. Pollack
f8c1d8f123 change property order and cleanup 2016-08-08 11:01:03 -07:00
Brad Davis
03cb6175ab Support triangle and hexagon shapes, add shape support to overlays. 2016-07-15 22:02:17 -07:00
Andrew Meadows
76cb80112e support new shape types in edit.js 2016-07-06 10:51:43 -07:00
Andrew Meadows
f41fb30ace add "Static Mesh" option to edit.js 2016-06-20 17:29:20 -07:00
Brad Hefta-Gaub
852eda3101 Merge pull request #8066 from imgntn/faceCameraText
Add face camera option to edit.js text entity properties
2016-06-17 14:14:06 -07:00
James B. Pollack
96d6cb12ac supress some messages and errors 2016-06-16 12:27:03 -07:00
James B. Pollack
3b2e0842b0 add face camera to text properties 2016-06-13 23:27:08 -07:00
James B. Pollack
188590a891 cleanup 2016-06-13 13:08:22 -07:00
James B. Pollack
567118f4a9 cleanup 2016-06-13 13:08:12 -07:00
James B. Pollack
342fc07d29 select active element in edit.js after change 2016-06-13 13:06:56 -07:00
Brad Hefta-Gaub
0ec7eae58c fix shapes to property polymorph and persist 2016-05-27 16:59:42 -07:00
Brad Hefta-Gaub
b8b39b962d Merge pull request #7868 from jherico/entity_shape
Add a generic shape primitive
2016-05-24 08:40:58 -07:00
David Rowe
3391430f0a Tidy zone flying and ghosting entities editor options
Move options to top of section from under "skybox" subsection
Fix capitalization of labels
2016-05-24 20:28:49 +12:00
Brad Davis
2c703e963c More shapes 2016-05-22 19:48:59 -07:00
Brad Davis
cd1e910844 Add a generic shape primitive 2016-05-21 23:46:44 -07:00
Brad Hefta-Gaub
18613908df Merge pull request #7800 from sethalves/no-fly-zones
No fly zones
2016-05-20 16:59:55 -07:00
Atlante45
0353e562e4 entityProperties.html handles non object userData 2016-05-20 10:18:32 -07:00
Seth Alves
0fe4e42511 added zone properties to allow flying/ghosting or not 2016-05-01 13:53:44 -07:00
James B. Pollack
06171f6063 move default to system 2016-04-26 14:47:02 -07:00
Renamed from scripts/default/html/entityProperties.html (Browse further)