Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Xylophis overhaul #5323

Merged
merged 3 commits into from
Jan 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified data/models/ships/xylophis/pattern01.dds
Binary file not shown.
Binary file added data/models/ships/xylophis/pattern02.dds
Binary file not shown.
Binary file added data/models/ships/xylophis/pattern03.dds
Binary file not shown.
Binary file added data/models/ships/xylophis/pattern04.dds
Binary file not shown.
Binary file added data/models/ships/xylophis/pattern05.dds
Binary file not shown.
Binary file added data/models/ships/xylophis/pattern06.dds
Binary file not shown.
Binary file added data/models/ships/xylophis/pattern07.dds
Binary file not shown.
1,824 changes: 0 additions & 1,824 deletions data/models/ships/xylophis/xylophis.dae

This file was deleted.

32 changes: 22 additions & 10 deletions data/models/ships/xylophis/xylophis.model
Original file line number Diff line number Diff line change
@@ -1,27 +1,39 @@
material Material
material Fuselage
diffuse 1.0 1.0 1.0
specular 0.7 0.7 0.7
shininess 69
use_patterns
tex_diff xylophis_diff.dds
tex_spec xylophis_spec.dds
tex_norm xylophis_norm.png
tex_glow xylophis_glow.dds
use_patterns

material Exaust
material Transparent
diffuse 1.0 1.0 1.0
specular 0.1 0.1 0.1
shininess 40
specular 0.7 0.7 0.7
shininess 69
opacity 70
tex_diff xylophis_diff.dds
tex_spec xylophis_spec.dds
tex_norm xylophis_norm.png
tex_glow xylophis_glow.dds

material int
diffuse 0.1 0.1 0.1
specular 0.0 0.0 0.0
shininess 0
tex_ambi xylophis_int_diff.dds

lod 300
mesh xylophis.dae
mesh xylophis_shield.dae
mesh xylophis_hi.dae

lod 100
mesh xylophis_med.dae

lod 50
mesh xylophis_lo.dae
mesh xylophis_low.dae

#collision xylophis_col.dae
anim gear_down 0 70

anim gear_down 0 50
collision xylophis_coll.dae
mesh xylophis_shield.dae
169 changes: 169 additions & 0 deletions data/models/ships/xylophis/xylophis_coll.dae

Large diffs are not rendered by default.

Binary file modified data/models/ships/xylophis/xylophis_diff.dds
Binary file not shown.
Binary file modified data/models/ships/xylophis/xylophis_glow.dds
Binary file not shown.
1,978 changes: 1,978 additions & 0 deletions data/models/ships/xylophis/xylophis_hi.dae

Large diffs are not rendered by default.

Binary file added data/models/ships/xylophis/xylophis_int_diff.dds
Binary file not shown.
1,483 changes: 0 additions & 1,483 deletions data/models/ships/xylophis/xylophis_lo.dae

This file was deleted.

1,167 changes: 1,167 additions & 0 deletions data/models/ships/xylophis/xylophis_low.dae

Large diffs are not rendered by default.

1,302 changes: 1,302 additions & 0 deletions data/models/ships/xylophis/xylophis_med.dae

Large diffs are not rendered by default.

Binary file added data/models/ships/xylophis/xylophis_norm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 25 additions & 27 deletions data/models/ships/xylophis/xylophis_shield.dae

Large diffs are not rendered by default.

Binary file modified data/models/ships/xylophis/xylophis_spec.dds
Binary file not shown.