Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
15b4b1b
add infernus bolter sprite
VanWeapon Apr 8, 2025
8bd84bb
updating from old commits
VanWeapon Apr 8, 2025
dab6047
finish adding bits from old branch
VanWeapon Apr 8, 2025
048f4fd
typo
VanWeapon Apr 8, 2025
e34f4f4
weapon meta
VanWeapon Apr 8, 2025
7516490
xenophase blade
VanWeapon Apr 8, 2025
437466a
fix missing hand
VanWeapon Apr 8, 2025
f9cb6ec
deathwatch specific
OH296 Apr 9, 2025
9d4c143
livery options companies
OH296 Mar 31, 2025
e4175a7
general stability
OH296 Mar 31, 2025
b826865
clone function name
OH296 Apr 9, 2025
f8211a8
Merge branch 'deathwawtch_livery' into fur_hanging_issues
OH296 Apr 9, 2025
611e128
seems to be stable
OH296 Apr 9, 2025
031df9e
weapon data structure
OH296 Apr 10, 2025
c433c44
more waepon movement
OH296 Apr 10, 2025
6e0b146
safety tweaks
OH296 Apr 10, 2025
524ffa8
finalise most of move
OH296 Apr 11, 2025
1ffcd6b
misc hopeful stuff
OH296 Apr 11, 2025
78fbac2
stability tweaks
OH296 Apr 11, 2025
ee1ecd7
return gc to normal values
OH296 Apr 11, 2025
d0eecb7
fix left arm
OH296 Apr 12, 2025
5eaf167
Merge branch 'surface_pop_issues' into weapon_display
OH296 Apr 12, 2025
851ab47
innumeerable tweaks to positions
OH296 Apr 12, 2025
c1d545c
add variant components
OH296 Apr 12, 2025
4979dbe
tweaks for shipping
OH296 Apr 12, 2025
455e042
addition of knee and shin areas
OH296 Apr 12, 2025
b0dbd1e
seperate visual and component visualk data
OH296 Apr 13, 2025
7b438bd
Merge branch 'main' into weapon_display
OH296 Apr 13, 2025
9a1095d
collapse duplicates
OH296 Apr 13, 2025
8e60401
Merge remote-tracking branch 'origin/weapon_display' into weapon_display
OH296 Apr 13, 2025
705f9a3
refactoring to comments
OH296 Apr 13, 2025
daf1ce2
bulk of head bits
OH296 Apr 13, 2025
4fbdb4e
more cthonian bits
OH296 Apr 14, 2025
cc4dcc7
specialist shoulders
OH296 Apr 15, 2025
97f1490
make presets
OH296 Apr 18, 2025
45cb91b
shader and struct tweaks
OH296 Apr 18, 2025
beff841
Merge branch 'main' into weapon_display
OH296 Apr 18, 2025
8d26412
revert gc to correct value
OH296 Apr 18, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
30 changes: 30 additions & 0 deletions ChapterMaster.yyp
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
{"$GMFolder":"","%Name":"Marine Viewer","folderPath":"folders/Sprites/Marine Viewer.yy","name":"Marine Viewer","resourceType":"GMFolder","resourceVersion":"2.0",},
{"$GMFolder":"","%Name":"allies","folderPath":"folders/Sprites/Marine Viewer/allies.yy","name":"allies","resourceType":"GMFolder","resourceVersion":"2.0",},
{"$GMFolder":"","%Name":"arms_hands","folderPath":"folders/Sprites/Marine Viewer/arms_hands.yy","name":"arms_hands","resourceType":"GMFolder","resourceVersion":"2.0",},
{"$GMFolder":"","%Name":"bare_heads","folderPath":"folders/Sprites/Marine Viewer/bare_heads.yy","name":"bare_heads","resourceType":"GMFolder","resourceVersion":"2.0",},
{"$GMFolder":"","%Name":"bionics","folderPath":"folders/Sprites/Marine Viewer/bionics.yy","name":"bionics","resourceType":"GMFolder","resourceVersion":"2.0",},
{"$GMFolder":"","%Name":"body_types","folderPath":"folders/Sprites/Marine Viewer/body_types.yy","name":"body_types","resourceType":"GMFolder","resourceVersion":"2.0",},
{"$GMFolder":"","%Name":"artificer_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/artificer_complex.yy","name":"artificer_complex","resourceType":"GMFolder","resourceVersion":"2.0",},
Expand Down Expand Up @@ -435,7 +436,9 @@
{"$GMIncludedFile":"","%Name":"purge8.png","CopyToMask":-1,"filePath":"datafiles/images/ui","name":"purge8.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"raid1.png","CopyToMask":-1,"filePath":"datafiles/images/ui","name":"raid1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"resources.png","CopyToMask":-1,"filePath":"datafiles/images/ui","name":"resources.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"pauldron.png","CopyToMask":-1,"filePath":"datafiles/main/chapter_symbols/darkangels","name":"pauldron.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"load_sets.json","CopyToMask":-1,"filePath":"datafiles/main/chapter_symbols","name":"load_sets.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"pauldron.png","CopyToMask":-1,"filePath":"datafiles/main/chapter_symbols/scythesofthemperor","name":"pauldron.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"pauldron.png","CopyToMask":-1,"filePath":"datafiles/main/chapter_symbols/ultramarines","name":"pauldron.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"1.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"1.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"10.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"10.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
Expand Down Expand Up @@ -881,6 +884,7 @@
{"id":{"name":"reverse_draw_shader","path":"shaders/reverse_draw_shader/reverse_draw_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",},},
{"id":{"name":"sReplaceColor","path":"shaders/sReplaceColor/sReplaceColor.yy",},},
{"id":{"name":"snd_battle","path":"sounds/snd_battle/snd_battle.yy",},},
{"id":{"name":"snd_blood","path":"sounds/snd_blood/snd_blood.yy",},},
Expand Down Expand Up @@ -927,6 +931,13 @@
{"id":{"name":"spr_backpack_fastening","path":"sprites/spr_backpack_fastening/spr_backpack_fastening.yy",},},
{"id":{"name":"spr_ballistic_skill_icon","path":"sprites/spr_ballistic_skill_icon/spr_ballistic_skill_icon.yy",},},
{"id":{"name":"spr_bar","path":"sprites/spr_bar/spr_bar.yy",},},
{"id":{"name":"spr_bare_eyes","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},},
{"id":{"name":"spr_bare_head_facial_hair_colourable","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},},
{"id":{"name":"spr_bare_head_facial_hair","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},},
{"id":{"name":"spr_bare_heads_colourable","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},},
{"id":{"name":"spr_bare_heads","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},},
{"id":{"name":"spr_bare_neck_colourable","path":"sprites/spr_bare_neck_colourable/spr_bare_neck_colourable.yy",},},
{"id":{"name":"spr_bare_necks","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},},
{"id":{"name":"spr_battle_block","path":"sprites/spr_battle_block/spr_battle_block.yy",},},
{"id":{"name":"spr_battle_block2","path":"sprites/spr_battle_block2/spr_battle_block2.yy",},},
{"id":{"name":"spr_beakie_colors","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},},
Expand Down Expand Up @@ -956,7 +967,10 @@
{"id":{"name":"spr_cancel_small","path":"sprites/spr_cancel_small/spr_cancel_small.yy",},},
{"id":{"name":"spr_cannon","path":"sprites/spr_cannon/spr_cannon.yy",},},
{"id":{"name":"spr_carrion_breath","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},},
{"id":{"name":"spr_chain_mail_tabbard","path":"sprites/spr_chain_mail_tabbard/spr_chain_mail_tabbard.yy",},},
{"id":{"name":"spr_chap_area_pad","path":"sprites/spr_chap_area_pad/spr_chap_area_pad.yy",},},
{"id":{"name":"spr_chap_trim_left","path":"sprites/spr_chap_trim_left/spr_chap_trim_left.yy",},},
{"id":{"name":"spr_chap_trim_right","path":"sprites/spr_chap_trim_right/spr_chap_trim_right.yy",},},
{"id":{"name":"spr_chaplain_helm","path":"sprites/spr_chaplain_helm/spr_chaplain_helm.yy",},},
{"id":{"name":"spr_chaplain_term_helm","path":"sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy",},},
{"id":{"name":"spr_chaplain_wolf_helm","path":"sprites/spr_chaplain_wolf_helm/spr_chaplain_wolf_helm.yy",},},
Expand Down Expand Up @@ -986,6 +1000,7 @@
{"id":{"name":"spr_credits_bg","path":"sprites/spr_credits_bg/spr_credits_bg.yy",},},
{"id":{"name":"spr_crusader","path":"sprites/spr_crusader/spr_crusader.yy",},},
{"id":{"name":"spr_crux_on_chain","path":"sprites/spr_crux_on_chain/spr_crux_on_chain.yy",},},
{"id":{"name":"spr_cthonian_tabbard","path":"sprites/spr_cthonian_tabbard/spr_cthonian_tabbard.yy",},},
{"id":{"name":"spr_cursor","path":"sprites/spr_cursor/spr_cursor.yy",},},
{"id":{"name":"spr_da_backpack","path":"sprites/spr_da_backpack/spr_da_backpack.yy",},},
{"id":{"name":"spr_da_chaplain","path":"sprites/spr_da_chaplain/spr_da_chaplain.yy",},},
Expand Down Expand Up @@ -1145,12 +1160,16 @@
{"id":{"name":"spr_indomitus_left_arm_bionic","path":"sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy",},},
{"id":{"name":"spr_indomitus_left_arm","path":"sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy",},},
{"id":{"name":"spr_indomitus_left_eye_bionic","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},},
{"id":{"name":"spr_indomitus_left_knee_crux","path":"sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy",},},
{"id":{"name":"spr_indomitus_left_leg_bionic","path":"sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy",},},
{"id":{"name":"spr_indomitus_left_shin","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},},
{"id":{"name":"spr_indomitus_leg_variants","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},},
{"id":{"name":"spr_indomitus_right_arm_bionic","path":"sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy",},},
{"id":{"name":"spr_indomitus_right_arm","path":"sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy",},},
{"id":{"name":"spr_indomitus_right_eye_bionic","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},},
{"id":{"name":"spr_indomitus_right_knee_crux","path":"sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy",},},
{"id":{"name":"spr_indomitus_right_leg_bionic","path":"sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy",},},
{"id":{"name":"spr_indomitus_right_shin","path":"sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy",},},
{"id":{"name":"spr_ingame_menu","path":"sprites/spr_ingame_menu/spr_ingame_menu.yy",},},
{"id":{"name":"spr_inspect_small","path":"sprites/spr_inspect_small/spr_inspect_small.yy",},},
{"id":{"name":"spr_intelligence_icon","path":"sprites/spr_intelligence_icon/spr_intelligence_icon.yy",},},
Expand All @@ -1161,7 +1180,9 @@
{"id":{"name":"spr_knightly_personal_livery","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},},
{"id":{"name":"spr_knightly_robes","path":"sprites/spr_knightly_robes/spr_knightly_robes.yy",},},
{"id":{"name":"spr_laurel","path":"sprites/spr_laurel/spr_laurel.yy",},},
{"id":{"name":"spr_left_pauldron_chainmail","path":"sprites/spr_left_pauldron_chainmail/spr_left_pauldron_chainmail.yy",},},
{"id":{"name":"spr_left_pauldron_fur_hanging","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},},
{"id":{"name":"spr_left_shin_spikes","path":"sprites/spr_left_shin_spikes/spr_left_shin_spikes.yy",},},
{"id":{"name":"spr_leopard_sprite","path":"sprites/spr_leopard_sprite/spr_leopard_sprite.yy",},},
{"id":{"name":"spr_lib_area_pad","path":"sprites/spr_lib_area_pad/spr_lib_area_pad.yy",},},
{"id":{"name":"spr_lion_belt","path":"sprites/spr_lion_belt/spr_lion_belt.yy",},},
Expand Down Expand Up @@ -1247,6 +1268,7 @@
{"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",},},
{"id":{"name":"spr_mk6_complex","path":"sprites/spr_mk6_complex/spr_mk6_complex.yy",},},
{"id":{"name":"spr_mk6_cthonian_heads","path":"sprites/spr_mk6_cthonian_heads/spr_mk6_cthonian_heads.yy",},},
{"id":{"name":"spr_mk6_forehead_knightly","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},},
{"id":{"name":"spr_mk6_head_variants","path":"sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy",},},
{"id":{"name":"spr_mk6_knightly_mouth_variants","path":"sprites/spr_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy",},},
Expand Down Expand Up @@ -1313,6 +1335,8 @@
{"id":{"name":"spr_pack_brazier3","path":"sprites/spr_pack_brazier3/spr_pack_brazier3.yy",},},
{"id":{"name":"spr_pack_devastator","path":"sprites/spr_pack_devastator/spr_pack_devastator.yy",},},
{"id":{"name":"spr_pack_jump","path":"sprites/spr_pack_jump/spr_pack_jump.yy",},},
{"id":{"name":"spr_pauldron_spikes_left","path":"sprites/spr_pauldron_spikes_left/spr_pauldron_spikes_left.yy",},},
{"id":{"name":"spr_pauldron_spikes_right","path":"sprites/spr_pauldron_spikes_right/spr_pauldron_spikes_right.yy",},},
{"id":{"name":"spr_penitent_ui","path":"sprites/spr_penitent_ui/spr_penitent_ui.yy",},},
{"id":{"name":"spr_pixel_button_left","path":"sprites/spr_pixel_button_left/spr_pixel_button_left.yy",},},
{"id":{"name":"spr_pixel_button_middle","path":"sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy",},},
Expand Down Expand Up @@ -1353,7 +1377,9 @@
{"id":{"name":"spr_rg_mk5_helm","path":"sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy",},},
{"id":{"name":"spr_rg_mk6_helm","path":"sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy",},},
{"id":{"name":"spr_rg_mk7_helm","path":"sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy",},},
{"id":{"name":"spr_right_pauldron_chainmail","path":"sprites/spr_right_pauldron_chainmail/spr_right_pauldron_chainmail.yy",},},
{"id":{"name":"spr_right_pauldron_fur_hanging","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},},
{"id":{"name":"spr_right_shin_spikes","path":"sprites/spr_right_shin_spikes/spr_right_shin_spikes.yy",},},
{"id":{"name":"spr_rock_bg","path":"sprites/spr_rock_bg/spr_rock_bg.yy",},},
{"id":{"name":"spr_rocket_ork","path":"sprites/spr_rocket_ork/spr_rocket_ork.yy",},},
{"id":{"name":"spr_rocket_whirl","path":"sprites/spr_rocket_whirl/spr_rocket_whirl.yy",},},
Expand Down Expand Up @@ -1581,8 +1607,12 @@
{"id":{"name":"spr_weapon_stalker","path":"sprites/spr_weapon_stalker/spr_weapon_stalker.yy",},},
{"id":{"name":"spr_weapon_standard","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},},
{"id":{"name":"spr_weapon_standard2","path":"sprites/spr_weapon_standard2/spr_weapon_standard2.yy",},},
{"id":{"name":"spr_weapon_storm_tall_2","path":"sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy",},},
{"id":{"name":"spr_weapon_storm_tall","path":"sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy",},},
{"id":{"name":"spr_weapon_storm","path":"sprites/spr_weapon_storm/spr_weapon_storm.yy",},},
{"id":{"name":"spr_weapon_storm2","path":"sprites/spr_weapon_storm2/spr_weapon_storm2.yy",},},
{"id":{"name":"spr_weapon_sword_oriental","path":"sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy",},},
{"id":{"name":"spr_weapon_sword_turk","path":"sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy",},},
{"id":{"name":"spr_weapon_thhammer","path":"sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy",},},
{"id":{"name":"spr_weapon_xenophase_blade_var1","path":"sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy",},},
{"id":{"name":"spr_welcome_bg","path":"sprites/spr_welcome_bg/spr_welcome_bg.yy",},},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion datafiles/main/chapter_symbols/load_sets.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[
"ultramarines"
"ultramarines",
//"scythesofthemperor",
//"darkangels"
]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion objects/obj_creation/Create_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ buttons = {
font : fnt_40k_14b
},
{
str1 : "Ganger (cthonian)",
str1 : "Cthonian",
font : fnt_40k_14b
},
{
Expand Down
2 changes: 2 additions & 0 deletions objects/obj_garbage_collector/Step_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ if (gc_timer > 0) {
gc_timer -= 1;
// show_debug_message($"obj_garbage_collector: gc_timer = {gc_timer}");
} else {

gc_timer = 50; // Default is every frame, so de-facto 1;

gc_collect();

wait_and_execute(0, function(){
Expand Down
Loading