Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 13:56:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41398 commits 25 branches 0 tags 1.1 GiB
Commit graph

199 commits

Author SHA1 Message Date
ericrius1
f85916e808 checkbox keeps getting checked... 2016-02-17 10:27:53 -08:00
ericrius1
0f8f67ef0b removing dynamic. need to add others 2016-02-16 19:34:32 -08:00
James B. Pollack
f2445e81e0 Merge pull request #7110 from ericrius1/particlesInEdit2 
Particles in edit
 2016-02-16 18:33:01 -08:00
ericrius1
168fb67d67 making collidesWith a checkbox 2016-02-16 18:19:12 -08:00
ericrius1
7a3443968d added collides with property 2016-02-16 15:55:11 -08:00
ericrius1
c43500f38a added textures field to particle explorer 2016-02-16 15:36:03 -08:00
James B. Pollack
72186f916c more precision 2016-02-15 11:35:28 -08:00
James B. Pollack
c469fc6a29 hide hyperlink property for web entities 2016-02-12 14:30:21 -08:00
ericrius1
1387f5f322 Fixed bug where lack of 0 as prefix for numbers would throw an error 2016-02-01 16:44:55 -08:00
ericrius1
559fb9cbde fixed merge conflicts 2016-01-29 16:42:10 -08:00
Brad Davis
c4794dd0d5 Fix entity properties HTML 2016-01-29 13:41:43 -08:00
ericrius1
6be550a144 resolved conflicts 2016-01-28 17:08:24 -08:00
James B. Pollack
96ddb9febb Merge pull request #6970 from ericrius1/webEntityURL 
Moved source URL up to top of entity properties panel
 2016-01-28 16:02:21 -08:00
ericrius1
c30109ec29 trying to sync again 2016-01-28 13:21:48 -08:00
ericrius1
98453c085b Moved source URL up to top of entity properties panel 2016-01-28 12:08:21 -08:00
ericrius1
3fff5868e8 Fix syntax error 2016-01-28 11:57:33 -08:00
ericrius1
40c66a94be Moves text props to top of Entity Props panel 2016-01-28 11:44:50 -08:00
ericrius1
191e6090e7 Moves zone props to top of entity props panel 2016-01-28 11:36:23 -08:00
ericrius1
cd5e81de36 Validating href for edit.js 2016-01-27 16:02:02 -08:00
Brad Davis
ae6cba85e8 More atmosphere removal 2016-01-21 15:15:16 -08:00
Andrew Meadows
7fb145e819 namechange ignoreForCollisions --> collisionless 2016-01-19 09:06:17 -08:00
Seth Alves
9428da61cf fix property name typo 2016-01-18 14:31:55 -08:00
Andrew Meadows
c1a1cbf718 fix typo 2016-01-16 15:55:10 -08:00
Andrew Meadows
84282d0114 final repairs after rebase 2016-01-15 15:28:26 -08:00
Andrew Meadows
29a52bf0ba namechange collisionsWillMove --> dynamic 2016-01-15 15:23:52 -08:00
Brad Davis
b6272b7824 Migrate tool window to overlay/QML 2016-01-13 15:40:37 -08:00
Anthony J. Thibault
e9f529bf12 Entities: Removed Start Automatically property from Animation Group 
There is an issue when startAutomatically was set to true and animationPlaying was set to false.
This would cause clients to play the animation when they connected to the entity server, even though the server was not.
 2015-12-09 17:59:56 -08:00
Seth Alves
f0fb9966ad expose parent-joint-index to edit.js 2015-12-06 12:34:41 -08:00
Seth Alves
9548b0e138 get parent-id field working 2015-11-29 13:38:27 -08:00
Seth Alves
bbc9d5d131 add missing single-quote 2015-11-29 13:04:45 -08:00
Seth Alves
36e293608a more adding parentID to edit.js 2015-11-26 05:31:52 -08:00
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
Ryan Huffman
9f7e90d036 Add color picker to entity properties 2015-05-12 08:40:44 -07:00
ZappoMan
28bacb4d82 add center in zone button to edit.js 2015-05-11 13:26:52 -07:00
Clément Brisset
5160eb5b94 Merge pull request #4819 from ZappoMan/moreZoneProperties 
More Zone Atmosphere Work: add automatic day/hour calculation
 2015-05-11 19:38:27 +02:00
ZappoMan
4b8c6fc624 fix typo 2015-05-11 09:53:23 -07:00
Atlante45
beba293d96 Hide Skybox/Atmosphere prps when not needed 2015-05-11 15:54:30 +02:00
ZappoMan
17c3c1a18d add support for automatic hour/day calculations and backward compatibility on stage properties 2015-05-10 15:22:02 -07:00
ZappoMan
0b6a815a20 moved zone stage properties into a group 2015-05-08 20:17:01 -07:00
ZappoMan
9f229dc3b3 remove spinners from scatter values 2015-05-08 15:03:04 -07:00
ZappoMan
b1d5b2643f add has stars to edit.js 2015-05-08 13:17:39 -07:00
ZappoMan
20fe43c852 wire up new zone properties, fix bug in group proprties decode 2015-05-07 13:05:00 -07:00
ZappoMan
d9f17d010c first cut at adding new zone properties to edit tools 2015-05-07 11:41:23 -07:00
Seth Alves
5390630497 Merge pull request #4743 from huffman/sphere-color 
Add support for changing sphere color in edit.js
 2015-05-01 13:17:46 -07:00
Ryan Huffman
7f84b27880 Add support for changing sphere color in edit.js 2015-05-01 11:59:39 -07:00
Ryan Huffman
73a5b8c4e2 Add support for 'name' to edit.js 2015-05-01 08:42:23 -07:00
Atlante45
82a53c9139 Turn off all sections then turn on selected one 
This fixes the issue of properties present in a couple sections but not
all that are going to only be displayed for the last section the are in
that is being processed.
 2015-04-24 16:53:39 +02:00
Atlante45
32b78f02b4 Group ShapeType and CompoundShapeURL + add it to Zones 2015-04-24 16:52:51 +02:00
Brad Hefta-Gaub
33557e5b05 Merge pull request #4680 from huffman/edit-zone-limits 
Add limits to zone fields in entity properties window
 2015-04-23 12:42:32 -07:00
Atlante45
0b1d4fb1d6 Merge branch 'master' of https://github.com/highfidelity/hifi into zones 2015-04-23 21:16:11 +02:00
Ryan Huffman
1657c50920 Add limits to zone fields in entity properties window 2015-04-23 12:00:13 -07:00