From 2d0b51b8970abb16c166708988e46fe4df668d47 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Wed, 4 Jan 2017 19:10:03 +0100 Subject: Restructure mod directory --- assets/advtrains_newlocomotive.xcf | Bin 0 -> 7462378 bytes assets/blender/engine-with-animation.blend | Bin 0 -> 599504 bytes assets/blender/gleis/detectorpart.png | Bin 0 -> 857 bytes assets/blender/gleis/infos/Grafik_weiche.png | Bin 0 -> 361700 bytes assets/blender/gleis/infos/breite | 1 + assets/blender/gleis/licence.txt~ | 0 assets/blender/gleis/rail_my.blend | Bin 0 -> 654772 bytes assets/blender/gleis/rail_my.blend1 | Bin 0 -> 674164 bytes assets/blender/gleis/rail_my_rt.blend | Bin 0 -> 847060 bytes assets/blender/gleis/rail_my_rt.blend1 | Bin 0 -> 767780 bytes assets/blender/gleis/rail_my_rt_final.blend | Bin 0 -> 1015668 bytes assets/blender/gleis/rail_my_rt_final.blend1 | Bin 0 -> 1106004 bytes assets/blender/gleis/rail_my_rt_switches.blend | Bin 0 -> 2184236 bytes assets/blender/gleis/rail_my_rt_switches.blend1 | Bin 0 -> 1945588 bytes assets/blender/gleis/rail_my_rt_switches2.blend | Bin 0 -> 2139340 bytes assets/blender/gleis/rail_my_rt_switches2.blend1 | Bin 0 -> 2172972 bytes assets/blender/gleis/rail_together.blend | Bin 0 -> 1016920 bytes assets/blender/gleis/rail_together.png | Bin 0 -> 233544 bytes assets/blender/gleis/rail_together2.png | Bin 0 -> 312891 bytes assets/blender/gleis/rail_together3.png | Bin 0 -> 309398 bytes assets/blender/gleis/rail_verticals.blend | Bin 0 -> 550748 bytes assets/blender/gleis/rail_verticals.blend1 | Bin 0 -> 574100 bytes assets/blender/gleis/rail_verticals3.blend | Bin 0 -> 591800 bytes assets/blender/gleis/rail_verticals3.blend1 | Bin 0 -> 554196 bytes assets/blender/gleis/rail_verticals45.blend | Bin 0 -> 547788 bytes assets/blender/gleis/rail_verticals45.blend1 | Bin 0 -> 547300 bytes assets/blender/gleis/rail_verticals45.blend11 | Bin 0 -> 547300 bytes assets/blender/gleis/texturen/rail.png | Bin 0 -> 2616 bytes assets/blender/gleis/texturen/uv.png | Bin 0 -> 2343 bytes assets/blender/industrial/industry_loc.blend | Bin 0 -> 652640 bytes assets/blender/industrial/industry_loc.blend1 | Bin 0 -> 652640 bytes assets/blender/industrial/industry_loc.blend11 | Bin 0 -> 659096 bytes assets/blender/industrial/industry_oil_ wagong.blend | Bin 0 -> 693488 bytes assets/blender/industrial/industry_oil_ wagong.blend1 | Bin 0 -> 693488 bytes assets/blender/industrial/industry_tree_wagong.blend | Bin 0 -> 640056 bytes assets/blender/industrial/industry_tree_wagong.blend1 | Bin 0 -> 640056 bytes assets/blender/industrial/industry_tree_wagong.png | Bin 0 -> 316 bytes assets/blender/locomotive.blend | Bin 0 -> 459600 bytes assets/blender/magnet_track.blend | Bin 0 -> 516836 bytes assets/blender/mbb/advtrains_wagon_japan.xcf | Bin 0 -> 814467 bytes assets/blender/mbb/modern_japanlocomotive.blend | Bin 0 -> 715116 bytes assets/blender/mbb/modern_japanlocomotive.blend1 | Bin 0 -> 715116 bytes assets/blender/mbb/modern_japanlocomotive.png | Bin 0 -> 204978 bytes assets/blender/mbb/modern_japanlocomotive.xcf | Bin 0 -> 957175 bytes assets/blender/mbb/modern_locomotive.blend | Bin 0 -> 732124 bytes assets/blender/mbb/modern_wagong.blend | Bin 0 -> 471140 bytes assets/blender/mbb/modern_wagong.blend1 | Bin 0 -> 518316 bytes assets/blender/mbb/modern_wagong_uv.blend | Bin 0 -> 571364 bytes assets/blender/mbb/modern_wagong_uv.blend1 | Bin 0 -> 575708 bytes assets/blender/mbb/modern_wagong_uv.png | Bin 0 -> 189564 bytes assets/blender/mbb/prellbock.blend | Bin 0 -> 745176 bytes assets/blender/mbb/prellbock.blend1 | Bin 0 -> 485416 bytes assets/blender/mbb/prellbock.uv.png | Bin 0 -> 4034 bytes assets/blender/mbb/regio-lokomotive.blend | Bin 0 -> 704160 bytes assets/blender/mbb/regio-waron.blend | Bin 0 -> 545620 bytes assets/blender/mbb/retrosignal.blend | Bin 0 -> 488920 bytes assets/blender/mbb/retrosignal.blend1 | Bin 0 -> 507800 bytes assets/blender/mbb/signal(2)_hoch.blend | Bin 0 -> 472092 bytes assets/blender/mbb/signal(2)_unten.blend | Bin 0 -> 472092 bytes assets/blender/mbb/signal.blend | Bin 0 -> 570336 bytes assets/blender/mbb/signal.blend1 | Bin 0 -> 570336 bytes assets/blender/mbb/signal.png | Bin 0 -> 244314 bytes assets/blender/mbb/signal.xcf | Bin 0 -> 881142 bytes assets/blender/mbb/signal2.png | Bin 0 -> 39924 bytes assets/blender/mbb/tr-logo.png | Bin 0 -> 197 bytes assets/blender/mbb/weichenhebel1.blend | Bin 0 -> 493028 bytes assets/blender/mbb/weichenhebel2.blend | Bin 0 -> 492996 bytes assets/blender/newlocomotive.blend | Bin 0 -> 603376 bytes assets/blender/newlocomotive.blend1 | Bin 0 -> 603376 bytes assets/blender/newlocomotive_uvs.png | Bin 0 -> 175030 bytes assets/blender/newwagon.blend | Bin 0 -> 542188 bytes assets/blender/newwagon.blend1 | Bin 0 -> 550292 bytes assets/blender/newwagon.png | Bin 0 -> 108762 bytes assets/blender/subway-train.blend | Bin 0 -> 536268 bytes assets/blender/subway-train.blend1 | Bin 0 -> 538188 bytes assets/blender/subway-train.png | Bin 0 -> 96773 bytes assets/blender/subway-train.xcf | Bin 0 -> 92558 bytes assets/blender/trackplane.blend | Bin 0 -> 462200 bytes assets/blender/trackvertical1.blend | Bin 0 -> 453656 bytes assets/blender/trackvertical1.blend1 | Bin 0 -> 453344 bytes assets/blender/trackvertical1.png | Bin 0 -> 59146 bytes assets/blender/trackvertical2.blend | Bin 0 -> 459216 bytes assets/blender/trackvertical2.png | Bin 0 -> 66755 bytes assets/init.lua | 0 assets/larger rails.xcf | Bin 0 -> 1239132 bytes assets/oldmodels/locomotive.b3d | Bin 0 -> 181112 bytes assets/oldmodels/trackvertical1.b3d | Bin 0 -> 629 bytes assets/oldmodels/trackvertical2.b3d | Bin 0 -> 869 bytes 88 files changed, 1 insertion(+) create mode 100644 assets/advtrains_newlocomotive.xcf create mode 100644 assets/blender/engine-with-animation.blend create mode 100644 assets/blender/gleis/detectorpart.png create mode 100644 assets/blender/gleis/infos/Grafik_weiche.png create mode 100644 assets/blender/gleis/infos/breite create mode 100644 assets/blender/gleis/licence.txt~ create mode 100644 assets/blender/gleis/rail_my.blend create mode 100644 assets/blender/gleis/rail_my.blend1 create mode 100644 assets/blender/gleis/rail_my_rt.blend create mode 100644 assets/blender/gleis/rail_my_rt.blend1 create mode 100644 assets/blender/gleis/rail_my_rt_final.blend create mode 100644 assets/blender/gleis/rail_my_rt_final.blend1 create mode 100644 assets/blender/gleis/rail_my_rt_switches.blend create mode 100644 assets/blender/gleis/rail_my_rt_switches.blend1 create mode 100644 assets/blender/gleis/rail_my_rt_switches2.blend create mode 100644 assets/blender/gleis/rail_my_rt_switches2.blend1 create mode 100644 assets/blender/gleis/rail_together.blend create mode 100644 assets/blender/gleis/rail_together.png create mode 100644 assets/blender/gleis/rail_together2.png create mode 100644 assets/blender/gleis/rail_together3.png create mode 100644 assets/blender/gleis/rail_verticals.blend create mode 100644 assets/blender/gleis/rail_verticals.blend1 create mode 100644 assets/blender/gleis/rail_verticals3.blend create mode 100644 assets/blender/gleis/rail_verticals3.blend1 create mode 100644 assets/blender/gleis/rail_verticals45.blend create mode 100644 assets/blender/gleis/rail_verticals45.blend1 create mode 100644 assets/blender/gleis/rail_verticals45.blend11 create mode 100644 assets/blender/gleis/texturen/rail.png create mode 100644 assets/blender/gleis/texturen/uv.png create mode 100644 assets/blender/industrial/industry_loc.blend create mode 100644 assets/blender/industrial/industry_loc.blend1 create mode 100644 assets/blender/industrial/industry_loc.blend11 create mode 100644 assets/blender/industrial/industry_oil_ wagong.blend create mode 100644 assets/blender/industrial/industry_oil_ wagong.blend1 create mode 100644 assets/blender/industrial/industry_tree_wagong.blend create mode 100644 assets/blender/industrial/industry_tree_wagong.blend1 create mode 100644 assets/blender/industrial/industry_tree_wagong.png create mode 100644 assets/blender/locomotive.blend create mode 100644 assets/blender/magnet_track.blend create mode 100644 assets/blender/mbb/advtrains_wagon_japan.xcf create mode 100644 assets/blender/mbb/modern_japanlocomotive.blend create mode 100644 assets/blender/mbb/modern_japanlocomotive.blend1 create mode 100644 assets/blender/mbb/modern_japanlocomotive.png create mode 100644 assets/blender/mbb/modern_japanlocomotive.xcf create mode 100644 assets/blender/mbb/modern_locomotive.blend create mode 100644 assets/blender/mbb/modern_wagong.blend create mode 100644 assets/blender/mbb/modern_wagong.blend1 create mode 100644 assets/blender/mbb/modern_wagong_uv.blend create mode 100644 assets/blender/mbb/modern_wagong_uv.blend1 create mode 100644 assets/blender/mbb/modern_wagong_uv.png create mode 100644 assets/blender/mbb/prellbock.blend create mode 100644 assets/blender/mbb/prellbock.blend1 create mode 100644 assets/blender/mbb/prellbock.uv.png create mode 100644 assets/blender/mbb/regio-lokomotive.blend create mode 100644 assets/blender/mbb/regio-waron.blend create mode 100644 assets/blender/mbb/retrosignal.blend create mode 100644 assets/blender/mbb/retrosignal.blend1 create mode 100644 assets/blender/mbb/signal(2)_hoch.blend create mode 100644 assets/blender/mbb/signal(2)_unten.blend create mode 100644 assets/blender/mbb/signal.blend create mode 100644 assets/blender/mbb/signal.blend1 create mode 100644 assets/blender/mbb/signal.png create mode 100644 assets/blender/mbb/signal.xcf create mode 100644 assets/blender/mbb/signal2.png create mode 100644 assets/blender/mbb/tr-logo.png create mode 100644 assets/blender/mbb/weichenhebel1.blend create mode 100644 assets/blender/mbb/weichenhebel2.blend create mode 100644 assets/blender/newlocomotive.blend create mode 100644 assets/blender/newlocomotive.blend1 create mode 100644 assets/blender/newlocomotive_uvs.png create mode 100644 assets/blender/newwagon.blend create mode 100644 assets/blender/newwagon.blend1 create mode 100644 assets/blender/newwagon.png create mode 100644 assets/blender/subway-train.blend create mode 100644 assets/blender/subway-train.blend1 create mode 100644 assets/blender/subway-train.png create mode 100644 assets/blender/subway-train.xcf create mode 100644 assets/blender/trackplane.blend create mode 100644 assets/blender/trackvertical1.blend create mode 100644 assets/blender/trackvertical1.blend1 create mode 100644 assets/blender/trackvertical1.png create mode 100644 assets/blender/trackvertical2.blend create mode 100644 assets/blender/trackvertical2.png create mode 100644 assets/init.lua create mode 100644 assets/larger rails.xcf create mode 100644 assets/oldmodels/locomotive.b3d create mode 100644 assets/oldmodels/trackvertical1.b3d create mode 100644 assets/oldmodels/trackvertical2.b3d (limited to 'assets') diff --git a/assets/advtrains_newlocomotive.xcf b/assets/advtrains_newlocomotive.xcf new file mode 100644 index 0000000..9ad5187 Binary files /dev/null and b/assets/advtrains_newlocomotive.xcf differ diff --git a/assets/blender/engine-with-animation.blend b/assets/blender/engine-with-animation.blend new file mode 100644 index 0000000..2649587 Binary files /dev/null and b/assets/blender/engine-with-animation.blend differ diff --git a/assets/blender/gleis/detectorpart.png b/assets/blender/gleis/detectorpart.png new file mode 100644 index 0000000..fc24181 Binary files /dev/null and b/assets/blender/gleis/detectorpart.png differ diff --git a/assets/blender/gleis/infos/Grafik_weiche.png b/assets/blender/gleis/infos/Grafik_weiche.png new file mode 100644 index 0000000..6674eb3 Binary files /dev/null and b/assets/blender/gleis/infos/Grafik_weiche.png differ diff --git a/assets/blender/gleis/infos/breite b/assets/blender/gleis/infos/breite new file mode 100644 index 0000000..b2862c6 --- /dev/null +++ b/assets/blender/gleis/infos/breite @@ -0,0 +1 @@ +1435mm diff --git a/assets/blender/gleis/licence.txt~ b/assets/blender/gleis/licence.txt~ new file mode 100644 index 0000000..e69de29 diff --git a/assets/blender/gleis/rail_my.blend b/assets/blender/gleis/rail_my.blend new file mode 100644 index 0000000..3c741bc Binary files /dev/null and b/assets/blender/gleis/rail_my.blend differ diff --git a/assets/blender/gleis/rail_my.blend1 b/assets/blender/gleis/rail_my.blend1 new file mode 100644 index 0000000..6322856 Binary files /dev/null and b/assets/blender/gleis/rail_my.blend1 differ diff --git a/assets/blender/gleis/rail_my_rt.blend b/assets/blender/gleis/rail_my_rt.blend new file mode 100644 index 0000000..8372a0c Binary files /dev/null and b/assets/blender/gleis/rail_my_rt.blend differ diff --git a/assets/blender/gleis/rail_my_rt.blend1 b/assets/blender/gleis/rail_my_rt.blend1 new file mode 100644 index 0000000..7d0978e Binary files /dev/null and b/assets/blender/gleis/rail_my_rt.blend1 differ diff --git a/assets/blender/gleis/rail_my_rt_final.blend b/assets/blender/gleis/rail_my_rt_final.blend new file mode 100644 index 0000000..d07a65d Binary files /dev/null and b/assets/blender/gleis/rail_my_rt_final.blend differ diff --git a/assets/blender/gleis/rail_my_rt_final.blend1 b/assets/blender/gleis/rail_my_rt_final.blend1 new file mode 100644 index 0000000..8a2d213 Binary files /dev/null and b/assets/blender/gleis/rail_my_rt_final.blend1 differ diff --git a/assets/blender/gleis/rail_my_rt_switches.blend b/assets/blender/gleis/rail_my_rt_switches.blend new file mode 100644 index 0000000..fdce427 Binary files /dev/null and b/assets/blender/gleis/rail_my_rt_switches.blend differ diff --git a/assets/blender/gleis/rail_my_rt_switches.blend1 b/assets/blender/gleis/rail_my_rt_switches.blend1 new file mode 100644 index 0000000..04370ba Binary files /dev/null and b/assets/blender/gleis/rail_my_rt_switches.blend1 differ diff --git a/assets/blender/gleis/rail_my_rt_switches2.blend b/assets/blender/gleis/rail_my_rt_switches2.blend new file mode 100644 index 0000000..9562e4d Binary files /dev/null and b/assets/blender/gleis/rail_my_rt_switches2.blend differ diff --git a/assets/blender/gleis/rail_my_rt_switches2.blend1 b/assets/blender/gleis/rail_my_rt_switches2.blend1 new file mode 100644 index 0000000..07a155f Binary files /dev/null and b/assets/blender/gleis/rail_my_rt_switches2.blend1 differ diff --git a/assets/blender/gleis/rail_together.blend b/assets/blender/gleis/rail_together.blend new file mode 100644 index 0000000..cff51ea Binary files /dev/null and b/assets/blender/gleis/rail_together.blend differ diff --git a/assets/blender/gleis/rail_together.png b/assets/blender/gleis/rail_together.png new file mode 100644 index 0000000..386cd5c Binary files /dev/null and b/assets/blender/gleis/rail_together.png differ diff --git a/assets/blender/gleis/rail_together2.png b/assets/blender/gleis/rail_together2.png new file mode 100644 index 0000000..3effe34 Binary files /dev/null and b/assets/blender/gleis/rail_together2.png differ diff --git a/assets/blender/gleis/rail_together3.png b/assets/blender/gleis/rail_together3.png new file mode 100644 index 0000000..4a183c1 Binary files /dev/null and b/assets/blender/gleis/rail_together3.png differ diff --git a/assets/blender/gleis/rail_verticals.blend b/assets/blender/gleis/rail_verticals.blend new file mode 100644 index 0000000..45c37e1 Binary files /dev/null and b/assets/blender/gleis/rail_verticals.blend differ diff --git a/assets/blender/gleis/rail_verticals.blend1 b/assets/blender/gleis/rail_verticals.blend1 new file mode 100644 index 0000000..320f30b Binary files /dev/null and b/assets/blender/gleis/rail_verticals.blend1 differ diff --git a/assets/blender/gleis/rail_verticals3.blend b/assets/blender/gleis/rail_verticals3.blend new file mode 100644 index 0000000..5d62959 Binary files /dev/null and b/assets/blender/gleis/rail_verticals3.blend differ diff --git a/assets/blender/gleis/rail_verticals3.blend1 b/assets/blender/gleis/rail_verticals3.blend1 new file mode 100644 index 0000000..893f2ea Binary files /dev/null and b/assets/blender/gleis/rail_verticals3.blend1 differ diff --git a/assets/blender/gleis/rail_verticals45.blend b/assets/blender/gleis/rail_verticals45.blend new file mode 100644 index 0000000..a1589e3 Binary files /dev/null and b/assets/blender/gleis/rail_verticals45.blend differ diff --git a/assets/blender/gleis/rail_verticals45.blend1 b/assets/blender/gleis/rail_verticals45.blend1 new file mode 100644 index 0000000..6b44d1c Binary files /dev/null and b/assets/blender/gleis/rail_verticals45.blend1 differ diff --git a/assets/blender/gleis/rail_verticals45.blend11 b/assets/blender/gleis/rail_verticals45.blend11 new file mode 100644 index 0000000..48316e8 Binary files /dev/null and b/assets/blender/gleis/rail_verticals45.blend11 differ diff --git a/assets/blender/gleis/texturen/rail.png b/assets/blender/gleis/texturen/rail.png new file mode 100644 index 0000000..8478cf6 Binary files /dev/null and b/assets/blender/gleis/texturen/rail.png differ diff --git a/assets/blender/gleis/texturen/uv.png b/assets/blender/gleis/texturen/uv.png new file mode 100644 index 0000000..fb0af3e Binary files /dev/null and b/assets/blender/gleis/texturen/uv.png differ diff --git a/assets/blender/industrial/industry_loc.blend b/assets/blender/industrial/industry_loc.blend new file mode 100644 index 0000000..1a6cb2b Binary files /dev/null and b/assets/blender/industrial/industry_loc.blend differ diff --git a/assets/blender/industrial/industry_loc.blend1 b/assets/blender/industrial/industry_loc.blend1 new file mode 100644 index 0000000..af54c3f Binary files /dev/null and b/assets/blender/industrial/industry_loc.blend1 differ diff --git a/assets/blender/industrial/industry_loc.blend11 b/assets/blender/industrial/industry_loc.blend11 new file mode 100644 index 0000000..a089a65 Binary files /dev/null and b/assets/blender/industrial/industry_loc.blend11 differ diff --git a/assets/blender/industrial/industry_oil_ wagong.blend b/assets/blender/industrial/industry_oil_ wagong.blend new file mode 100644 index 0000000..30bde51 Binary files /dev/null and b/assets/blender/industrial/industry_oil_ wagong.blend differ diff --git a/assets/blender/industrial/industry_oil_ wagong.blend1 b/assets/blender/industrial/industry_oil_ wagong.blend1 new file mode 100644 index 0000000..849971d Binary files /dev/null and b/assets/blender/industrial/industry_oil_ wagong.blend1 differ diff --git a/assets/blender/industrial/industry_tree_wagong.blend b/assets/blender/industrial/industry_tree_wagong.blend new file mode 100644 index 0000000..23de208 Binary files /dev/null and b/assets/blender/industrial/industry_tree_wagong.blend differ diff --git a/assets/blender/industrial/industry_tree_wagong.blend1 b/assets/blender/industrial/industry_tree_wagong.blend1 new file mode 100644 index 0000000..bf2c9ed Binary files /dev/null and b/assets/blender/industrial/industry_tree_wagong.blend1 differ diff --git a/assets/blender/industrial/industry_tree_wagong.png b/assets/blender/industrial/industry_tree_wagong.png new file mode 100644 index 0000000..87109dd Binary files /dev/null and b/assets/blender/industrial/industry_tree_wagong.png differ diff --git a/assets/blender/locomotive.blend b/assets/blender/locomotive.blend new file mode 100644 index 0000000..8fd6059 Binary files /dev/null and b/assets/blender/locomotive.blend differ diff --git a/assets/blender/magnet_track.blend b/assets/blender/magnet_track.blend new file mode 100644 index 0000000..0ab14e7 Binary files /dev/null and b/assets/blender/magnet_track.blend differ diff --git a/assets/blender/mbb/advtrains_wagon_japan.xcf b/assets/blender/mbb/advtrains_wagon_japan.xcf new file mode 100644 index 0000000..4fc88c0 Binary files /dev/null and b/assets/blender/mbb/advtrains_wagon_japan.xcf differ diff --git a/assets/blender/mbb/modern_japanlocomotive.blend b/assets/blender/mbb/modern_japanlocomotive.blend new file mode 100644 index 0000000..6eb8f3d Binary files /dev/null and b/assets/blender/mbb/modern_japanlocomotive.blend differ diff --git a/assets/blender/mbb/modern_japanlocomotive.blend1 b/assets/blender/mbb/modern_japanlocomotive.blend1 new file mode 100644 index 0000000..a2e745d Binary files /dev/null and b/assets/blender/mbb/modern_japanlocomotive.blend1 differ diff --git a/assets/blender/mbb/modern_japanlocomotive.png b/assets/blender/mbb/modern_japanlocomotive.png new file mode 100644 index 0000000..b80d16f Binary files /dev/null and b/assets/blender/mbb/modern_japanlocomotive.png differ diff --git a/assets/blender/mbb/modern_japanlocomotive.xcf b/assets/blender/mbb/modern_japanlocomotive.xcf new file mode 100644 index 0000000..bb28534 Binary files /dev/null and b/assets/blender/mbb/modern_japanlocomotive.xcf differ diff --git a/assets/blender/mbb/modern_locomotive.blend b/assets/blender/mbb/modern_locomotive.blend new file mode 100644 index 0000000..8e72233 Binary files /dev/null and b/assets/blender/mbb/modern_locomotive.blend differ diff --git a/assets/blender/mbb/modern_wagong.blend b/assets/blender/mbb/modern_wagong.blend new file mode 100644 index 0000000..f32710a Binary files /dev/null and b/assets/blender/mbb/modern_wagong.blend differ diff --git a/assets/blender/mbb/modern_wagong.blend1 b/assets/blender/mbb/modern_wagong.blend1 new file mode 100644 index 0000000..376831c Binary files /dev/null and b/assets/blender/mbb/modern_wagong.blend1 differ diff --git a/assets/blender/mbb/modern_wagong_uv.blend b/assets/blender/mbb/modern_wagong_uv.blend new file mode 100644 index 0000000..4c10fb3 Binary files /dev/null and b/assets/blender/mbb/modern_wagong_uv.blend differ diff --git a/assets/blender/mbb/modern_wagong_uv.blend1 b/assets/blender/mbb/modern_wagong_uv.blend1 new file mode 100644 index 0000000..ce77416 Binary files /dev/null and b/assets/blender/mbb/modern_wagong_uv.blend1 differ diff --git a/assets/blender/mbb/modern_wagong_uv.png b/assets/blender/mbb/modern_wagong_uv.png new file mode 100644 index 0000000..68018ea Binary files /dev/null and b/assets/blender/mbb/modern_wagong_uv.png differ diff --git a/assets/blender/mbb/prellbock.blend b/assets/blender/mbb/prellbock.blend new file mode 100644 index 0000000..1c20ab2 Binary files /dev/null and b/assets/blender/mbb/prellbock.blend differ diff --git a/assets/blender/mbb/prellbock.blend1 b/assets/blender/mbb/prellbock.blend1 new file mode 100644 index 0000000..981538e Binary files /dev/null and b/assets/blender/mbb/prellbock.blend1 differ diff --git a/assets/blender/mbb/prellbock.uv.png b/assets/blender/mbb/prellbock.uv.png new file mode 100644 index 0000000..7730753 Binary files /dev/null and b/assets/blender/mbb/prellbock.uv.png differ diff --git a/assets/blender/mbb/regio-lokomotive.blend b/assets/blender/mbb/regio-lokomotive.blend new file mode 100644 index 0000000..210e60e Binary files /dev/null and b/assets/blender/mbb/regio-lokomotive.blend differ diff --git a/assets/blender/mbb/regio-waron.blend b/assets/blender/mbb/regio-waron.blend new file mode 100644 index 0000000..19b07ce Binary files /dev/null and b/assets/blender/mbb/regio-waron.blend differ diff --git a/assets/blender/mbb/retrosignal.blend b/assets/blender/mbb/retrosignal.blend new file mode 100644 index 0000000..b795215 Binary files /dev/null and b/assets/blender/mbb/retrosignal.blend differ diff --git a/assets/blender/mbb/retrosignal.blend1 b/assets/blender/mbb/retrosignal.blend1 new file mode 100644 index 0000000..94af470 Binary files /dev/null and b/assets/blender/mbb/retrosignal.blend1 differ diff --git a/assets/blender/mbb/signal(2)_hoch.blend b/assets/blender/mbb/signal(2)_hoch.blend new file mode 100644 index 0000000..70391f6 Binary files /dev/null and b/assets/blender/mbb/signal(2)_hoch.blend differ diff --git a/assets/blender/mbb/signal(2)_unten.blend b/assets/blender/mbb/signal(2)_unten.blend new file mode 100644 index 0000000..4e917bc Binary files /dev/null and b/assets/blender/mbb/signal(2)_unten.blend differ diff --git a/assets/blender/mbb/signal.blend b/assets/blender/mbb/signal.blend new file mode 100644 index 0000000..135c7b4 Binary files /dev/null and b/assets/blender/mbb/signal.blend differ diff --git a/assets/blender/mbb/signal.blend1 b/assets/blender/mbb/signal.blend1 new file mode 100644 index 0000000..63a8c99 Binary files /dev/null and b/assets/blender/mbb/signal.blend1 differ diff --git a/assets/blender/mbb/signal.png b/assets/blender/mbb/signal.png new file mode 100644 index 0000000..779cdda Binary files /dev/null and b/assets/blender/mbb/signal.png differ diff --git a/assets/blender/mbb/signal.xcf b/assets/blender/mbb/signal.xcf new file mode 100644 index 0000000..f667739 Binary files /dev/null and b/assets/blender/mbb/signal.xcf differ diff --git a/assets/blender/mbb/signal2.png b/assets/blender/mbb/signal2.png new file mode 100644 index 0000000..7af4e2d Binary files /dev/null and b/assets/blender/mbb/signal2.png differ diff --git a/assets/blender/mbb/tr-logo.png b/assets/blender/mbb/tr-logo.png new file mode 100644 index 0000000..9bc0f10 Binary files /dev/null and b/assets/blender/mbb/tr-logo.png differ diff --git a/assets/blender/mbb/weichenhebel1.blend b/assets/blender/mbb/weichenhebel1.blend new file mode 100644 index 0000000..70b997d Binary files /dev/null and b/assets/blender/mbb/weichenhebel1.blend differ diff --git a/assets/blender/mbb/weichenhebel2.blend b/assets/blender/mbb/weichenhebel2.blend new file mode 100644 index 0000000..c1c3aac Binary files /dev/null and b/assets/blender/mbb/weichenhebel2.blend differ diff --git a/assets/blender/newlocomotive.blend b/assets/blender/newlocomotive.blend new file mode 100644 index 0000000..858882b Binary files /dev/null and b/assets/blender/newlocomotive.blend differ diff --git a/assets/blender/newlocomotive.blend1 b/assets/blender/newlocomotive.blend1 new file mode 100644 index 0000000..4b8b24f Binary files /dev/null and b/assets/blender/newlocomotive.blend1 differ diff --git a/assets/blender/newlocomotive_uvs.png b/assets/blender/newlocomotive_uvs.png new file mode 100644 index 0000000..879be65 Binary files /dev/null and b/assets/blender/newlocomotive_uvs.png differ diff --git a/assets/blender/newwagon.blend b/assets/blender/newwagon.blend new file mode 100644 index 0000000..1cedc55 Binary files /dev/null and b/assets/blender/newwagon.blend differ diff --git a/assets/blender/newwagon.blend1 b/assets/blender/newwagon.blend1 new file mode 100644 index 0000000..eb30fde Binary files /dev/null and b/assets/blender/newwagon.blend1 differ diff --git a/assets/blender/newwagon.png b/assets/blender/newwagon.png new file mode 100644 index 0000000..812bc32 Binary files /dev/null and b/assets/blender/newwagon.png differ diff --git a/assets/blender/subway-train.blend b/assets/blender/subway-train.blend new file mode 100644 index 0000000..690d87b Binary files /dev/null and b/assets/blender/subway-train.blend differ diff --git a/assets/blender/subway-train.blend1 b/assets/blender/subway-train.blend1 new file mode 100644 index 0000000..86d1f92 Binary files /dev/null and b/assets/blender/subway-train.blend1 differ diff --git a/assets/blender/subway-train.png b/assets/blender/subway-train.png new file mode 100644 index 0000000..d0b9731 Binary files /dev/null and b/assets/blender/subway-train.png differ diff --git a/assets/blender/subway-train.xcf b/assets/blender/subway-train.xcf new file mode 100644 index 0000000..775b87c Binary files /dev/null and b/assets/blender/subway-train.xcf differ diff --git a/assets/blender/trackplane.blend b/assets/blender/trackplane.blend new file mode 100644 index 0000000..79365f7 Binary files /dev/null and b/assets/blender/trackplane.blend differ diff --git a/assets/blender/trackvertical1.blend b/assets/blender/trackvertical1.blend new file mode 100644 index 0000000..fca6742 Binary files /dev/null and b/assets/blender/trackvertical1.blend differ diff --git a/assets/blender/trackvertical1.blend1 b/assets/blender/trackvertical1.blend1 new file mode 100644 index 0000000..b146b56 Binary files /dev/null and b/assets/blender/trackvertical1.blend1 differ diff --git a/assets/blender/trackvertical1.png b/assets/blender/trackvertical1.png new file mode 100644 index 0000000..a998dcb Binary files /dev/null and b/assets/blender/trackvertical1.png differ diff --git a/assets/blender/trackvertical2.blend b/assets/blender/trackvertical2.blend new file mode 100644 index 0000000..a066b84 Binary files /dev/null and b/assets/blender/trackvertical2.blend differ diff --git a/assets/blender/trackvertical2.png b/assets/blender/trackvertical2.png new file mode 100644 index 0000000..43142f9 Binary files /dev/null and b/assets/blender/trackvertical2.png differ diff --git a/assets/init.lua b/assets/init.lua new file mode 100644 index 0000000..e69de29 diff --git a/assets/larger rails.xcf b/assets/larger rails.xcf new file mode 100644 index 0000000..42ae592 Binary files /dev/null and b/assets/larger rails.xcf differ diff --git a/assets/oldmodels/locomotive.b3d b/assets/oldmodels/locomotive.b3d new file mode 100644 index 0000000..5e16be3 Binary files /dev/null and b/assets/oldmodels/locomotive.b3d differ diff --git a/assets/oldmodels/trackvertical1.b3d b/assets/oldmodels/trackvertical1.b3d new file mode 100644 index 0000000..5620f60 Binary files /dev/null and b/assets/oldmodels/trackvertical1.b3d differ diff --git a/assets/oldmodels/trackvertical2.b3d b/assets/oldmodels/trackvertical2.b3d new file mode 100644 index 0000000..22dbb20 Binary files /dev/null and b/assets/oldmodels/trackvertical2.b3d differ -- cgit v1.2.3 From 9bc069f825daded364b2b52d443c8cb7b45a5a15 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Fri, 6 Jan 2017 17:54:16 +0100 Subject: Add fancy passenger wagon --- advtrains/advtrains_train_steam/init.lua | 25 ++++++++++++++++----- .../models/advtrains_passenger_wagon.b3d | Bin 0 -> 341965 bytes .../textures/advtrains_wagon.png | Bin 35724 -> 42023 bytes assets/wagonfancytexture.png | Bin 0 -> 42023 bytes assets/wagong_fancy.blend | Bin 0 -> 1044484 bytes assets/wagong_fancy.blend1 | Bin 0 -> 1044524 bytes 6 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 advtrains/advtrains_train_steam/models/advtrains_passenger_wagon.b3d create mode 100644 assets/wagonfancytexture.png create mode 100644 assets/wagong_fancy.blend create mode 100644 assets/wagong_fancy.blend1 (limited to 'assets') diff --git a/advtrains/advtrains_train_steam/init.lua b/advtrains/advtrains_train_steam/init.lua index ca52516..5010902 100644 --- a/advtrains/advtrains_train_steam/init.lua +++ b/advtrains/advtrains_train_steam/init.lua @@ -57,19 +57,34 @@ advtrains.register_wagon("newlocomotive", { drops={"default:steelblock 4"}, }, "Steam Engine", "advtrains_newlocomotive_inv.png") advtrains.register_wagon("wagon_default", { - mesh="advtrains_wagon.b3d", + mesh="advtrains_passenger_wagon.b3d", textures = {"advtrains_wagon.png"}, drives_on={default=true}, max_speed=10, seats = { { - name="Default Seat", - attach_offset={x=0, y=10, z=0}, - view_offset={x=0, y=6, z=0}, + name="1", + attach_offset={x=-4, y=8, z=8}, + view_offset={x=0, y=0, z=0}, + }, + { + name="2", + attach_offset={x=4, y=8, z=8}, + view_offset={x=0, y=0, z=0}, + }, + { + name="3", + attach_offset={x=-4, y=8, z=-8}, + view_offset={x=0, y=0, z=0}, + }, + { + name="4", + attach_offset={x=4, y=8, z=-8}, + view_offset={x=0, y=0, z=0}, }, }, visual_size = {x=1, y=1}, - wagon_span=1.8, + wagon_span=3.1, collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0}, drops={"default:steelblock 4"}, }, "Passenger Wagon", "advtrains_wagon_inv.png") diff --git a/advtrains/advtrains_train_steam/models/advtrains_passenger_wagon.b3d b/advtrains/advtrains_train_steam/models/advtrains_passenger_wagon.b3d new file mode 100644 index 0000000..bb057f8 Binary files /dev/null and b/advtrains/advtrains_train_steam/models/advtrains_passenger_wagon.b3d differ diff --git a/advtrains/advtrains_train_steam/textures/advtrains_wagon.png b/advtrains/advtrains_train_steam/textures/advtrains_wagon.png index c37c979..c850518 100644 Binary files a/advtrains/advtrains_train_steam/textures/advtrains_wagon.png and b/advtrains/advtrains_train_steam/textures/advtrains_wagon.png differ diff --git a/assets/wagonfancytexture.png b/assets/wagonfancytexture.png new file mode 100644 index 0000000..c850518 Binary files /dev/null and b/assets/wagonfancytexture.png differ diff --git a/assets/wagong_fancy.blend b/assets/wagong_fancy.blend new file mode 100644 index 0000000..f9e44d5 Binary files /dev/null and b/assets/wagong_fancy.blend differ diff --git a/assets/wagong_fancy.blend1 b/assets/wagong_fancy.blend1 new file mode 100644 index 0000000..5c6c328 Binary files /dev/null and b/assets/wagong_fancy.blend1 differ -- cgit v1.2.3 From 33c3631ef5594b316254b308bcccdf46ef6df09f Mon Sep 17 00:00:00 2001 From: orwell96 Date: Tue, 17 Jan 2017 15:44:11 +0100 Subject: Download recent contributions and put them into the assets directory --- assets/AdvTrains_Additions.zip | Bin 0 -> 889352 bytes assets/Weichenhebel-CooleLokAnimiert.zip | Bin 0 -> 154594 bytes assets/advtrains_wagon.png | Bin 0 -> 72273 bytes assets/dampflock4.blend | Bin 0 -> 1000628 bytes assets/magleves_lockomotive.blend | Bin 0 -> 747680 bytes assets/magleves_track.blend | Bin 0 -> 464960 bytes assets/magleves_wagon.blend | Bin 0 -> 709904 bytes assets/mbbrailtextures/advtrains_dtrack_rail.png | Bin 0 -> 4582 bytes assets/mbbrailtextures/advtrains_dtrack_rail_atc.png | Bin 0 -> 4596 bytes .../advtrains_dtrack_rail_detector_on.png | Bin 0 -> 4579 bytes assets/uban_fancy.blend | Bin 0 -> 1020740 bytes 11 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 assets/AdvTrains_Additions.zip create mode 100644 assets/Weichenhebel-CooleLokAnimiert.zip create mode 100644 assets/advtrains_wagon.png create mode 100644 assets/dampflock4.blend create mode 100644 assets/magleves_lockomotive.blend create mode 100644 assets/magleves_track.blend create mode 100644 assets/magleves_wagon.blend create mode 100644 assets/mbbrailtextures/advtrains_dtrack_rail.png create mode 100644 assets/mbbrailtextures/advtrains_dtrack_rail_atc.png create mode 100644 assets/mbbrailtextures/advtrains_dtrack_rail_detector_on.png create mode 100644 assets/uban_fancy.blend (limited to 'assets') diff --git a/assets/AdvTrains_Additions.zip b/assets/AdvTrains_Additions.zip new file mode 100644 index 0000000..7588acf Binary files /dev/null and b/assets/AdvTrains_Additions.zip differ diff --git a/assets/Weichenhebel-CooleLokAnimiert.zip b/assets/Weichenhebel-CooleLokAnimiert.zip new file mode 100644 index 0000000..1175880 Binary files /dev/null and b/assets/Weichenhebel-CooleLokAnimiert.zip differ diff --git a/assets/advtrains_wagon.png b/assets/advtrains_wagon.png new file mode 100644 index 0000000..143154b Binary files /dev/null and b/assets/advtrains_wagon.png differ diff --git a/assets/dampflock4.blend b/assets/dampflock4.blend new file mode 100644 index 0000000..883c3d3 Binary files /dev/null and b/assets/dampflock4.blend differ diff --git a/assets/magleves_lockomotive.blend b/assets/magleves_lockomotive.blend new file mode 100644 index 0000000..8c82b00 Binary files /dev/null and b/assets/magleves_lockomotive.blend differ diff --git a/assets/magleves_track.blend b/assets/magleves_track.blend new file mode 100644 index 0000000..82f11ef Binary files /dev/null and b/assets/magleves_track.blend differ diff --git a/assets/magleves_wagon.blend b/assets/magleves_wagon.blend new file mode 100644 index 0000000..cc89531 Binary files /dev/null and b/assets/magleves_wagon.blend differ diff --git a/assets/mbbrailtextures/advtrains_dtrack_rail.png b/assets/mbbrailtextures/advtrains_dtrack_rail.png new file mode 100644 index 0000000..bd0c217 Binary files /dev/null and b/assets/mbbrailtextures/advtrains_dtrack_rail.png differ diff --git a/assets/mbbrailtextures/advtrains_dtrack_rail_atc.png b/assets/mbbrailtextures/advtrains_dtrack_rail_atc.png new file mode 100644 index 0000000..7e4c20f Binary files /dev/null and b/assets/mbbrailtextures/advtrains_dtrack_rail_atc.png differ diff --git a/assets/mbbrailtextures/advtrains_dtrack_rail_detector_on.png b/assets/mbbrailtextures/advtrains_dtrack_rail_detector_on.png new file mode 100644 index 0000000..c878324 Binary files /dev/null and b/assets/mbbrailtextures/advtrains_dtrack_rail_detector_on.png differ diff --git a/assets/uban_fancy.blend b/assets/uban_fancy.blend new file mode 100644 index 0000000..f049966 Binary files /dev/null and b/assets/uban_fancy.blend differ -- cgit v1.2.3 From 9c400f7d435b4b1c303f1dd5ac31a8a52b263355 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Tue, 17 Jan 2017 20:02:25 +0100 Subject: Model, animate, texture and integrate new subway wagon engine follows! --- advtrains/advtrains_train_subway/init.lua | 10 +++++++--- .../models/advtrains_subway_train.b3d | Bin 95856 -> 0 bytes .../models/advtrains_subway_wagon.b3d | Bin 0 -> 459309 bytes .../textures/advtrains_subway_train.png | Bin 12002 -> 0 bytes .../textures/advtrains_subway_train_inv.png | Bin 900 -> 0 bytes .../textures/advtrains_subway_wagon.png | Bin 0 -> 3618 bytes .../textures/advtrains_subway_wagon_inv.png | Bin 0 -> 900 bytes assets/blender/subway-train.blend | Bin 536268 -> 518888 bytes assets/blender/subway-train.blend1 | Bin 538188 -> 536268 bytes assets/blender/subway-train_animate.blend | Bin 0 -> 568668 bytes assets/blender/subway-train_animate.blend1 | Bin 0 -> 558980 bytes assets/blender/subway-train_animate_mirrored.blend | Bin 0 -> 798328 bytes .../blender/subway-train_animate_mirrored.blend1 | Bin 0 -> 863656 bytes .../subway-train_animate_mirrored_solidify.blend | Bin 0 -> 879916 bytes .../subway-train_animate_mirrored_solidify.blend1 | Bin 0 -> 879884 bytes ...subway-train_animate_mirrored_solidify_uv.blend | Bin 0 -> 832204 bytes ...ubway-train_animate_mirrored_solidify_uv.blend1 | Bin 0 -> 832396 bytes .../subway-train_animate_mirrored_solidify_uv.png | Bin 0 -> 177111 bytes .../subway-train_animate_mirrored_solidify_uv.xcf | Bin 0 -> 369791 bytes 19 files changed, 7 insertions(+), 3 deletions(-) delete mode 100644 advtrains/advtrains_train_subway/models/advtrains_subway_train.b3d create mode 100644 advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d delete mode 100644 advtrains/advtrains_train_subway/textures/advtrains_subway_train.png delete mode 100644 advtrains/advtrains_train_subway/textures/advtrains_subway_train_inv.png create mode 100644 advtrains/advtrains_train_subway/textures/advtrains_subway_wagon.png create mode 100644 advtrains/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png create mode 100644 assets/blender/subway-train_animate.blend create mode 100644 assets/blender/subway-train_animate.blend1 create mode 100644 assets/blender/subway-train_animate_mirrored.blend create mode 100644 assets/blender/subway-train_animate_mirrored.blend1 create mode 100644 assets/blender/subway-train_animate_mirrored_solidify.blend create mode 100644 assets/blender/subway-train_animate_mirrored_solidify.blend1 create mode 100644 assets/blender/subway-train_animate_mirrored_solidify_uv.blend create mode 100644 assets/blender/subway-train_animate_mirrored_solidify_uv.blend1 create mode 100644 assets/blender/subway-train_animate_mirrored_solidify_uv.png create mode 100644 assets/blender/subway-train_animate_mirrored_solidify_uv.xcf (limited to 'assets') diff --git a/advtrains/advtrains_train_subway/init.lua b/advtrains/advtrains_train_subway/init.lua index b5bdb18..c68395c 100644 --- a/advtrains/advtrains_train_subway/init.lua +++ b/advtrains/advtrains_train_subway/init.lua @@ -1,7 +1,7 @@ advtrains.register_wagon("subway_wagon", { - mesh="advtrains_subway_train.b3d", - textures = {"advtrains_subway_train.png"}, + mesh="advtrains_subway_wagon.b3d", + textures = {"advtrains_subway_wagon.png"}, drives_on={default=true}, max_speed=15, seats = { @@ -17,7 +17,11 @@ advtrains.register_wagon("subway_wagon", { collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0}, is_locomotive=true, drops={"default:steelblock 4"}, -}, "Subway Passenger Wagon", "advtrains_subway_train_inv.png") + --custom_on_activate = function(self, dtime_s) + -- atprint("subway custom_on_activate") + -- self.object:set_animation({x=1,y=80}, 15, 0, true) + --end, +}, "Subway Passenger Wagon", "advtrains_subway_wagon_inv.png") --wagons minetest.register_craft({ diff --git a/advtrains/advtrains_train_subway/models/advtrains_subway_train.b3d b/advtrains/advtrains_train_subway/models/advtrains_subway_train.b3d deleted file mode 100644 index a824d33..0000000 Binary files a/advtrains/advtrains_train_subway/models/advtrains_subway_train.b3d and /dev/null differ diff --git a/advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d b/advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d new file mode 100644 index 0000000..8f35769 Binary files /dev/null and b/advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d differ diff --git a/advtrains/advtrains_train_subway/textures/advtrains_subway_train.png b/advtrains/advtrains_train_subway/textures/advtrains_subway_train.png deleted file mode 100644 index 1d569f3..0000000 Binary files a/advtrains/advtrains_train_subway/textures/advtrains_subway_train.png and /dev/null differ diff --git a/advtrains/advtrains_train_subway/textures/advtrains_subway_train_inv.png b/advtrains/advtrains_train_subway/textures/advtrains_subway_train_inv.png deleted file mode 100644 index 1d0e809..0000000 Binary files a/advtrains/advtrains_train_subway/textures/advtrains_subway_train_inv.png and /dev/null differ diff --git a/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon.png b/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon.png new file mode 100644 index 0000000..079d797 Binary files /dev/null and b/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon.png differ diff --git a/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png b/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png new file mode 100644 index 0000000..1d0e809 Binary files /dev/null and b/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png differ diff --git a/assets/blender/subway-train.blend b/assets/blender/subway-train.blend index 690d87b..01bb233 100644 Binary files a/assets/blender/subway-train.blend and b/assets/blender/subway-train.blend differ diff --git a/assets/blender/subway-train.blend1 b/assets/blender/subway-train.blend1 index 86d1f92..690d87b 100644 Binary files a/assets/blender/subway-train.blend1 and b/assets/blender/subway-train.blend1 differ diff --git a/assets/blender/subway-train_animate.blend b/assets/blender/subway-train_animate.blend new file mode 100644 index 0000000..75cdc52 Binary files /dev/null and b/assets/blender/subway-train_animate.blend differ diff --git a/assets/blender/subway-train_animate.blend1 b/assets/blender/subway-train_animate.blend1 new file mode 100644 index 0000000..04171fc Binary files /dev/null and b/assets/blender/subway-train_animate.blend1 differ diff --git a/assets/blender/subway-train_animate_mirrored.blend b/assets/blender/subway-train_animate_mirrored.blend new file mode 100644 index 0000000..aa11c34 Binary files /dev/null and b/assets/blender/subway-train_animate_mirrored.blend differ diff --git a/assets/blender/subway-train_animate_mirrored.blend1 b/assets/blender/subway-train_animate_mirrored.blend1 new file mode 100644 index 0000000..4d64915 Binary files /dev/null and b/assets/blender/subway-train_animate_mirrored.blend1 differ diff --git a/assets/blender/subway-train_animate_mirrored_solidify.blend b/assets/blender/subway-train_animate_mirrored_solidify.blend new file mode 100644 index 0000000..7a25b6f Binary files /dev/null and b/assets/blender/subway-train_animate_mirrored_solidify.blend differ diff --git a/assets/blender/subway-train_animate_mirrored_solidify.blend1 b/assets/blender/subway-train_animate_mirrored_solidify.blend1 new file mode 100644 index 0000000..f81e303 Binary files /dev/null and b/assets/blender/subway-train_animate_mirrored_solidify.blend1 differ diff --git a/assets/blender/subway-train_animate_mirrored_solidify_uv.blend b/assets/blender/subway-train_animate_mirrored_solidify_uv.blend new file mode 100644 index 0000000..b05b0a5 Binary files /dev/null and b/assets/blender/subway-train_animate_mirrored_solidify_uv.blend differ diff --git a/assets/blender/subway-train_animate_mirrored_solidify_uv.blend1 b/assets/blender/subway-train_animate_mirrored_solidify_uv.blend1 new file mode 100644 index 0000000..145137b Binary files /dev/null and b/assets/blender/subway-train_animate_mirrored_solidify_uv.blend1 differ diff --git a/assets/blender/subway-train_animate_mirrored_solidify_uv.png b/assets/blender/subway-train_animate_mirrored_solidify_uv.png new file mode 100644 index 0000000..e63a7f2 Binary files /dev/null and b/assets/blender/subway-train_animate_mirrored_solidify_uv.png differ diff --git a/assets/blender/subway-train_animate_mirrored_solidify_uv.xcf b/assets/blender/subway-train_animate_mirrored_solidify_uv.xcf new file mode 100644 index 0000000..42adace Binary files /dev/null and b/assets/blender/subway-train_animate_mirrored_solidify_uv.xcf differ -- cgit v1.2.3 From b6e2aeea71394431889e9b554f190dda4adb0305 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Tue, 17 Jan 2017 21:54:50 +0100 Subject: Add animation for steam engine I needed to completely rewrite the animation because irrlicht couldn't handle the animation NathanS created. --- advtrains/advtrains_train_steam/init.lua | 13 +++++++------ .../models/advtrains_engine_steam.b3d | Bin 298687 -> 437126 bytes .../textures/advtrains_newlocomotive.png | Bin 31800 -> 31915 bytes assets/blender/engine-with-animation_newtry.blend | Bin 0 -> 638904 bytes assets/blender/engine-with-animation_newtry.blend1 | Bin 0 -> 615608 bytes 5 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 assets/blender/engine-with-animation_newtry.blend create mode 100644 assets/blender/engine-with-animation_newtry.blend1 (limited to 'assets') diff --git a/advtrains/advtrains_train_steam/init.lua b/advtrains/advtrains_train_steam/init.lua index 5010902..232ffe1 100644 --- a/advtrains/advtrains_train_steam/init.lua +++ b/advtrains/advtrains_train_steam/init.lua @@ -21,12 +21,13 @@ advtrains.register_wagon("newlocomotive", { visual_size = {x=1, y=1}, wagon_span=1.85, collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0}, - --update_animation=function(self, velocity) - --if self.old_anim_velocity~=advtrains.abs_ceil(velocity) then - -- self.object:set_animation({x=1,y=60}, 100)--math.floor(velocity)) - --self.old_anim_velocity=advtrains.abs_ceil(velocity) - --end - --end, + update_animation=function(self, velocity) + if self.old_anim_velocity~=advtrains.abs_ceil(velocity) then + atprint("set_anim",advtrains.abs_ceil(velocity)*15) + self.object:set_animation({x=1,y=80}, advtrains.abs_ceil(velocity)*15, 0, true) + self.old_anim_velocity=advtrains.abs_ceil(velocity) + end + end, custom_on_activate = function(self, staticdata_table, dtime_s) minetest.add_particlespawner({ amount = 10, diff --git a/advtrains/advtrains_train_steam/models/advtrains_engine_steam.b3d b/advtrains/advtrains_train_steam/models/advtrains_engine_steam.b3d index 36bdd15..6a92f57 100644 Binary files a/advtrains/advtrains_train_steam/models/advtrains_engine_steam.b3d and b/advtrains/advtrains_train_steam/models/advtrains_engine_steam.b3d differ diff --git a/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive.png b/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive.png index e461bc7..4b27e77 100644 Binary files a/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive.png and b/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive.png differ diff --git a/assets/blender/engine-with-animation_newtry.blend b/assets/blender/engine-with-animation_newtry.blend new file mode 100644 index 0000000..101dc71 Binary files /dev/null and b/assets/blender/engine-with-animation_newtry.blend differ diff --git a/assets/blender/engine-with-animation_newtry.blend1 b/assets/blender/engine-with-animation_newtry.blend1 new file mode 100644 index 0000000..77d82d4 Binary files /dev/null and b/assets/blender/engine-with-animation_newtry.blend1 differ -- cgit v1.2.3 From 2f5ebd63c38932dbda30b96e8ce20e70474b1f15 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Tue, 17 Jan 2017 22:31:29 +0100 Subject: Add detailed steam engine contributed by mbb and Krokoschlange --- advtrains/advtrains_train_steam/init.lua | 65 ++++++++++++++++++++- .../models/advtrains_detailed_steam_engine.b3d | Bin 0 -> 468002 bytes .../textures/advtrains_detailed_steam_engine.png | Bin 0 -> 61988 bytes .../textures/advtrains_engine_steam.png | Bin 0 -> 31915 bytes .../textures/advtrains_engine_steam_inv.png | Bin 0 -> 469 bytes .../textures/advtrains_newlocomotive.png | Bin 31915 -> 0 bytes .../textures/advtrains_newlocomotive_inv.png | Bin 469 -> 0 bytes .../dampflock4pipe_animated.blend | Bin 0 -> 859028 bytes .../dampflock4pipe_animated.blend1 | Bin 0 -> 859028 bytes 9 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 advtrains/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d create mode 100644 advtrains/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png create mode 100644 advtrains/advtrains_train_steam/textures/advtrains_engine_steam.png create mode 100644 advtrains/advtrains_train_steam/textures/advtrains_engine_steam_inv.png delete mode 100644 advtrains/advtrains_train_steam/textures/advtrains_newlocomotive.png delete mode 100644 advtrains/advtrains_train_steam/textures/advtrains_newlocomotive_inv.png create mode 100644 assets/Weichenhebel-CooleLokAnimiert/dampflock4pipe_animated.blend create mode 100644 assets/Weichenhebel-CooleLokAnimiert/dampflock4pipe_animated.blend1 (limited to 'assets') diff --git a/advtrains/advtrains_train_steam/init.lua b/advtrains/advtrains_train_steam/init.lua index 232ffe1..22f525f 100644 --- a/advtrains/advtrains_train_steam/init.lua +++ b/advtrains/advtrains_train_steam/init.lua @@ -1,6 +1,6 @@ advtrains.register_wagon("newlocomotive", { mesh="advtrains_engine_steam.b3d", - textures = {"advtrains_newlocomotive.png"}, + textures = {"advtrains_engine_steam.png"}, is_locomotive=true, drives_on={default=true}, max_speed=10, @@ -23,7 +23,6 @@ advtrains.register_wagon("newlocomotive", { collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0}, update_animation=function(self, velocity) if self.old_anim_velocity~=advtrains.abs_ceil(velocity) then - atprint("set_anim",advtrains.abs_ceil(velocity)*15) self.object:set_animation({x=1,y=80}, advtrains.abs_ceil(velocity)*15, 0, true) self.old_anim_velocity=advtrains.abs_ceil(velocity) end @@ -56,7 +55,67 @@ advtrains.register_wagon("newlocomotive", { }) end, drops={"default:steelblock 4"}, -}, "Steam Engine", "advtrains_newlocomotive_inv.png") +}, "Steam Engine", "advtrains_engine_steam_inv.png") + +advtrains.register_wagon("detailed_steam_engine", { + mesh="advtrains_detailed_steam_engine.b3d", + textures = {"advtrains_detailed_steam_engine.png"}, + is_locomotive=true, + drives_on={default=true}, + max_speed=10, + seats = { + { + name="Driver Stand (left)", + attach_offset={x=-5, y=10, z=-10}, + view_offset={x=0, y=6, z=0}, + driving_ctrl_access=true, + }, + { + name="Driver Stand (right)", + attach_offset={x=5, y=10, z=-10}, + view_offset={x=0, y=6, z=0}, + driving_ctrl_access=true, + }, + }, + visual_size = {x=1, y=1}, + wagon_span=2.05, + collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0}, + update_animation=function(self, velocity) + if self.old_anim_velocity~=advtrains.abs_ceil(velocity) then + self.object:set_animation({x=1,y=80}, advtrains.abs_ceil(velocity)*15, 0, true) + self.old_anim_velocity=advtrains.abs_ceil(velocity) + end + end, + custom_on_activate = function(self, staticdata_table, dtime_s) + minetest.add_particlespawner({ + amount = 10, + time = 0, + -- ^ If time is 0 has infinite lifespan and spawns the amount on a per-second base + minpos = {x=0, y=2.3, z=1.45}, + maxpos = {x=0, y=2.3, z=1.4}, + minvel = {x=-0.2, y=1.8, z=-0.2}, + maxvel = {x=0.2, y=2, z=0.2}, + minacc = {x=0, y=-0.1, z=0}, + maxacc = {x=0, y=-0.3, z=0}, + minexptime = 2, + maxexptime = 4, + minsize = 1, + maxsize = 5, + -- ^ The particle's properties are random values in between the bounds: + -- ^ minpos/maxpos, minvel/maxvel (velocity), minacc/maxacc (acceleration), + -- ^ minsize/maxsize, minexptime/maxexptime (expirationtime) + collisiondetection = true, + -- ^ collisiondetection: if true uses collision detection + vertical = false, + -- ^ vertical: if true faces player using y axis only + texture = "smoke_puff.png", + -- ^ Uses texture (string) + attached = self.object, + }) + end, + drops={"default:steelblock 4"}, +}, "Detailed Steam Engine", "advtrains_engine_steam_inv.png") + advtrains.register_wagon("wagon_default", { mesh="advtrains_passenger_wagon.b3d", textures = {"advtrains_wagon.png"}, diff --git a/advtrains/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d b/advtrains/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d new file mode 100644 index 0000000..7418d8a Binary files /dev/null and b/advtrains/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d differ diff --git a/advtrains/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png b/advtrains/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png new file mode 100644 index 0000000..eab4dc8 Binary files /dev/null and b/advtrains/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png differ diff --git a/advtrains/advtrains_train_steam/textures/advtrains_engine_steam.png b/advtrains/advtrains_train_steam/textures/advtrains_engine_steam.png new file mode 100644 index 0000000..4b27e77 Binary files /dev/null and b/advtrains/advtrains_train_steam/textures/advtrains_engine_steam.png differ diff --git a/advtrains/advtrains_train_steam/textures/advtrains_engine_steam_inv.png b/advtrains/advtrains_train_steam/textures/advtrains_engine_steam_inv.png new file mode 100644 index 0000000..8d3fafb Binary files /dev/null and b/advtrains/advtrains_train_steam/textures/advtrains_engine_steam_inv.png differ diff --git a/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive.png b/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive.png deleted file mode 100644 index 4b27e77..0000000 Binary files a/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive.png and /dev/null differ diff --git a/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive_inv.png b/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive_inv.png deleted file mode 100644 index 8d3fafb..0000000 Binary files a/advtrains/advtrains_train_steam/textures/advtrains_newlocomotive_inv.png and /dev/null differ diff --git a/assets/Weichenhebel-CooleLokAnimiert/dampflock4pipe_animated.blend b/assets/Weichenhebel-CooleLokAnimiert/dampflock4pipe_animated.blend new file mode 100644 index 0000000..cf3b1da Binary files /dev/null and b/assets/Weichenhebel-CooleLokAnimiert/dampflock4pipe_animated.blend differ diff --git a/assets/Weichenhebel-CooleLokAnimiert/dampflock4pipe_animated.blend1 b/assets/Weichenhebel-CooleLokAnimiert/dampflock4pipe_animated.blend1 new file mode 100644 index 0000000..cbc247b Binary files /dev/null and b/assets/Weichenhebel-CooleLokAnimiert/dampflock4pipe_animated.blend1 differ -- cgit v1.2.3