Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-19 01:01:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61323 commits 72 branches 59 tags 1.2 GiB
Commit graph

85 commits

Author SHA1 Message Date
Nissim Hadar
f3147fc24f Merge branch 'master' into hazeZone 2017-10-30 21:41:23 -07:00
Nissim Hadar
6391282680 Swapped location of keylight attenuation and the blending factor. 2017-10-30 12:05:23 -07:00
Nissim Hadar
66c31caf4b Refactoring of the haze 2017-10-27 09:08:58 -07:00
Andrew Meadows
5ed58d5e5d enable Quad in ShapeEntityItem properties 2017-10-26 22:59:25 -07:00
Nissim
935180bf09 Fixed my bloody stupid mistake... 2017-10-17 15:02:05 -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
dc45c7af75 Implemented radio-buttons. 2017-10-12 11:18:18 -07:00
Nissim Hadar
d0deaa631c Trying to pretty-up. 2017-10-12 07:54:03 -07:00
Nissim Hadar
00609c9547 Name correction. 2017-10-12 07:37:44 -07:00
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