Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git
This commit is contained in:
commit
c541c67f73
6 changed files with 323 additions and 0 deletions
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"resources": [
|
||||
{"id":{"name":"sMaudit","path":"sprites/sMaudit/sMaudit.yy",},"order":14,},
|
||||
{"id":{"name":"tWalls","path":"tilesets/tWalls/tWalls.yy",},"order":0,},
|
||||
{"id":{"name":"sPlayerRun","path":"sprites/sPlayerRun/sPlayerRun.yy",},"order":4,},
|
||||
{"id":{"name":"oMonsterMelee","path":"objects/oMonsterMelee/oMonsterMelee.yy",},"order":2,},
|
||||
{"id":{"name":"rTestVal","path":"rooms/rTestVal/rTestVal.yy",},"order":2,},
|
||||
|
|
@ -12,6 +13,7 @@
|
|||
{"id":{"name":"sSwordh","path":"sprites/sSwordh/sSwordh.yy",},"order":2,},
|
||||
{"id":{"name":"sPlayer","path":"sprites/sPlayer/sPlayer.yy",},"order":0,},
|
||||
{"id":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"order":0,},
|
||||
{"id":{"name":"sTileSet","path":"sprites/sTileSet/sTileSet.yy",},"order":0,},
|
||||
{"id":{"name":"Script1","path":"scripts/Script1/Script1.yy",},"order":0,},
|
||||
{"id":{"name":"sMonsterMelee","path":"sprites/sMonsterMelee/sMonsterMelee.yy",},"order":0,},
|
||||
{"id":{"name":"rTestSolaris","path":"rooms/rTestSolaris/rTestSolaris.yy",},"order":0,},
|
||||
|
|
@ -52,6 +54,7 @@
|
|||
{"folderPath":"folders/Extensions.yy","order":13,"resourceVersion":"1.0","name":"Extensions","tags":[],"resourceType":"GMFolder",},
|
||||
{"folderPath":"folders/Sprites/Monsters.yy","order":1,"resourceVersion":"1.0","name":"Monsters","tags":[],"resourceType":"GMFolder",},
|
||||
{"folderPath":"folders/Objects/Entity.yy","order":1,"resourceVersion":"1.0","name":"Entity","tags":[],"resourceType":"GMFolder",},
|
||||
{"folderPath":"folders/Sprites/walls.yy","order":5,"resourceVersion":"1.0","name":"walls","tags":[],"resourceType":"GMFolder",},
|
||||
],
|
||||
"AudioGroups": [
|
||||
{"targets":461609314234257646,"resourceVersion":"1.0","name":"audiogroup_default","resourceType":"GMAudioGroup",},
|
||||
|
|
|
|||
BIN
sprites/sTileSet/ff1fd9e7-0aeb-49ed-9f74-2c5982e5ec0a.png
Normal file
BIN
sprites/sTileSet/ff1fd9e7-0aeb-49ed-9f74-2c5982e5ec0a.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 603 B |
Binary file not shown.
|
After Width: | Height: | Size: 603 B |
78
sprites/sTileSet/sTileSet.yy
Normal file
78
sprites/sTileSet/sTileSet.yy
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
{
|
||||
"bboxMode": 0,
|
||||
"collisionKind": 1,
|
||||
"type": 0,
|
||||
"origin": 4,
|
||||
"preMultiplyAlpha": false,
|
||||
"edgeFiltering": false,
|
||||
"collisionTolerance": 0,
|
||||
"swfPrecision": 2.525,
|
||||
"bbox_left": 0,
|
||||
"bbox_right": 0,
|
||||
"bbox_top": 0,
|
||||
"bbox_bottom": 0,
|
||||
"HTile": false,
|
||||
"VTile": false,
|
||||
"For3D": false,
|
||||
"width": 320,
|
||||
"height": 160,
|
||||
"textureGroupId": {
|
||||
"name": "Default",
|
||||
"path": "texturegroups/Default",
|
||||
},
|
||||
"swatchColours": null,
|
||||
"gridX": 0,
|
||||
"gridY": 0,
|
||||
"frames": [
|
||||
{"compositeImage":{"FrameId":{"name":"ff1fd9e7-0aeb-49ed-9f74-2c5982e5ec0a","path":"sprites/sTileSet/sTileSet.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
|
||||
{"FrameId":{"name":"ff1fd9e7-0aeb-49ed-9f74-2c5982e5ec0a","path":"sprites/sTileSet/sTileSet.yy",},"LayerId":{"name":"86934910-98fb-4935-ac7e-3abe6fa2c3ac","path":"sprites/sTileSet/sTileSet.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
|
||||
],"parent":{"name":"sTileSet","path":"sprites/sTileSet/sTileSet.yy",},"resourceVersion":"1.0","name":"ff1fd9e7-0aeb-49ed-9f74-2c5982e5ec0a","tags":[],"resourceType":"GMSpriteFrame",},
|
||||
],
|
||||
"sequence": {
|
||||
"spriteId": {"name":"sTileSet","path":"sprites/sTileSet/sTileSet.yy",},
|
||||
"timeUnits": 1,
|
||||
"playback": 1,
|
||||
"playbackSpeed": 30.0,
|
||||
"playbackSpeedType": 0,
|
||||
"autoRecord": true,
|
||||
"volume": 1.0,
|
||||
"length": 1.0,
|
||||
"events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
|
||||
"moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
|
||||
"tracks": [
|
||||
{"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
|
||||
{"id":"f6334477-7cf9-4a30-b113-317e5b807990","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ff1fd9e7-0aeb-49ed-9f74-2c5982e5ec0a","path":"sprites/sTileSet/sTileSet.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
|
||||
],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
|
||||
],
|
||||
"visibleRange": null,
|
||||
"lockOrigin": false,
|
||||
"showBackdrop": true,
|
||||
"showBackdropImage": false,
|
||||
"backdropImagePath": "",
|
||||
"backdropImageOpacity": 0.5,
|
||||
"backdropWidth": 1366,
|
||||
"backdropHeight": 768,
|
||||
"backdropXOffset": 0.0,
|
||||
"backdropYOffset": 0.0,
|
||||
"xorigin": 160,
|
||||
"yorigin": 80,
|
||||
"eventToFunction": {},
|
||||
"eventStubScript": null,
|
||||
"parent": {"name":"sTileSet","path":"sprites/sTileSet/sTileSet.yy",},
|
||||
"resourceVersion": "1.3",
|
||||
"name": "sTileSet",
|
||||
"tags": [],
|
||||
"resourceType": "GMSequence",
|
||||
},
|
||||
"layers": [
|
||||
{"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"86934910-98fb-4935-ac7e-3abe6fa2c3ac","tags":[],"resourceType":"GMImageLayer",},
|
||||
],
|
||||
"parent": {
|
||||
"name": "walls",
|
||||
"path": "folders/Sprites/walls.yy",
|
||||
},
|
||||
"resourceVersion": "1.0",
|
||||
"name": "sTileSet",
|
||||
"tags": [],
|
||||
"resourceType": "GMSprite",
|
||||
}
|
||||
BIN
tilesets/tWalls/output_tileset.png
Normal file
BIN
tilesets/tWalls/output_tileset.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1 KiB |
242
tilesets/tWalls/tWalls.yy
Normal file
242
tilesets/tWalls/tWalls.yy
Normal file
|
|
@ -0,0 +1,242 @@
|
|||
{
|
||||
"spriteId": {
|
||||
"name": "sTileSet",
|
||||
"path": "sprites/sTileSet/sTileSet.yy",
|
||||
},
|
||||
"tileWidth": 16,
|
||||
"tileHeight": 16,
|
||||
"tilexoff": 0,
|
||||
"tileyoff": 0,
|
||||
"tilehsep": 0,
|
||||
"tilevsep": 0,
|
||||
"spriteNoExport": true,
|
||||
"textureGroupId": {
|
||||
"name": "Default",
|
||||
"path": "texturegroups/Default",
|
||||
},
|
||||
"out_tilehborder": 2,
|
||||
"out_tilevborder": 2,
|
||||
"out_columns": 14,
|
||||
"tile_count": 200,
|
||||
"autoTileSets": [],
|
||||
"tileAnimationFrames": [],
|
||||
"tileAnimationSpeed": 15.0,
|
||||
"tileAnimation": {
|
||||
"FrameData": [
|
||||
0,
|
||||
1,
|
||||
2,
|
||||
3,
|
||||
4,
|
||||
5,
|
||||
6,
|
||||
7,
|
||||
8,
|
||||
9,
|
||||
10,
|
||||
11,
|
||||
12,
|
||||
13,
|
||||
14,
|
||||
15,
|
||||
16,
|
||||
17,
|
||||
18,
|
||||
19,
|
||||
20,
|
||||
21,
|
||||
22,
|
||||
23,
|
||||
24,
|
||||
25,
|
||||
26,
|
||||
27,
|
||||
28,
|
||||
29,
|
||||
30,
|
||||
31,
|
||||
32,
|
||||
33,
|
||||
34,
|
||||
35,
|
||||
36,
|
||||
37,
|
||||
38,
|
||||
39,
|
||||
40,
|
||||
41,
|
||||
42,
|
||||
43,
|
||||
44,
|
||||
45,
|
||||
46,
|
||||
47,
|
||||
48,
|
||||
49,
|
||||
50,
|
||||
51,
|
||||
52,
|
||||
53,
|
||||
54,
|
||||
55,
|
||||
56,
|
||||
57,
|
||||
58,
|
||||
59,
|
||||
60,
|
||||
61,
|
||||
62,
|
||||
63,
|
||||
64,
|
||||
65,
|
||||
66,
|
||||
67,
|
||||
68,
|
||||
69,
|
||||
70,
|
||||
71,
|
||||
72,
|
||||
73,
|
||||
74,
|
||||
75,
|
||||
76,
|
||||
77,
|
||||
78,
|
||||
79,
|
||||
80,
|
||||
81,
|
||||
82,
|
||||
83,
|
||||
84,
|
||||
85,
|
||||
86,
|
||||
87,
|
||||
88,
|
||||
89,
|
||||
90,
|
||||
91,
|
||||
92,
|
||||
93,
|
||||
94,
|
||||
95,
|
||||
96,
|
||||
97,
|
||||
98,
|
||||
99,
|
||||
100,
|
||||
101,
|
||||
102,
|
||||
103,
|
||||
104,
|
||||
105,
|
||||
106,
|
||||
107,
|
||||
108,
|
||||
109,
|
||||
110,
|
||||
111,
|
||||
112,
|
||||
113,
|
||||
114,
|
||||
115,
|
||||
116,
|
||||
117,
|
||||
118,
|
||||
119,
|
||||
120,
|
||||
121,
|
||||
122,
|
||||
123,
|
||||
124,
|
||||
125,
|
||||
126,
|
||||
127,
|
||||
128,
|
||||
129,
|
||||
130,
|
||||
131,
|
||||
132,
|
||||
133,
|
||||
134,
|
||||
135,
|
||||
136,
|
||||
137,
|
||||
138,
|
||||
139,
|
||||
140,
|
||||
141,
|
||||
142,
|
||||
143,
|
||||
144,
|
||||
145,
|
||||
146,
|
||||
147,
|
||||
148,
|
||||
149,
|
||||
150,
|
||||
151,
|
||||
152,
|
||||
153,
|
||||
154,
|
||||
155,
|
||||
156,
|
||||
157,
|
||||
158,
|
||||
159,
|
||||
160,
|
||||
161,
|
||||
162,
|
||||
163,
|
||||
164,
|
||||
165,
|
||||
166,
|
||||
167,
|
||||
168,
|
||||
169,
|
||||
170,
|
||||
171,
|
||||
172,
|
||||
173,
|
||||
174,
|
||||
175,
|
||||
176,
|
||||
177,
|
||||
178,
|
||||
179,
|
||||
180,
|
||||
181,
|
||||
182,
|
||||
183,
|
||||
184,
|
||||
185,
|
||||
186,
|
||||
187,
|
||||
188,
|
||||
189,
|
||||
190,
|
||||
191,
|
||||
192,
|
||||
193,
|
||||
194,
|
||||
195,
|
||||
196,
|
||||
197,
|
||||
198,
|
||||
199,
|
||||
],
|
||||
"SerialiseFrameCount": 1,
|
||||
},
|
||||
"macroPageTiles": {
|
||||
"SerialiseWidth": 0,
|
||||
"SerialiseHeight": 0,
|
||||
"TileSerialiseData": [],
|
||||
},
|
||||
"parent": {
|
||||
"name": "Tile Sets",
|
||||
"path": "folders/Tile Sets.yy",
|
||||
},
|
||||
"resourceVersion": "1.0",
|
||||
"name": "tWalls",
|
||||
"tags": [],
|
||||
"resourceType": "GMTileSet",
|
||||
}
|
||||
Reference in a new issue