Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
3081ce1
Remove all big mofo refs
OH296 Sep 4, 2026
5c18d3a
remove redundant ship battle script
OH296 Sep 4, 2026
e7664b8
assivly reduce bloat using unitindex
OH296 Sep 4, 2026
65301fb
Update objects/obj_ncombat/Alarm_1.gml
OH296 Sep 4, 2026
4875b63
Update objects/obj_ncombat/Alarm_1.gml
OH296 Sep 4, 2026
70f20ec
Update objects/obj_ncombat/Alarm_1.gml
OH296 Sep 4, 2026
7107dc5
Update scripts/scr_UnitGroup/scr_UnitGroup.gml
OH296 Sep 4, 2026
7c80f5d
Update objects/obj_ncombat/Alarm_1.gml
OH296 Sep 4, 2026
03f47c8
Update scripts/scr_UnitGroup/scr_UnitGroup.gml
OH296 Sep 4, 2026
2c6e9f7
Update scripts/ArtifactStruct/ArtifactStruct.gml
OH296 Sep 4, 2026
f01772f
remove iportnatn dude references
OH296 Sep 4, 2026
0fd5246
Merge remote-tracking branch 'origin/refactor/combat_index' into refa…
OH296 Sep 4, 2026
f3dab5c
Merge remote-tracking branch 'adeptus/main' into refactor/combat_index
OH296 Sep 4, 2026
e409c13
style changes
OH296 Sep 4, 2026
77036a4
remove more legacy count variables
OH296 Sep 4, 2026
bcb156a
support for ven dreads
OH296 Sep 4, 2026
7239d40
Update objects/obj_ncombat/Alarm_1.gml
OH296 Sep 4, 2026
927e3de
Apply suggestion from @cubic-dev-ai[bot]
OH296 Sep 4, 2026
6f2b0f9
Update ChapterMaster.yyp
OH296 Sep 4, 2026
3f7cff2
text formatting changes
OH296 Sep 4, 2026
90ab4d0
Update objects/obj_ncombat/Alarm_1.gml
OH296 Sep 5, 2026
69fda5c
Update objects/obj_ncombat/Alarm_1.gml
OH296 Sep 5, 2026
4305056
Merge remote-tracking branch 'adeptus/main' into refactor/combat_index
OH296 Sep 7, 2026
485c54d
review points
OH296 Sep 7, 2026
2c3e3b5
merge errors
OH296 Sep 7, 2026
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
1 change: 0 additions & 1 deletion ChapterMaster.yyp
Original file line number Diff line number Diff line change
Expand Up @@ -942,7 +942,6 @@
{"id":{"name":"scr_secret_lair_view","path":"scripts/scr_secret_lair_view/scr_secret_lair_view.yy",},},
{"id":{"name":"scr_serialization_functions","path":"scripts/scr_serialization_functions/scr_serialization_functions.yy",},},
{"id":{"name":"scr_shader_initialize","path":"scripts/scr_shader_initialize/scr_shader_initialize.yy",},},
{"id":{"name":"scr_ship_battle","path":"scripts/scr_ship_battle/scr_ship_battle.yy",},},
{"id":{"name":"scr_ship_count","path":"scripts/scr_ship_count/scr_ship_count.yy",},},
{"id":{"name":"scr_ship_functions","path":"scripts/scr_ship_functions/scr_ship_functions.yy",},},
{"id":{"name":"scr_ship_occupants","path":"scripts/scr_ship_occupants/scr_ship_occupants.yy",},},
Expand Down
Loading
Loading