Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 19:15:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
25313 commits 71 branches 56 tags 1.2 GiB
Commit graph

110 commits

Author SHA1 Message Date
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
Ryan Huffman
6612f9cb61 Fix key light properties in proeprties window 2015-04-23 09:33:58 -07:00
Atlante45
837a0d3ba8 rename collision model in edit.js 2015-04-23 12:13:52 +02:00
Ryan Huffman
4e2bcc0690 Add zone properties to entity property panel 2015-04-21 12:47:11 -07:00
Ryan Huffman
b6942e2300 Fix stuck-spinners in entity properties 2015-04-14 10:11:52 -07:00
Andrew Meadows
e9159304d2 Merge pull request #4617 from sethalves/acceleration-and-owner-in-wire-protocol 
Acceleration and owner in wire protocol
 2015-04-10 09:07:47 -07:00
Ryan Huffman
5a9ee73476 Fix error in entity properties not showing selections 2015-04-09 20:10:02 -07:00
Seth Alves
2448051c75 Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-08 15:39:40 -07:00
Seth Alves
1dd01cde00 expand svo to hold acceleration and id of current simulator node 2015-04-08 15:39:34 -07:00
Ryan Huffman
e3dea8ccc8 Remove margin in entityProperties 2015-04-08 13:24:03 -07:00
Ryan Huffman
92b91c9a38 Fix checkboxes not aligning with label 2015-04-08 13:23:48 -07:00
Ryan Huffman
83918c53b9 Update entityProperties properties to take up less space 2015-04-08 10:18:29 -07:00
Ryan Huffman
dc503ac068 Update entityProperties checkboxes to be inlined 2015-04-08 10:18:04 -07:00
Ryan Huffman
748534cb9a Fix spotlight checkbox on entity properties 2015-04-03 16:25:28 -07:00
Ryan Huffman
775bbdaebb Remove unnecessary css 2015-04-01 16:04:52 -07:00
Ryan Huffman
0f518b6dbd Update styling of property spinners in edit.js 2015-04-01 16:02:21 -07:00
Philip Rosedale
b5f79c7e6e Merge pull request #4571 from huffman/select-all-edit 
Add select all on focus behavior to entity properties window
 2015-04-01 14:06:00 -07:00
Ryan Huffman
c835fb63c3 Add select all on focus behavior to entity properties window 2015-04-01 12:52:46 -07:00
Ryan Huffman
eb7d940ed9 Update edit.js lineHeight property handling 2015-04-01 11:36:05 -07:00
Ryan Huffman
79305141d1 Fix edit.js not selecting all when tabbing between properties 2015-03-31 10:51:07 -07:00
Ryan Huffman
ed62356f65 Remove attribution field from edit properties window 2015-03-27 13:36:56 -07:00
Atlante45
e4e0e2fd6b Update Edit.js HTML to display attribution property 2015-03-20 18:04:05 +01:00
Seth Alves
99300a5bc8 merge from master 2015-03-09 13:39:51 -07:00