Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-01 03:13:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
32492 commits 71 branches 56 tags 1.2 GiB
Commit graph

169 commits

Author SHA1 Message Date
Seth Alves
f9d46b0cb5 interface decides on entityIDs rather than bouncing a temporary id through the entity server 2015-05-19 14:25:23 -07: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
Brad Hefta-Gaub
072a982fe3 Merge pull request #4851 from huffman/fix-edit-properties-width 
Remove nowrap from entity tool property labels
 2015-05-13 17:45:57 -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
Ryan Huffman
b4416f3bc2 Remove nowrap from entity tool property labels 2015-05-13 08:36:11 -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
Seth Alves
f6948193f1 add fields for collision model url 2015-03-07 20:24:11 -08:00
Andrew Meadows
5b854857c1 fix JS scripts to use radians per second 
in entity properties
 2015-03-07 18:02:41 -08:00
Clément Brisset
5ef86f88f5 Merge pull request #4364 from huffman/save-on-blur 
Fix properties window changes not taking affect when losing focus
 2015-03-03 08:35:49 -08:00
Ryan Huffman
f739bf2116 Fix properties window changes not taking affect when losing focus 2015-03-02 11:20:00 -08:00
Ryan Huffman
20f3d23ae7 Update editEntities to use new light properties 2015-02-27 13:46:26 -08:00
Brad Hefta-Gaub
addc729654 Merge pull request #4350 from huffman/multi-select 
Multi select properties for edit entities
 2015-02-27 10:54:42 -08:00
Brad Hefta-Gaub
08dc883b0e Merge pull request #4351 from huffman/update-light-properties 
Update light properties (primarily for editEntities.js)
 2015-02-27 10:54:19 -08:00
Ryan Huffman
74bc48ce55 Add message to edit entities list for when no entities are nearby 2015-02-26 14:34:32 -08:00
Ryan Huffman
ecc003c5e1 Adjust colors for disabled input elements 2015-02-26 14:23:25 -08:00
Ryan Huffman
3c5f11e6ed Add initial support for multi-selection in properties window 2015-02-26 14:23:11 -08:00
Ryan Huffman
c3a7257439 Remove unused light properties from entity properties window 2015-02-26 11:03:06 -08:00
Andrew Meadows
27e6f99deb use strings for shapeType for JS Entity properties 2015-02-20 16:54:58 -08:00
Ryan Huffman
813673b720 Fix grid tool not showing minor grid width 2015-02-12 13:19:09 -08:00
Andrew Meadows
d9b57de649 merge upstream/master into andrew/thermonuclear 2015-02-11 08:56:34 -08:00
Andrew Meadows
ac8db02029 add ShapeType to UI of entity properties editor 2015-02-11 08:54:35 -08:00
Ryan Huffman
39cc6c86ae Update selected entity color to have more contrast 2015-02-10 09:03:48 -08:00
Ryan Huffman
8d65caaaef Update entity list search input to be full width with margin 2015-02-10 09:03:21 -08:00
Ryan Huffman
7ac3bd3ee8 Add padding to buttons in entity list 2015-02-10 09:02:53 -08:00
Ryan Huffman
6863895533 Remove value from animation settings textarea 2015-02-05 11:19:18 -08:00
Ryan Huffman
850de6e67e Add User Data to entity properties panel 2015-02-05 11:19:01 -08:00
Ryan Huffman
74dfd29708 Remove Mass from entity properties window 2015-02-03 11:44:01 -08:00
Ryan Huffman
7017fdbac0 Update style of grid tools 2015-01-29 16:59:58 -08:00
Ryan Huffman
0307448ec3 Fix color index for entity grid tool 2015-01-29 16:59:37 -08:00
Ryan Huffman
c00346e8cb Revert "Remove gridControls.html" 
This reverts commit a0cb40597b.
 2015-01-29 16:45:19 -08:00
Ryan Huffman
2171427bbd Update style.css to use pt instead of px for proper rendering on hidpi screens 2015-01-21 12:31:06 -08:00
Ryan Huffman
1f86edbfbf Remove console.log from entityList.html 2015-01-20 12:47:19 -08:00
Ryan Huffman
1a6557c72d Remove removeEntity from entityList.html 2015-01-20 12:46:26 -08:00
Ryan Huffman
903921e11f Update entity list to auto-refresh list on start 2015-01-20 12:40:31 -08:00
Ryan Huffman
d3a6a411fb Update entity list to use list.js more directly 2015-01-16 16:23:29 -08:00
Ryan Huffman
92b99237a2 Merge branch 'master' of github.com:highfidelity/hifi into entity-list-updates 2015-01-15 11:13:01 -08:00
Ryan Huffman
1b9b7b6797 Merge branch 'master' of github.com:highfidelity/hifi into update-properties-layout 
Conflicts:
	examples/html/entityProperties.html
 2015-01-15 10:53:07 -08:00
Ryan Huffman
dbb978e278 Update style and layout of entity properties window 2015-01-15 10:22:39 -08:00
Ryan Huffman
10f8e54903 Update style of properties windows 2015-01-14 15:50:42 -08:00
Andrew Meadows
f90b128ac3 use density instead of mass in scripts/UI 2015-01-14 15:48:05 -08:00
Ryan Huffman
7ddec78cd5 Add list.min.js for entity list tool 2015-01-13 15:36:25 -08:00
Ryan Huffman
9e8458edd9 Add support for teleport, delete, and filtering in entity list 2015-01-13 15:35:30 -08:00
Ryan Huffman
96f75df831 Add missing model properties to entity property window 2015-01-13 10:09:05 -08:00
Ryan Huffman
8d8352946b Add rescale button to edit properties window 2015-01-09 10:01:58 -08:00
Ryan Huffman
fbdc509428 Increase size of url input boxes 2015-01-07 12:15:14 -08:00
Ryan Huffman
a0cb40597b Remove gridControls.html 2014-12-30 11:31:47 -08:00
Ryan Huffman
a9223f5887 Remove text from label 2014-12-12 15:45:31 -08:00