Skip to content
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
7 changes: 5 additions & 2 deletions ChapterMaster.yyp
Original file line number Diff line number Diff line change
Expand Up @@ -966,6 +966,7 @@
{"id":{"name":"helm_shader","path":"shaders/helm_shader/helm_shader.yy",},},
{"id":{"name":"light_dark_shader","path":"shaders/light_dark_shader/light_dark_shader.yy",},},
{"id":{"name":"reverse_draw_shader","path":"shaders/reverse_draw_shader/reverse_draw_shader.yy",},},
{"id":{"name":"right_left_swap_shader","path":"shaders/right_left_swap_shader/right_left_swap_shader.yy",},},
{"id":{"name":"shd_multiply_blend","path":"shaders/shd_multiply_blend/shd_multiply_blend.yy",},},
{"id":{"name":"Ship_shader","path":"shaders/Ship_shader/Ship_shader.yy",},},
{"id":{"name":"skin_tone_shader","path":"shaders/skin_tone_shader/skin_tone_shader.yy",},},
Expand Down Expand Up @@ -1375,6 +1376,7 @@
{"id":{"name":"spr_mk3_mouth_flame_cult","path":"sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy",},},
{"id":{"name":"spr_mk3_mouth_prussian","path":"sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy",},},
{"id":{"name":"spr_mk3_mouth","path":"sprites/spr_mk3_mouth/spr_mk3_mouth.yy",},},
{"id":{"name":"spr_mk3_right_arm_shadow","path":"sprites/spr_mk3_right_arm_shadow/spr_mk3_right_arm_shadow.yy",},},
{"id":{"name":"spr_mk3_right_arm","path":"sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy",},},
{"id":{"name":"spr_mk3_right_knee","path":"sprites/spr_mk3_right_knee/spr_mk3_right_knee.yy",},},
{"id":{"name":"spr_mk3_right_trim","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},},
Expand All @@ -1391,6 +1393,7 @@
{"id":{"name":"spr_mk4_mongol_chest_variants","path":"sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy",},},
{"id":{"name":"spr_mk4_mongol_hat","path":"sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy",},},
{"id":{"name":"spr_mk4_mouth_variants","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},},
{"id":{"name":"spr_mk4_right_arm_shadow","path":"sprites/spr_mk4_right_arm_shadow/spr_mk4_right_arm_shadow.yy",},},
{"id":{"name":"spr_mk4_right_arm","path":"sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy",},},
{"id":{"name":"spr_mk4_right_trim","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},},
{"id":{"name":"spr_mk5_chest_variants","path":"sprites/spr_mk5_chest_variants/spr_mk5_chest_variants.yy",},},
Expand All @@ -1399,6 +1402,7 @@
{"id":{"name":"spr_mk5_complex","path":"sprites/spr_mk5_complex/spr_mk5_complex.yy",},},
{"id":{"name":"spr_mk5_head_variants","path":"sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy",},},
{"id":{"name":"spr_mk5_left_arm","path":"sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy",},},
{"id":{"name":"spr_mk5_right_arm_shadow","path":"sprites/spr_mk5_right_arm_shadow/spr_mk5_right_arm_shadow.yy",},},
{"id":{"name":"spr_mk5_right_arm","path":"sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy",},},
{"id":{"name":"spr_mk5_samuri_faceplate","path":"sprites/spr_mk5_samuri_faceplate/spr_mk5_samuri_faceplate.yy",},},
{"id":{"name":"spr_mk6_complex_backpack","path":"sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy",},},
Expand All @@ -1421,8 +1425,6 @@
{"id":{"name":"spr_mk7_complex_crux_belt","path":"sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy",},},
{"id":{"name":"spr_mk7_complex_knees","path":"sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy",},},
{"id":{"name":"spr_mk7_complex_left_knee_1","path":"sprites/spr_mk7_complex_left_knee_1/spr_mk7_complex_left_knee_1.yy",},},
{"id":{"name":"spr_mk7_complex_left_pauldron_shadow","path":"sprites/spr_mk7_complex_left_pauldron_shadow/spr_mk7_complex_left_pauldron_shadow.yy",},},
{"id":{"name":"spr_mk7_complex_left_pauldron","path":"sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy",},},
{"id":{"name":"spr_mk7_complex_right_knee","path":"sprites/spr_mk7_complex_right_knee/spr_mk7_complex_right_knee.yy",},},
{"id":{"name":"spr_mk7_complex_right_pauldron_shadow","path":"sprites/spr_mk7_complex_right_pauldron_shadow/spr_mk7_complex_right_pauldron_shadow.yy",},},
{"id":{"name":"spr_mk7_complex_right_pauldron","path":"sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy",},},
Expand All @@ -1439,6 +1441,7 @@
{"id":{"name":"spr_mk7_mouth_prussian","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},},
{"id":{"name":"spr_mk7_mouth_variants","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},},
{"id":{"name":"spr_mk7_prussia_chest","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},},
{"id":{"name":"spr_mk7_right_arm_shadow","path":"sprites/spr_mk7_right_arm_shadow/spr_mk7_right_arm_shadow.yy",},},
{"id":{"name":"spr_mk7_right_arm","path":"sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy",},},
{"id":{"name":"spr_mk7_right_trim","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},},
{"id":{"name":"spr_mk7_rope_belt","path":"sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.yy",},},
Expand Down
10 changes: 0 additions & 10 deletions scripts/scr_ComplexSet/scr_ComplexSet.gml
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@ function ComplexSet(_unit) constructor {
//draw_helms = false;
static mk7_bits = {
armour: spr_mk7_complex,
left_arm: spr_mk7_left_arm,
right_arm: spr_mk7_right_arm,
left_trim: spr_mk7_left_trim,
right_trim: spr_mk7_right_trim,
mouth_variants: spr_mk7_mouth_variants,
Expand Down Expand Up @@ -1280,8 +1278,6 @@ function ComplexSet(_unit) constructor {
add_group({
armour: spr_mk6_complex,
backpack: spr_mk6_complex_backpack,
left_arm: spr_mk6_left_arm,
right_arm: spr_mk6_right_arm,
left_trim: spr_mk7_left_trim,
right_trim: spr_mk7_right_trim,
mouth_variants: spr_mk6_mouth_variants,
Expand All @@ -1293,8 +1289,6 @@ function ComplexSet(_unit) constructor {
add_group({
armour: spr_mk5_complex,
backpack: spr_mk5_complex_backpack,
left_arm: spr_mk5_left_arm,
right_arm: spr_mk5_right_arm,
left_trim: spr_mk7_left_trim,
right_trim: spr_mk7_right_trim,
head: spr_mk5_head_variants,
Expand All @@ -1311,9 +1305,7 @@ function ComplexSet(_unit) constructor {
chest_variants: spr_mk4_chest_variants,
armour: spr_mk4_complex,
backpack: spr_mk4_complex_backpack,
left_arm: spr_mk4_left_arm,
leg_variants: spr_mk4_leg_variants,
right_arm: spr_mk4_right_arm,
left_trim: spr_mk4_left_trim,
right_trim: spr_mk4_right_trim,
mouth_variants: spr_mk4_mouth_variants,
Expand All @@ -1325,8 +1317,6 @@ function ComplexSet(_unit) constructor {
add_group({
armour: spr_mk3_complex,
backpack: spr_mk3_complex_backpack,
left_arm: spr_mk3_left_arm,
right_arm: spr_mk3_right_arm,
head: spr_mk3_head_variants,
left_knee: spr_mk3_left_knee,
right_knee: spr_mk3_right_knee,
Expand Down
6 changes: 6 additions & 0 deletions scripts/scr_controller_helpers/scr_controller_helpers.gml
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,12 @@ function init_manage_buttons(){
label: "Show Bio",
tooltip: "Click here or press B to Toggle Unit Biography."
}),
capture_image: new UnitButtonObject({
style: "pixel",
label: "Capture Image",
tooltip: "Click to create a local png of the given marine in the game folder."
}),

company_namer : new TextBarArea(800, 108, 600, false),
};
}
Expand Down
Loading