Merge PR from mbb - Improve models and textures

This commit is contained in:
MBB 2017-08-24 19:26:40 +02:00 committed by orwell96
parent 6ddf3fed14
commit b75c83ea43
64 changed files with 14 additions and 10 deletions

View File

@ -1,4 +1,4 @@
Advanced Trains v1.3.0, by orwell and contributors. Also see readme. Advanced Trains v1.3.8, by orwell and contributors. Also see readme.
Good-looking, realistic trains for minetest. Good-looking, realistic trains for minetest.
For crafting recipes, see manual.pdf For crafting recipes, see manual.pdf

0
advtrains/advtrains/textures/advtrains_across.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 302 B

After

Width:  |  Height:  |  Size: 302 B

0
advtrains/advtrains/textures/advtrains_across_anim.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 524 B

After

Width:  |  Height:  |  Size: 524 B

0
advtrains/advtrains/textures/advtrains_boiler.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 413 B

After

Width:  |  Height:  |  Size: 413 B

0
advtrains/advtrains/textures/advtrains_chimney.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 309 B

After

Width:  |  Height:  |  Size: 309 B

BIN
advtrains/advtrains/textures/advtrains_couple.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 265 B

After

Width:  |  Height:  |  Size: 339 B

BIN
advtrains/advtrains/textures/advtrains_discouple.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 307 B

After

Width:  |  Height:  |  Size: 293 B

0
advtrains/advtrains/textures/advtrains_driver_cab.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 352 B

After

Width:  |  Height:  |  Size: 352 B

View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
advtrains/advtrains/textures/advtrains_dtrack_rail.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

View File

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

View File

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

View File

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

View File

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

View File

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

View File

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

View File

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
advtrains/advtrains/textures/advtrains_platform.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 193 B

After

Width:  |  Height:  |  Size: 193 B

0
advtrains/advtrains/textures/advtrains_retrosignal.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

View File

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

0
advtrains/advtrains/textures/advtrains_signal_inv.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 856 B

After

Width:  |  Height:  |  Size: 856 B

0
advtrains/advtrains/textures/advtrains_signal_off.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

0
advtrains/advtrains/textures/advtrains_signal_on.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

View File

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

0
advtrains/advtrains/textures/advtrains_track_cr.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

0
advtrains/advtrains/textures/advtrains_track_cr_45.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

View File

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

0
advtrains/advtrains/textures/advtrains_track_st.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

0
advtrains/advtrains/textures/advtrains_track_st_45.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

0
advtrains/advtrains/textures/advtrains_track_swlcr.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

View File

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

0
advtrains/advtrains/textures/advtrains_track_swlst.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

View File

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

0
advtrains/advtrains/textures/advtrains_track_swrcr.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

View File

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB

0
advtrains/advtrains/textures/advtrains_track_swrst.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

View File

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB

0
advtrains/advtrains/textures/advtrains_trackworker.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 328 B

After

Width:  |  Height:  |  Size: 328 B

0
advtrains/advtrains/textures/advtrains_wheel.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 582 B

After

Width:  |  Height:  |  Size: 582 B

0
advtrains/advtrains/textures/drwho_screwdriver.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 328 B

After

Width:  |  Height:  |  Size: 328 B

0
advtrains/advtrains_train_steam/depends.txt Normal file → Executable file
View File

19
advtrains/advtrains_train_steam/init.lua Normal file → Executable file
View File

@ -35,7 +35,7 @@ advtrains.register_wagon("newlocomotive", {
}, },
assign_to_seat_group = {"dstand"}, assign_to_seat_group = {"dstand"},
visual_size = {x=1, y=1}, visual_size = {x=1, y=1},
wagon_span=1.85, wagon_span=2.3,
collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0}, collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
update_animation=function(self, velocity) update_animation=function(self, velocity)
if self.old_anim_velocity~=advtrains.abs_ceil(velocity) then if self.old_anim_velocity~=advtrains.abs_ceil(velocity) then
@ -149,14 +149,14 @@ advtrains.register_wagon("wagon_default", {
seats = { seats = {
{ {
name="1", name="1",
attach_offset={x=-4, y=8, z=8}, attach_offset={x=2, y=6, z=8},
view_offset={x=0, y=0, z=0}, view_offset={x=0, y=-4, z=0},
group="pass", group="pass",
}, },
{ {
name="2", name="2",
attach_offset={x=4, y=8, z=8}, attach_offset={x=-1, y=6, z=8},
view_offset={x=0, y=0, z=0}, view_offset={x=0, y=-4, z=0},
group="pass", group="pass",
}, },
{ {
@ -178,20 +178,23 @@ advtrains.register_wagon("wagon_default", {
access_to = {}, access_to = {},
}, },
}, },
assign_to_seat_group = {"pass"}, assign_to_seat_group = {"pass"},
visual_size = {x=1, y=1}, visual_size = {x=1, y=1},
wagon_span=3.1, wagon_span=2.634,
collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0}, collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
drops={"default:steelblock 4"}, drops={"default:steelblock 4"},
}, S("Passenger Wagon"), "advtrains_wagon_inv.png") }, S("Passenger Wagon"), "advtrains_wagon_inv.png")
advtrains.register_wagon("wagon_box", { advtrains.register_wagon("wagon_box", {
mesh="advtrains_wagon.b3d", mesh="advtrains_wagon_box.b3d",
textures = {"advtrains_wagon_box.png"}, textures = {"advtrains_wagon_box.png"},
drives_on={default=true}, drives_on={default=true},
max_speed=10, max_speed=10,
seats = {}, seats = {},
visual_size = {x=1, y=1}, visual_size = {x=1, y=1},
wagon_span=1.8, wagon_span=2,
collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0}, collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0},
drops={"default:steelblock 4"}, drops={"default:steelblock 4"},
has_inventory = true, has_inventory = true,

0
advtrains/advtrains_train_steam/locale/de.txt Normal file → Executable file
View File

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 791 KiB

View File

Before

Width:  |  Height:  |  Size: 462 B

After

Width:  |  Height:  |  Size: 462 B

View File

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 60 KiB

View File

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

View File

Before

Width:  |  Height:  |  Size: 469 B

After

Width:  |  Height:  |  Size: 469 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

Before

Width:  |  Height:  |  Size: 347 B

After

Width:  |  Height:  |  Size: 347 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 709 B

After

Width:  |  Height:  |  Size: 699 B

View File

@ -0,0 +1 @@
advtrains 1.3.8

Binary file not shown.

Before

Width:  |  Height:  |  Size: 435 KiB

After

Width:  |  Height:  |  Size: 791 KiB