diff --git a/eastern flames/eastern flames.yyp b/eastern flames/eastern flames.yyp index 4505099..803e09f 100644 --- a/eastern flames/eastern flames.yyp +++ b/eastern flames/eastern flames.yyp @@ -153,12 +153,12 @@ "IncludedFiles": [ {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"shrine thing tex.png","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"shrine thing.dat","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Map 1","resourceVersion":"1.0","name":"Map 1.dat","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Map 1","resourceVersion":"1.0","name":"Map 1.size","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Map 1","resourceVersion":"1.0","name":"MapAtlas.png","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"GBA Test.dat","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"GBA Test.size","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"GBATestAtlas.png","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"map1.dat","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"map1.size","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"mapatlas.png","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/testmap","resourceVersion":"1.0","name":"gbatest.dat","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/testmap","resourceVersion":"1.0","name":"gbatest.size","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/testmap","resourceVersion":"1.0","name":"gbatestatlas.png","resourceType":"GMIncludedFile",}, ], "MetaData": { "IDEVersion": "2.3.3.574", diff --git a/eastern flames/objects/ARTICULATOR/Create_0.gml b/eastern flames/objects/ARTICULATOR/Create_0.gml index 2e3b75b..b514683 100644 --- a/eastern flames/objects/ARTICULATOR/Create_0.gml +++ b/eastern flames/objects/ARTICULATOR/Create_0.gml @@ -36,11 +36,14 @@ function setCam(){ global.turn = ARMY.US; function drawModels(){ - gpu_set_cullmode(cull_counterclockwise); + //gpu_set_cullmode(cull_counterclockwise); gpu_set_ztestenable(true); + gpu_set_alphatestenable(true); + gpu_set_alphatestref(128); for(var i = 0; i < array_length(models);i++){ models[i].draw(); } + gpu_set_alphatestenable(false); gpu_set_cullmode(cull_noculling); gpu_set_ztestenable(false); }