Permalink
Browse files

Merge remote-tracking branch 'jpab/gernot-courier-1069'

  • Loading branch information...
John Bartholomew
John Bartholomew committed Sep 5, 2012
2 parents 46f4a05 + e4f159b commit 49866e12622536d967d60db7c46884641baf5317
Showing with 22,091 additions and 15,745 deletions.
  1. +3 −0 Changelog.txt
  2. +5 −22 data/models/ships/asp_sparks/asp_sparks.lua
  3. +93 −92 data/models/ships/courier/c_back.obj
  4. BIN data/models/ships/courier/c_back.png
  5. +1,039 −1,213 data/models/ships/courier/c_bot.obj
  6. +18 −0 data/models/ships/courier/c_cage_cut_l.obj
  7. +18 −0 data/models/ships/courier/c_cage_cut_r.obj
  8. +40 −80 data/models/ships/courier/c_cage_l.obj
  9. +40 −57 data/models/ships/courier/c_cage_r.obj
  10. +0 −518 data/models/ships/courier/c_chrome.obj
  11. BIN data/models/ships/courier/c_chrome.png
  12. +43 −61 data/models/ships/courier/c_e_glow_l.obj
  13. +43 −53 data/models/ships/courier/c_e_glow_r.obj
  14. BIN data/models/ships/courier/c_e_inside.png
  15. +85 −135 data/models/ships/courier/c_e_inside_l.obj
  16. +85 −135 data/models/ships/courier/c_e_inside_r.obj
  17. +159 −267 data/models/ships/courier/c_eng_l.obj
  18. BIN data/models/ships/courier/c_eng_l.png
  19. +159 −268 data/models/ships/courier/c_eng_r.obj
  20. +43 −74 data/models/ships/courier/c_flap_ll.obj
  21. +43 −75 data/models/ships/courier/c_flap_lr.obj
  22. +43 −74 data/models/ships/courier/c_flap_rl.obj
  23. +43 −74 data/models/ships/courier/c_flap_rr.obj
  24. BIN data/models/ships/courier/c_glow.png
  25. +93 −0 data/models/ships/courier/c_gun.obj
  26. +50 −0 data/models/ships/courier/c_lwp_2.obj
  27. +50 −0 data/models/ships/courier/c_lwp_3.obj
  28. +51 −0 data/models/ships/courier/c_lwp_4.obj
  29. +50 −0 data/models/ships/courier/c_lwp_5.obj
  30. +0 −32 data/models/ships/courier/c_lwpb_2.obj
  31. +0 −32 data/models/ships/courier/c_lwpb_3.obj
  32. +0 −32 data/models/ships/courier/c_lwpb_4.obj
  33. +0 −32 data/models/ships/courier/c_lwpb_5.obj
  34. +0 −32 data/models/ships/courier/c_lwpt_2.obj
  35. +0 −32 data/models/ships/courier/c_lwpt_3.obj
  36. +0 −32 data/models/ships/courier/c_lwpt_4.obj
  37. +0 −32 data/models/ships/courier/c_lwpt_5.obj
  38. BIN data/models/ships/courier/c_metal.png
  39. +102 −113 data/models/ships/courier/c_nazzle.obj
  40. BIN data/models/ships/courier/c_nazzles.png
  41. +344 −0 data/models/ships/courier/c_pit.obj
  42. +50 −0 data/models/ships/courier/c_rwp_2.obj
  43. +50 −0 data/models/ships/courier/c_rwp_3.obj
  44. +50 −0 data/models/ships/courier/c_rwp_4.obj
  45. +50 −0 data/models/ships/courier/c_rwp_5.obj
  46. +0 −32 data/models/ships/courier/c_rwpb_2.obj
  47. +0 −27 data/models/ships/courier/c_rwpb_3.obj
  48. +0 −32 data/models/ships/courier/c_rwpb_4.obj
  49. +0 −32 data/models/ships/courier/c_rwpb_5.obj
  50. +0 −32 data/models/ships/courier/c_rwpt_2.obj
  51. +0 −32 data/models/ships/courier/c_rwpt_3.obj
  52. +0 −32 data/models/ships/courier/c_rwpt_4.obj
  53. +0 −32 data/models/ships/courier/c_rwpt_5.obj
  54. BIN data/models/ships/courier/c_shell_al.png
  55. BIN data/models/ships/courier/c_shell_l.png
  56. +395 −393 data/models/ships/courier/c_sledge_l.obj
  57. +394 −393 data/models/ships/courier/c_sledge_r.obj
  58. +1,245 −1,698 data/models/ships/courier/c_tip1.obj
  59. +1,341 −806 data/models/ships/courier/c_tip2.obj
  60. +0 −806 data/models/ships/courier/c_tip3.obj
  61. +502 −602 data/models/ships/courier/c_tip_n_in.obj
  62. +460 −544 data/models/ships/courier/c_tip_n_out.obj
  63. +1,440 −1,727 data/models/ships/courier/c_top.obj
  64. +553 −655 data/models/ships/courier/c_wheels_l.obj
  65. +564 −657 data/models/ships/courier/c_wheels_r.obj
  66. +28 −63 data/models/ships/courier/c_win.obj
  67. +956 −1,214 data/models/ships/courier/courier.lua
  68. BIN data/models/ships/courier/courier.png
  69. BIN data/models/ships/courier/m_shell_l.png
  70. BIN data/models/ships/courier/piston.png
  71. +43 −53 data/models/ships/courier/t_e_glow.obj
  72. +85 −135 data/models/ships/courier/t_e_inside.obj
  73. +158 −245 data/models/ships/courier/t_eng.obj
  74. +1,452 −1,732 data/models/ships/courier/t_top.obj
  75. BIN data/models/ships/courier/wtr.png
  76. +3 −3 data/ships/imperial_courier.lua
  77. +26 −0 data/ships/imperial_trader.lua
  78. BIN data/sub_models/pilot/chair.png
  79. +291 −0 data/sub_models/pilot/chair_1.obj
  80. +78 −0 data/sub_models/pilot/chair_c0.obj
  81. +1,443 −0 data/sub_models/pilot/chair_c1.obj
  82. +2,254 −0 data/sub_models/pilot/dummy.obj
  83. +125 −0 data/sub_models/pilot/feet.obj
  84. +96 −0 data/sub_models/pilot/hands_f.obj
  85. +98 −0 data/sub_models/pilot/hands_m.obj
  86. +272 −0 data/sub_models/pilot/head.obj
  87. BIN data/sub_models/pilot/head_f1.png
  88. BIN data/sub_models/pilot/head_f2.png
  89. BIN data/sub_models/pilot/head_f3.png
  90. BIN data/sub_models/pilot/head_f4.png
  91. BIN data/sub_models/pilot/head_f5.png
  92. BIN data/sub_models/pilot/head_f6.png
  93. BIN data/sub_models/pilot/head_m1.png
  94. BIN data/sub_models/pilot/head_m2.png
  95. BIN data/sub_models/pilot/head_m3.png
  96. BIN data/sub_models/pilot/head_m4.png
  97. BIN data/sub_models/pilot/head_m5.png
  98. BIN data/sub_models/pilot/head_m6.png
  99. BIN data/sub_models/pilot/helmet.png
  100. +392 −0 data/sub_models/pilot/helmet_mod.obj
  101. +60 −0 data/sub_models/pilot/padd.obj
  102. BIN data/sub_models/pilot/padd.png
  103. +1,434 −0 data/sub_models/pilot/pilot.lua
  104. BIN data/sub_models/pilot/pilot_1.png
  105. +1,523 −0 data/sub_models/pilot/pilot_f.obj
  106. +711 −0 data/sub_models/pilot/pilot_m.obj
  107. +30 −0 data/sub_models/pilot/pilot_notes.txt
  108. BIN data/sub_models/pilot/pipe.png
  109. +288 −0 data/sub_models/pilot/pipe_mod.obj
  110. +82 −0 data/sub_models/pilot/sign_f.obj
  111. +12 −0 data/sub_models/pilot/sign_m.obj
  112. BIN data/sub_models/pilot/squad.png
  113. +112 −0 data/sub_models/pilot/visor_mod.obj
  114. BIN data/sub_models/squadsign/impsign_0.png
  115. BIN data/sub_models/squadsign/impsign_1.png
  116. BIN data/sub_models/squadsign/impsign_2.png
  117. BIN data/sub_models/squadsign/impsign_3.png
  118. BIN data/sub_models/squadsign/impsign_4.png
  119. +203 −201 data/sub_models/squadsign/squadsign.lua
