Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 13:44:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #9481 from huffman/fix/edit-collision-names

Browse source 
Update the name of the collision shapes used in edit.js properties
This commit is contained in:
Ryan Downe Karpf 2017-01-23 15:10:01 -08:00 committed by GitHub
commit e080746990
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/system/html/css/edit-style.css
View file

@ -593,7 +593,7 @@ hr {
.dropdown dl { .dropdown dl {
font-family: FiraSans-SemiBold; font-family: FiraSans-SemiBold;
font-size: 15px; font-size: 15px;
width: 172px; width: 292px;
height: 28px; height: 28px;
padding: 0 28px 0 12px; padding: 0 28px 0 12px;
color: #afafaf; color: #afafaf;
@ -645,7 +645,7 @@ hr {
.dropdown li { .dropdown li {
list-style-type: none; list-style-type: none;
padding: 3px 0 1px 12px; padding: 3px 0 1px 12px;
width: 200px; width: 320px;
height: auto; height: auto;
font-family: FiraSans-SemiBold; font-family: FiraSans-SemiBold;
font-size: 15px; font-size: 15px;

8
scripts/system/html/entityProperties.html
View file

@ -328,13 +328,13 @@
<div class="model-group model-section zone-section property dropdown"> <div class="model-group model-section zone-section property dropdown">
<label>Collision shape type</label> <label>Collision shape type</label>
<select name="SelectShapeType" id="property-shape-type"> <select name="SelectShapeType" id="property-shape-type">
<option value="none">None</option> <option value="none">No Collision</option>
<option value="box">Box</option> <option value="box">Box</option>
<option value="sphere">Sphere</option> <option value="sphere">Sphere</option>
<option value="compound">Compound</option> <option value="compound">Compound</option>
<option value="simple-hull">One Hull</option> <option value="simple-hull">Basic - Whole model</option>
<option value="simple-compound">Hull Per Submesh</option> <option value="simple-compound">Good - Sub-meshes</option>
<option value="static-mesh">Static Mesh</option> <option value="static-mesh">Exact - All polygons (non-dynamic only)</option>
</select> </select>
</div> </div>
<div class="model-group model-section zone-section property url "> <div class="model-group model-section zone-section property url ">