Commit graph

118 commits

Author SHA1 Message Date
Thijs Wenker
d60661ff8a preview camera button in edit.js script 2015-11-04 03:24:32 +01:00
Atlante45
8b46ed7dff Check keyLight is defined 2015-10-29 16:42:48 -07:00
Atlante45
904326cd1c edit.js fix 2015-10-29 14:11:27 -07:00
samcake
630cdb8a9d Modify the html presentiong the zone enity properties to match the internal new representation 2015-10-28 17:29:06 -07:00
samcake
a5b95d7307 Fixing the entity properties view with the new properties group 2015-10-28 16:46:56 -07:00
James B. Pollack
c6fcaf158b add color to more props 2015-10-16 16:15:20 -07:00
James B. Pollack
aa6aaf912e add color bars below position inputs 2015-10-16 16:07:20 -07:00
Brad Hefta-Gaub
f141026990 CR feedback 2015-10-08 11:48:48 -07:00
Brad Hefta-Gaub
a8d1622481 CR feedback 2015-10-08 11:47:54 -07:00
Brad Hefta-Gaub
bb10d8a7d5 more work on rationalizing particle properties 2015-10-07 20:08:30 -07:00
Brad Hefta-Gaub
02a24712ca fix isEmitting property for particle effects, cleaned up some particle property editing in edit.js 2015-10-07 19:52:29 -07:00
Brad Hefta-Gaub
7a85e5b7a7 rename frameIndex to currentFrame 2015-10-07 13:02:58 -07:00
Brad Hefta-Gaub
6eeb64b032 CR feedback 2015-10-07 11:23:24 -07:00
Brad Hefta-Gaub
8c8e83dc8e more debugging on animation.running 2015-10-05 14:17:12 -07:00
Brad Hefta-Gaub
accdd8c86a add animation properties to edit properties 2015-10-02 19:15:24 -07:00
Brad Hefta-Gaub
02536a5ab9 remove animationSettings from particles, add isEmitting 2015-10-02 14:17:01 -07:00
Brad Hefta-Gaub
efda121619 fix a bunch of warnings on windows 2015-09-22 16:40:17 -07:00
Seth Alves
79a7755cdb add SURFACE_EDGED_MARCHING_CUBES polyvox surface extraction style 2015-08-15 12:18:36 -07:00
Seth Alves
8d2aacb46d send X texture to renderer 2015-07-30 15:36:07 -07:00
Seth Alves
52ee9526ce add 3 new texture-url properties for polyvox 2015-07-30 13:20:19 -07:00
David Rowe
1898c6bd55 Merge branch 'master' into 20547
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
2015-06-26 13:05:51 -07:00
Zander Otavka
803f644edf Make hyperlink its own section in edit.js. 2015-06-25 11:40:09 -07:00
Zander Otavka
8c77fd369b Add subsections to the edit.js properties list. 2015-06-23 17:40:38 -07:00
Zander Otavka
f7cd756796 Improve entity properties list in edit script.
Add headers to break up logical sections, and reorder/relabel a few
properties.
2015-06-23 09:17:23 -07:00
David Rowe
6623d0c552 Add "Reload" button associated with entity editor's script URL field
The Reload button re-downloads the script for both the editor and for
everyone in the vicinity.
2015-06-17 16:11:32 -07:00
Seth Alves
a5f7ba51b6 only show polyvox property widgets if we are editing a polyvox. 2015-06-16 10:13:47 -07:00
Niraj Venkat
9ed8daa97c Removing unnecessary functions 2015-06-10 15:33:07 -07:00
Niraj Venkat
182a3e918c Hyperlink properties now propagate locally and over network 2015-06-10 13:12:18 -07:00
Niraj Venkat
4617b7331c Working on creating functions to serialize and deserialize properties 2015-06-10 09:50:47 -07:00
Niraj Venkat
d90e43c5aa Adding text boxes for hyperlink href and description 2015-06-09 16:15:47 -07:00
Seth Alves
20d3814c1b code review 2015-06-02 10:00:07 -07:00
Seth Alves
a3589788df allow edit.js to change between cubic and marching-cubes surface extractor on polyvox entity-items. 2015-05-30 18:33:35 -07:00
Seth Alves
ad71d7b7a2 allow changing of voxel-volume-size with edit.js 2015-05-30 18:14:36 -07:00
Atlante45
18812ab25f Fix entityProperties.html undefined ref 2015-05-24 19:21:04 +02:00
Triplelexx
9a29489784 expose particle properties for editing
I have made these changes to aid with experimenting with particles when
running the edit scripts locally.
2015-05-23 17:57:25 +01:00
Atlante45
9d27108acb Fix sourceUrl box in edit.js 2015-05-18 13:29:13 +02:00
Andrew Meadows
d28c400cea add restitution and friction Entity properties 2015-05-14 12:36:59 -07:00
Brad Hefta-Gaub
5da0a8d7a3 Merge pull request #4860 from howard-stearns/entity-sound
Entity sound.
2015-05-13 20:07:44 -07:00
Howard Stearns
b79a58c0c8 Whitespace. 2015-05-13 18:07:51 -07:00
Howard Stearns
8324da2f7f Whitespace formatting/indentation. 2015-05-13 15:48:22 -07:00
Howard Stearns
1a87ca04da Entity sound. 2015-05-13 13:18:02 -07:00
Brad Davis
9b6c20d93c Merge remote-tracking branch 'upstream/master' into web-entity 2015-05-13 09:49:53 -07:00
Brad Davis
a8d343bbf1 Working on web entities 2015-05-13 00:27:57 -07:00
Brad Davis
e9b83e1c02 Working on web entities 2015-05-12 21:15:54 -07:00
Brad Davis
8c4f802dbf Merge remote-tracking branch 'upstream/master' into web-entity
Conflicts:
	libraries/entities/src/EntityItemProperties.h
	libraries/entities/src/EntityTypes.h
2015-05-12 15:56:02 -07:00
Brad Davis
745182a963 Working on web entities 2015-05-12 14:39:54 -07:00
Ryan Huffman
2e31cca7e5 Make edit color picker slimmer 2015-05-12 14:03:06 -07:00
Brad Hefta-Gaub
a32b4df6a5 Merge pull request #4841 from huffman/color-picker
Fix skybox color picker
2015-05-12 09:24:50 -07:00
Ryan Huffman
e673746d58 Fix skybox color picker 2015-05-12 09:22:53 -07:00
Brad Hefta-Gaub
9e308cce21 Merge pull request #4839 from huffman/color-picker
Add color picker to entity properties
2015-05-12 08:58:41 -07:00