David Rowe
f85b7696b3
Merge branch 'master' into 20855
2016-03-26 07:53:55 +13:00
Brad Davis
a47614c9b6
Revert "Build a better event bridge"
...
This reverts commit a43fde0803
.
2016-03-25 09:48:25 -07:00
David Rowe
8185e13e18
Style checkboxes
2016-03-25 16:40:26 +13:00
David Rowe
42af3ebc4a
Style the entity editor's "grid" tab
2016-03-25 14:15:03 +13:00
Brad Hefta-Gaub
fc41c5bca9
Merge pull request #7448 from Menithal/entity-properties-refresh-cache
...
Added Refresh Buttons to entityProperties
2016-03-24 17:34:46 -07:00
Menithal
24f2bdac77
Fixed Styling
2016-03-24 20:58:32 +02:00
Brad Davis
a43fde0803
Build a better event bridge
2016-03-24 11:01:06 -07:00
Menithal
12ecd592ab
Added Refresh Buttons to entityProperties
...
Pressing buttons next to the url bar will now allow for content to have an
automatic unix timestamp to be applied / updated to the end of the url.
Applies for all url entity Properties
2016-03-24 01:14:48 +02:00
David Rowe
454ba50dc1
Tidying
2016-03-24 10:03:47 +13:00
David Rowe
55fd861b69
Style scrollbars
2016-03-24 09:43:08 +13:00
David Rowe
0f352b77b2
Tidying
2016-03-23 21:25:02 +13:00
David Rowe
ca90ab7597
Fix initial sort indicators
2016-03-23 21:08:25 +13:00
David Rowe
054d575ed2
Report number of entities found or selected in entities table footer
2016-03-23 20:50:08 +13:00
David Rowe
86354d0165
Table border
2016-03-23 17:34:33 +13:00
David Rowe
6684bbf404
Table header separators
2016-03-23 16:48:41 +13:00
David Rowe
c7712f2d05
Entities table styling
2016-03-23 16:16:03 +13:00
David Rowe
89d4bea73e
Restyle search filter and radius in Entity List tab
2016-03-23 12:22:09 +13:00
David Rowe
b5d71d1ee1
Restyle top row of buttons in Entity List tab
2016-03-23 10:05:22 +13:00
David Rowe
53b86a0b55
Move the "no entities found" message into the entities list table
2016-03-22 20:02:57 +13:00
David Rowe
42b606c09d
Merge branch 'master' into 20855
2016-03-22 18:51:07 +13:00
David Rowe
02a62766e0
Size entities list to dialog and scroll when necessary
...
Also add a footer.
2016-03-22 18:03:12 +13:00
David Rowe
3fa678a652
Style tabs and background
2016-03-19 14:52:40 +13:00
Zach Pomerantz
105b4e16a9
Add back ambientURL listener in editor
2016-03-18 16:18:41 -07:00
James B. Pollack
ce932640bd
Merge pull request #7353 from huffman/fix-keylight-edit
...
Fix keylight direction naming and usage in edit.js
2016-03-18 12:35:48 -07:00
David Rowe
6a2cb393fa
Make copy of style.css as starting point for restyling entities editor
2016-03-18 16:56:08 +13:00
Ryan Huffman
850fb51f72
Fix keylight direction naming and usage
2016-03-14 14:45:00 -07:00
Seth Alves
d811c4f6b5
dynamic is the same as grabbable-by-default
2016-03-14 11:39:56 -07:00
Seth Alves
1f8a55da3a
dynamic is the same as grabbable-by-default
2016-03-14 11:36:44 -07:00
Seth Alves
cca4a93b2b
don't full up userData with default grabbable data
2016-03-12 14:09:52 -08:00
Seth Alves
be51040420
grabbable controlls are working
2016-03-12 13:20:04 -08:00
Seth Alves
f1992af38e
started to add grabbable psuedo properties to edit.js
2016-03-12 13:20:00 -08:00
James B. Pollack
aa884d9e3b
spatial
2016-03-10 22:45:44 -08:00
James B. Pollack
8381b1d2fd
collision shape type
2016-03-07 20:21:14 -08:00
Zach Pomerantz
32ce7c6eab
Rename light surfaceRadius->falloffRadius
2016-02-25 10:02:33 -08:00
Zach Pomerantz
c2ed5e5474
Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity
2016-02-24 16:24:09 -08:00
ericrius1
749f4478ab
Fixed bug with parsing numbers for editjs
2016-02-23 09:33:37 -08:00
Zach Pomerantz
2534bb14f3
Amend entityProperties for fixed-dec light values
2016-02-22 19:27:36 -08:00
Zach Pomerantz
dacf9f7123
Rm extra " in entityProperties
2016-02-22 15:18:45 -08:00
Zach Pomerantz
77ad4039bc
Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity
2016-02-22 15:11:12 -08:00
Zach Pomerantz
868e2ec961
Use "number" in entityProperties
2016-02-22 15:07:10 -08:00
Zach Pomerantz
1506686b79
Expose light surface to entityProperties
2016-02-22 15:07:09 -08:00
Ryan Huffman
e6ccf501fa
Merge pull request #7135 from zzmp/fix/grid
...
Update renderGrid to use a shader, and fix grid edit tools
2016-02-22 12:58:23 -08:00
Zach Pomerantz
c9362a4073
Set grid major div min to 1
2016-02-19 15:58:08 -08:00
Zach Pomerantz
5d78867197
Set grid height via global y-coord
2016-02-19 15:41:38 -08:00
Zach Pomerantz
d74aa4f14d
Rm extra , in gridControls
2016-02-19 14:54:19 -08:00
Ryan Huffman
69a953725e
Merge pull request #7132 from imgntn/edit-precision-things
...
Revert step size change in edit.js
2016-02-19 08:20:04 -08:00
Zach Pomerantz
b68213f9bf
Reintroduce grid to edit.js
2016-02-18 15:48:25 -08:00
Chris Collins
e3ae2baa7b
Merge pull request #7123 from ericrius1/editProps
...
added collidesWith property to entities list
2016-02-18 09:11:18 -08:00
James B. Pollack
acaa824cb5
but only position
2016-02-18 09:00:39 -08:00
James B. Pollack
e6662edcb4
revert step size change
2016-02-18 08:57:06 -08:00