Skip to content

Commit

Permalink
Merge branch 'arpan/enhancement' of https://github.com/tetra-devs/mai…
Browse files Browse the repository at this point in the history
…ngame into Sayantan_Merge
  • Loading branch information
Sayantan0013 committed Jan 1, 2021
2 parents 1179c3c + def4446 commit 01f319d
Show file tree
Hide file tree
Showing 7 changed files with 113 additions and 3 deletions.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/edited_water_tile.png-43e446243a4b298297ac93c6b106e935.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://resources/Water_body/grass_and_water_tiles/edited_water_tile.png"
dest_files=[ "res://.import/edited_water_tile.png-43e446243a4b298297ac93c6b106e935.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/edited_water_tile_2.png-fb4486f6ce6c1aee3f7e7758ddcea538.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://resources/Water_body/grass_and_water_tiles/edited_water_tile_2.png"
dest_files=[ "res://.import/edited_water_tile_2.png-fb4486f6ce6c1aee3f7e7758ddcea538.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
34 changes: 34 additions & 0 deletions resources/Water_body/water_edited.tres
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[gd_resource type="TileSet" load_steps=3 format=2]

[ext_resource path="res://resources/Water_body/grass_and_water_tiles/edited_water_tile.png" type="Texture" id=1]
[ext_resource path="res://resources/Water_body/grass_and_water_tiles/edited_water_tile_2.png" type="Texture" id=2]

[resource]
0/name = "edited_water_tile"
0/texture = ExtResource( 1 )
0/tex_offset = Vector2( 0, 0 )
0/modulate = Color( 1, 1, 1, 1 )
0/region = Rect2( 0, 0, 64, 64 )
0/tile_mode = 0
0/occluder_offset = Vector2( 32, 32 )
0/navigation_offset = Vector2( 32, 32 )
0/shape_offset = Vector2( 0, 0 )
0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
0/shape_one_way = false
0/shape_one_way_margin = 0.0
0/shapes = [ ]
0/z_index = 0
1/name = "edited_water_tile_2"
1/texture = ExtResource( 2 )
1/tex_offset = Vector2( 0, 0 )
1/modulate = Color( 1, 1, 1, 1 )
1/region = Rect2( 0, 0, 64, 64 )
1/tile_mode = 0
1/occluder_offset = Vector2( 32, 32 )
1/navigation_offset = Vector2( 32, 32 )
1/shape_offset = Vector2( 0, 0 )
1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
1/shape_one_way = false
1/shape_one_way_margin = 0.0
1/shapes = [ ]
1/z_index = 0
14 changes: 11 additions & 3 deletions scenes/basic-road-arpan.tscn

Large diffs are not rendered by default.

0 comments on commit 01f319d

Please sign in to comment.