From 191e6090e7adaacfbb77eb332adc7bef97a24e79 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Thu, 28 Jan 2016 11:36:23 -0800 Subject: [PATCH 1/3] Moves zone props to top of entity props panel --- examples/html/entityProperties.html | 270 ++++++++++++++-------------- 1 file changed, 136 insertions(+), 134 deletions(-) diff --git a/examples/html/entityProperties.html b/examples/html/entityProperties.html index 898f2bea6d..86dbeebe9f 100644 --- a/examples/html/entityProperties.html +++ b/examples/html/entityProperties.html @@ -976,6 +976,142 @@ + +
+ +
+ +
+ Stage Sun Model Enabled + + + +
+ +
+ +
+ +
+
Light Color
+
+
+
R
+
G
+
B
+
+
+ +
+
Light Intensity
+
+ +
+
+ +
+
Light Direction
+
+
Pitch
+
Yaw
+
Roll
+
+
+ +
+
Ambient Intensity
+
+ +
+
+ + +
+
Ambient URL
+
+ +
+
+ +
+ +
+ +
+
Stage Latitude
+
+ +
+
+
+
Stage Longitude
+
+ +
+
+
+
Stage Altitude
+
+ +
+
+ +
+ Automatically calculate stage hour and day from location and clock. + + + +
+ +
+
Stage Day
+
+ +
+
+
+
Stage Hour
+
+ +
+
+ +
+ +
+ +
+
Background Mode
+
+ +
+
+ + +
+ +
+ +
+
Skybox Color
+
+
+
R
+
G
+
B
+
+
+
+
Skybox URL
+
+ +
+
+ +
@@ -1440,139 +1576,5 @@
-
- -
- -
- Stage Sun Model Enabled - - - -
- -
- -
- -
-
Light Color
-
-
-
R
-
G
-
B
-
-
- -
-
Light Intensity
-
- -
-
- -
-
Light Direction
-
-
Pitch
-
Yaw
-
Roll
-
-
- -
-
Ambient Intensity
-
- -
-
- - -
-
Ambient URL
-
- -
-
- -
- -
- -
-
Stage Latitude
-
- -
-
-
-
Stage Longitude
-
- -
-
-
-
Stage Altitude
-
- -
-
- -
- Automatically calculate stage hour and day from location and clock. - - - -
- -
-
Stage Day
-
- -
-
-
-
Stage Hour
-
- -
-
- -
- -
- -
-
Background Mode
-
- -
-
- - -
- -
- -
-
Skybox Color
-
-
-
R
-
G
-
B
-
-
-
-
Skybox URL
-
- -
-
- From 3fff5868e8429d4b09da32244864cf21cb9c0088 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Thu, 28 Jan 2016 11:57:33 -0800 Subject: [PATCH 2/3] Fix syntax error --- examples/html/entityProperties.html | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/examples/html/entityProperties.html b/examples/html/entityProperties.html index 86dbeebe9f..28db85a2fd 100644 --- a/examples/html/entityProperties.html +++ b/examples/html/entityProperties.html @@ -976,8 +976,7 @@ - -
+
@@ -1110,7 +1109,6 @@
-
@@ -1574,7 +1572,6 @@
- - + - + \ No newline at end of file From c30109ec29130502083ce5f42fc60c88adfc8f1e Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Thu, 28 Jan 2016 13:21:48 -0800 Subject: [PATCH 3/3] trying to sync again --- examples/html/entityProperties.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/html/entityProperties.html b/examples/html/entityProperties.html index 28db85a2fd..848e16fae8 100644 --- a/examples/html/entityProperties.html +++ b/examples/html/entityProperties.html @@ -976,7 +976,7 @@ -
+
@@ -1116,7 +1116,7 @@
-
Href
+
Href - Hifi://address