View
@@ -2,9 +2,12 @@ Alpha 26
* New features
* Achernar (4,-9,-16) is now a fully custom system (#1452)
+ * New Imperial Trader (a variant of the Imperial Courier) (#1069)
* Minor changes and tweaks
* Updated station splash advert (#1429)
+ * Updated the Imperial Courier model (#1069)
+ * Updated the "pilot" and "squadsign" sub-models (#1069)
* Fixes
* Fix atmospheric pressure calculations (#1431, #1395)
@@ -204,26 +204,7 @@ define_model('asps_sub0', {
texture(nil)
end,
dynamic = function(lod)
- selector1()
- if select1 < 201 then
- set_material('squad', .5,0,0,1,.6,.6,.6,30)
- else
- if select1 < 401 then
- set_material('squad', .45,.35,.01,1,.6,.6,.6,30)
- else
- if select1 < 601 then
- set_material('squad', 0,.15,.7,1,.6,.6,.6,30)
- else
- if select1 < 801 then
- set_material('squad', .06,.35,0,1,.6,.6,.6,30)
- else
- if select1 > 800 then
- set_material('squad', .2,0,.35,1,.6,.6,.6,30)
- end
- end
- end
- end
- end
+ squad_color()
if lod > 2 then
if get_equipment('LASER',1) then
@@ -299,7 +280,7 @@ define_model('asp_sparks', {
scale = 8.5,
lod_pixels = {.1,20,50,0},
bounding_radius = 38,
- materials = {'chrome', 'non_cv', 'metal', 'layer', 'win', 'glow_0', 'e_glow', 'scoop', 'text'},
+ materials = {'squad', 'chrome', 'non_cv', 'metal', 'layer', 'win', 'glow_0', 'e_glow', 'scoop', 'text'},
tags = {'ship'},
},
static = function(lod)
@@ -392,6 +373,8 @@ define_model('asp_sparks', {
end
end,
dynamic = function(lod)
+ squad_color() -- this sets up the 'squad' material
+
local flap = math.pi*math.clamp(get_animation_position('WHEEL_STATE'),0,.5)
local rot = .5*math.pi*math.clamp(get_animation_position('WHEEL_STATE'),.3,1)-.46
@@ -409,7 +392,7 @@ define_model('asp_sparks', {
texture(nil)
--use_material('text')
if lod > 3 then
- call_model('squad_color',v(0,0,0),v(1,0,0),v(0,1,0),1)
+ use_material('squad')
local reg = get_label()
zbias(1,v(1.764,.448,.453),v(.2,1,0))
text(reg,v(1.764,.448,.453),v(.2,1,0),v(-1,.37,-1),.2,{center = true})
@@ -1,92 +1,93 @@
-o matte
-v 0.000000 -1.614125 15.349766
-v 0.000000 6.088522 16.973536
-v -1.221895 -1.574699 15.091665
-v -0.947701 5.595672 16.678772
-v -5.086296 0.176564 13.892014
-v -4.344493 -0.669859 14.138693
-v -3.232703 4.057961 15.635816
-v -2.318691 4.728243 16.134634
-v -3.278393 -1.227027 14.547533
-v -4.344493 2.948800 14.864225
-v -5.086296 1.944660 14.254777
-v -5.648953 0.825149 13.673624
-v 1.221895 -1.574699 15.091665
-v 0.947701 5.595672 16.678772
-v 4.344487 -0.669859 14.138693
-v 5.086289 0.176564 13.892014
-v 3.232697 4.057961 15.635816
-v 2.318697 4.728243 16.134634
-v 3.278387 -1.227027 14.547533
-v 4.344487 2.948800 14.864225
-v 5.086289 1.944660 14.254777
-v 5.648947 0.825149 13.673624
-v 0.000000 -1.614125 15.349766
-v 0.000000 6.088522 16.973536
-vt 0.510785 0.009932
-vt 0.510785 0.993677
-vt 0.411756 0.008118
-vt 0.433977 0.925823
-vt 0.098563 0.191445
-vt 0.158683 0.094271
-vt 0.248790 0.710955
-vt 0.322867 0.805754
-vt 0.245086 0.036648
-vt 0.158683 0.555472
-vt 0.098563 0.416999
-vt 0.052963 0.265145
-vt 0.609813 0.008118
-vt 0.587588 0.925823
-vt 0.862882 0.094271
-vt 0.923002 0.191445
-vt 0.772779 0.710955
-vt 0.698702 0.805754
-vt 0.776479 0.036648
-vt 0.862882 0.555472
-vt 0.923002 0.416999
-vt 0.968601 0.265145
-vn -0.208625 -0.201727 0.956938
-vn -0.200232 -0.203406 0.958373
-vn -0.233192 -0.201361 0.951323
-vn -0.241768 -0.203406 0.948759
-vn -0.463729 -0.180425 0.867397
-vn -0.405225 -0.185339 0.895199
-vn -0.419477 -0.185888 0.888516
-vn -0.349559 -0.191687 0.917081
-vn -0.324809 -0.193426 0.925748
-vn -0.443495 -0.188574 0.876186
-vn -0.496261 -0.174474 0.850429
-vn -0.521928 -0.171422 0.835566
-vn 0.208625 -0.201727 0.956938
-vn 0.233192 -0.201361 0.951323
-vn 0.200232 -0.203406 0.958373
-vn 0.241768 -0.203406 0.948759
-vn 0.405225 -0.185339 0.895199
-vn 0.463729 -0.180425 0.867397
-vn 0.419477 -0.185888 0.888516
-vn 0.349559 -0.191687 0.917081
-vn 0.324809 -0.193426 0.925748
-vn 0.443495 -0.188574 0.876186
-vn 0.496261 -0.174474 0.850429
-vn 0.521928 -0.171422 0.835566
-s 1
-f 1/1/1 2/2/2 3/3/3
-f 4/4/4 3/3/3 2/2/2
-f 5/5/5 6/6/6 7/7/7
-f 7/7/7 6/6/6 8/8/8
-f 6/6/6 9/9/9 8/8/8
-f 8/8/8 9/9/9 4/4/4
-f 9/9/9 3/3/3 4/4/4
-f 10/10/10 5/5/5 7/7/7
-f 11/11/11 5/5/5 10/10/10
-f 12/12/12 5/5/5 11/11/11
-f 23/1/13 13/13/14 24/2/15
-f 13/13/14 14/14/16 24/2/15
-f 15/15/17 16/16/18 17/17/19
-f 15/15/17 17/17/19 18/18/20
-f 19/19/21 15/15/17 18/18/20
-f 19/19/21 18/18/20 14/14/16
-f 13/13/14 19/19/21 14/14/16
-f 16/16/18 20/20/22 17/17/19
-f 21/21/23 20/20/22 16/16/18
-f 16/16/18 22/22/24 21/21/23
+o c_back
+v 0.000000 -1.614124 15.349766
+v 0.000000 6.088523 16.973536
+v -1.221895 -1.574698 15.091665
+v -0.947701 5.595673 16.678772
+v -5.086296 0.176565 13.892014
+v -4.344493 -0.669858 14.138693
+v -3.232703 4.057961 15.635816
+v -2.318691 4.728243 16.134634
+v -3.278393 -1.227026 14.547533
+v -4.344493 2.948801 14.864225
+v -5.086296 1.944661 14.254777
+v -5.648953 0.825150 13.673624
+v 1.221895 -1.574698 15.091665
+v 0.947701 5.595673 16.678772
+v 4.344487 -0.669858 14.138693
+v 5.086289 0.176565 13.892014
+v 3.232697 4.057961 15.635816
+v 2.318697 4.728243 16.134634
+v 3.278387 -1.227026 14.547533
+v 4.344487 2.948801 14.864225
+v 5.086289 1.944661 14.254777
+v 5.648947 0.825150 13.673624
+v 0.000000 -1.614124 15.349766
+v 0.000000 6.088523 16.973536
+vt 0.684220 0.126338
+vt 0.684220 0.249306
+vt 0.671842 0.126112
+vt 0.674619 0.240825
+vt 0.632692 0.149027
+vt 0.640208 0.136881
+vt 0.651471 0.213966
+vt 0.660730 0.225816
+vt 0.651008 0.129678
+vt 0.640208 0.194531
+vt 0.632692 0.177222
+vt 0.626992 0.158240
+vt 0.696599 0.126112
+vt 0.693821 0.240825
+vt 0.728232 0.136881
+vt 0.735747 0.149027
+vt 0.716969 0.213966
+vt 0.707710 0.225816
+vt 0.717432 0.129678
+vt 0.728232 0.194531
+vt 0.735747 0.177222
+vt 0.741447 0.158240
+vn -0.208625 -0.201727 0.956938
+vn -0.200232 -0.203406 0.958373
+vn -0.233192 -0.201361 0.951323
+vn -0.241768 -0.203406 0.948759
+vn -0.463729 -0.180425 0.867397
+vn -0.405225 -0.185339 0.895199
+vn -0.419477 -0.185888 0.888516
+vn -0.349559 -0.191687 0.917081
+vn -0.324809 -0.193426 0.925748
+vn -0.443495 -0.188574 0.876186
+vn -0.496261 -0.174474 0.850429
+vn -0.521928 -0.171422 0.835566
+vn 0.208625 -0.201727 0.956938
+vn 0.233192 -0.201361 0.951323
+vn 0.200232 -0.203406 0.958373
+vn 0.241768 -0.203406 0.948759
+vn 0.405225 -0.185339 0.895199
+vn 0.463729 -0.180425 0.867397
+vn 0.419477 -0.185888 0.888516
+vn 0.349559 -0.191687 0.917081
+vn 0.324809 -0.193426 0.925748
+vn 0.443495 -0.188574 0.876186
+vn 0.496261 -0.174474 0.850429
+vn 0.521928 -0.171422 0.835566
+usemtl Material
+s 1
+f 1/1/1 2/2/2 3/3/3
+f 4/4/4 3/3/3 2/2/2
+f 5/5/5 6/6/6 7/7/7
+f 7/7/7 6/6/6 8/8/8
+f 6/6/6 9/9/9 8/8/8
+f 8/8/8 9/9/9 4/4/4
+f 9/9/9 3/3/3 4/4/4
+f 10/10/10 5/5/5 7/7/7
+f 11/11/11 5/5/5 10/10/10
+f 12/12/12 5/5/5 11/11/11
+f 23/1/13 13/13/14 24/2/15
+f 13/13/14 14/14/16 24/2/15
+f 15/15/17 16/16/18 17/17/19
+f 15/15/17 17/17/19 18/18/20
+f 19/19/21 15/15/17 18/18/20
+f 19/19/21 18/18/20 14/14/16
+f 13/13/14 19/19/21 14/14/16
+f 16/16/18 20/20/22 17/17/19
+f 21/21/23 20/20/22 16/16/18
+f 16/16/18 22/22/24 21/21/23
Binary file not shown.
Oops, something went wrong.

0 comments on commit 49866e1

Please sign in to comment.