something like enemy ai
This commit is contained in:
parent
f52e476acf
commit
0b371ac22d
8 changed files with 102 additions and 38 deletions
|
|
@ -97,6 +97,7 @@
|
|||
{"id":{"name":"array_greatest","path":"scripts/array_greatest/array_greatest.yy",},"order":4,},
|
||||
{"id":{"name":"c_null","path":"scripts/c_null/c_null.yy",},"order":4,},
|
||||
{"id":{"name":"array_contains_within","path":"scripts/array_contains_within/array_contains_within.yy",},"order":19,},
|
||||
{"id":{"name":"c_passableeval","path":"scripts/c_passableeval/c_passableeval.yy",},"order":25,},
|
||||
{"id":{"name":"st_moving","path":"scripts/st_moving/st_moving.yy",},"order":7,},
|
||||
{"id":{"name":"c_deleteunit","path":"scripts/c_deleteunit/c_deleteunit.yy",},"order":22,},
|
||||
{"id":{"name":"Room1","path":"rooms/Room1/Room1.yy",},"order":0,},
|
||||
|
|
@ -136,11 +137,8 @@
|
|||
{"folderPath":"folders/Scripts/util/drawing/vlambeer.yy","order":1,"resourceVersion":"1.0","name":"vlambeer","tags":[],"resourceType":"GMFolder",},
|
||||
{"folderPath":"folders/Scripts/util.yy","order":1,"resourceVersion":"1.0","name":"util","tags":[],"resourceType":"GMFolder",},
|
||||
{"folderPath":"folders/Sprites/momiji.yy","order":2,"resourceVersion":"1.0","name":"momiji","tags":[],"resourceType":"GMFolder",},
|
||||
<<<<<<< HEAD
|
||||
{"folderPath":"folders/Sprites/wabbit.yy","order":3,"resourceVersion":"1.0","name":"wabbit","tags":[],"resourceType":"GMFolder",},
|
||||
=======
|
||||
{"folderPath":"folders/Scripts/3d.yy","order":19,"resourceVersion":"1.0","name":"3d","tags":[],"resourceType":"GMFolder",},
|
||||
>>>>>>> a9003c47cacfdee8c6ba2588fdb26b55ad87617b
|
||||
],
|
||||
"AudioGroups": [
|
||||
{"targets":-1,"resourceVersion":"1.3","name":"audiogroup_default","resourceType":"GMAudioGroup",},
|
||||
|
|
@ -149,17 +147,12 @@
|
|||
{"isScaled":true,"autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,"resourceVersion":"1.3","name":"Default","resourceType":"GMTextureGroup",},
|
||||
],
|
||||
"IncludedFiles": [
|
||||
<<<<<<< HEAD
|
||||
{"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":"grass.png","resourceType":"GMIncludedFile",},
|
||||
{"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"koakuma.png","resourceType":"GMIncludedFile",},
|
||||
{"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","resourceVersion":"1.0","name":"shrine thing.dat","resourceType":"GMIncludedFile",},
|
||||
{"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"shrine thing tex.png","resourceType":"GMIncludedFile",},
|
||||
>>>>>>> a9003c47cacfdee8c6ba2588fdb26b55ad87617b
|
||||
],
|
||||
"MetaData": {
|
||||
"IDEVersion": "2.3.3.574",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue