Skip to content
Snippets Groups Projects
Commit b7ae583c authored by Kyaw Aung's avatar Kyaw Aung
Browse files

merged with raj

parents 8d0ba854 9772f9da
No related branches found
No related tags found
No related merge requests found
Showing
with 203 additions and 13 deletions
......@@ -6,39 +6,64 @@ dock_5_selected_tab_idx=0
dock_floating={}
dock_bottom=[]
dock_closed=[]
<<<<<<< HEAD
dock_split_2=-1
dock_split_3=0
dock_hsplit_1=0
<<<<<<<HEADdock_hsplit_2=498
dock_hsplit_3=-483
dock_hsplit_2=461
=======
dock_split_2=0
dock_split_3=0
dock_hsplit_1=0
<<<<<<<HEADdock_hsplit_2=498
dock_hsplit_3=-540
dock_hsplit_2=540
>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
dock_hsplit_4=0
dock_filesystem_h_split_offset=240
dock_filesystem_h_split_offset=480
dock_filesystem_v_split_offset=0
dock_filesystem_display_mode=0
dock_filesystem_file_sort=0
dock_filesystem_file_list_display_mode=1
<<<<<<< HEAD
dock_filesystem_selected_paths=PackedStringArray("res://assets/Resized Chess Piece Assets/White_rook.png")
dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scripts/", "res://scenes/", "res://scenes/ui/", "res://scenes/screens/", "res://assets/ui/", "res://assets/ui/title_screen/")
=======
dock_filesystem_selected_paths=PackedStringArray("res://scenes/ui/menu_button.tscn")
dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scenes/")
>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
dock_3="Scene,Import"
dock_4="FileSystem"
dock_5="Inspector,Node,History"
[EditorNode]
<<<<<<< HEAD
open_scenes=PackedStringArray("res://main.tscn", "res://scenes/scene_manager.tscn", "res://scenes/game.tscn", "res://scenes/ui/pop_up_label.tscn", "res://scenes/screens/title_screen.tscn", "res://scenes/screens/select_piece_screen.tscn", "res://scenes/ui/menu_button.tscn")
current_scene="res://main.tscn"
center_split_offset=-274
=======
open_scenes=PackedStringArray("res://scenes/game.tscn")
current_scene="res://scenes/game.tscn"
center_split_offset=0
>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
selected_default_debugger_tab_idx=0
selected_main_editor_idx=2
selected_bottom_panel_item=0
selected_bottom_panel_item=1
[ScriptEditor]
<<<<<<< HEAD
open_scripts=["res://scripts/Assassin.gd", "res://scripts/game.gd", "res://scripts/main/main.gd", "res://scripts/screens/menu_button.gd", "res://scripts/Pawn.gd", "res://scripts/Piece.gd", "res://scripts/ui/pop_up_label.gd", "res://scripts/Queen.gd", "res://scripts/Rook.gd", "res://scripts/run_data/run_data.gd", "res://scripts/scene_manager.gd", "res://scripts/screens/select_piece_screen.gd", "res://scripts/screens/title_screen.gd"]
selected_script="res://scripts/main/main.gd"
=======
open_scripts=["res://scripts/game.gd"]
selected_script="res://scripts/game.gd"
>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
open_help=[]
script_split_offset=70
script_split_offset=140
list_split_offset=0
zoom_factor=1.00475
......
ea4bc82a6ad023ab7ee23ee620429895
<<<<<<< HEAD
::res://::1739059803
icon.svg::CompressedTexture2D::6378281210119878262::1738795350::1738864896::1::::<><>::
main.tscn::PackedScene::5692118487183161714::1738886824::0::1::::<><>::uid://cu7lkx15lmfww::::res://scenes/scene_manager.tscn<>res://scripts/main/main.gd
......@@ -122,3 +123,120 @@ select_piece_screen.gd::GDScript::-1::1738864872::0::1::::SelectPieceScreen<>Con
title_screen.gd::GDScript::-1::1738864872::0::1::::TitleScreen<>Control<>::
::res://scripts/ui/::1738804415
pop_up_label.gd::GDScript::-1::1738804415::0::1::::<>Label<>::
=======
::res://::1738784912
icon.svg::CompressedTexture2D::6378281210119878262::1738697583::1738698231::1::::<><>::
main.tscn::PackedScene::5692118487183161714::1738698010::0::1::::<><>::uid://cu7lkx15lmfww::::res://scenes/scene_manager.tscn
README.md::TextFile::-1::1738697583::0::1::::<><>::
::res://Assets/::1738973974
::res://Assets/Character Assets/::1738973983
Bishop Character.png::CompressedTexture2D::5940736122524784063::1738973983::1738974455::1::::<><>::
Knight_Character.png::CompressedTexture2D::6219382475167814187::1738973983::1738974455::1::::<><>::
Rook Character.png::CompressedTexture2D::4669491807804796081::1738973983::1738974455::1::::<><>::
::res://Assets/noise/::1738785341
noise2.tres::NoiseTexture2D::5054739835828921764::1738785341::0::1::::<><>::
noise3.tres::NoiseTexture2D::906885015046579772::1738785341::0::1::::<><>::
noise.tres::NoiseTexture2D::1693764769519573005::1738785341::0::1::::<><>::
::res://Assets/Original size Chess pieces/::1738698231
Black king piece 2.png::CompressedTexture2D::7820367427145083060::1738697583::1738698231::1::::<><>::
Black knight piece.png::CompressedTexture2D::4196515762256027844::1738697583::1738698231::1::::<><>::
Black Pawn Piece 2.png::CompressedTexture2D::2167440687080906934::1738697583::1738698231::1::::<><>::
Black Queen Piece 2.png::CompressedTexture2D::6638986330393441989::1738697583::1738698231::1::::<><>::
Black rook piece.png::CompressedTexture2D::1872655759582013005::1738697583::1738698231::1::::<><>::
White king piece 2.png::CompressedTexture2D::7139286146806283259::1738697583::1738698231::1::::<><>::
White knight piece.png::CompressedTexture2D::8293368904171920332::1738697583::1738698231::1::::<><>::
White Pawn Piece 2.png::CompressedTexture2D::8915038826611091975::1738697583::1738698231::1::::<><>::
White Queen Piece 2.png::CompressedTexture2D::339041922548181320::1738697583::1738698231::1::::<><>::
White rook piece.png::CompressedTexture2D::6272641373813891014::1738697583::1738698231::1::::<><>::
::res://Assets/Resized Chess Piece Assets/::1738785332
Black_Assassin.png::CompressedTexture2D::8073890137727350160::1738785199::1738785332::1::::<><>::
Black_Bishop.png::CompressedTexture2D::460446186536534245::1738785199::1738785332::1::::<><>::
Black_king.png::CompressedTexture2D::4854362018128016652::1738785199::1738785332::1::::<><>::
Black_knight.png::CompressedTexture2D::1617611918054521687::1738785199::1738785332::1::::<><>::
Black_mage.png::CompressedTexture2D::2920003665923805930::1738785199::1738785332::1::::<><>::
Black_Pawn.png::CompressedTexture2D::2619567017608544670::1738785199::1738785332::1::::<><>::
Black_Queen.png::CompressedTexture2D::6947892130764941861::1738785199::1738785332::1::::<><>::
Black_rook.png::CompressedTexture2D::8764665212117114244::1738785199::1738785332::1::::<><>::
Black_wizard.png::CompressedTexture2D::5486342020773449925::1738785199::1738785332::1::::<><>::
White_Assassin.png::CompressedTexture2D::3263768232109514548::1738785199::1738785332::1::::<><>::
White_Bishop.png::CompressedTexture2D::2601047089659819063::1738785199::1738785332::1::::<><>::
White_king.png::CompressedTexture2D::5585160899749004797::1738785199::1738785332::1::::<><>::
White_knight.png::CompressedTexture2D::1766720508600943431::1738785199::1738785332::1::::<><>::
White_mage.png::CompressedTexture2D::902301787075014336::1738785199::1738785332::1::::<><>::
White_Pawn.png::CompressedTexture2D::1597566599437225196::1738785199::1738785332::1::::<><>::
White_Queen.png::CompressedTexture2D::172918419201557125::1738785199::1738785332::1::::<><>::
White_rook.png::CompressedTexture2D::5685989093237609766::1738785199::1738785332::1::::<><>::
White_wizard.png::CompressedTexture2D::3041081003801605884::1738785199::1738785332::1::::<><>::
::res://Assets/shaders/::1738785340
3d_effect.gdshader::Shader::-1::1738698010::0::1::::<><>::
bg.gdshader::Shader::-1::1738785340::0::1::::<><>::
color.gdshader::Shader::-1::1738698010::0::1::::<><>::
shadow.gdshader::Shader::-1::1738698010::0::1::::<><>::
::res://Assets/sprites/::1738698231
bishop.png::CompressedTexture2D::4631301773944929250::1738698010::1738698231::1::::<><>::
knight.png::CompressedTexture2D::3545640967717948854::1738698010::1738698231::1::::<><>::
pawn.png::CompressedTexture2D::1338760335342038528::1738698010::1738698228::1::::<><>::
rook.png::CompressedTexture2D::6790909281007670776::1738698010::1738698228::1::::<><>::
tile.png::CompressedTexture2D::8704336058451696509::1738698010::1738698228::1::::<><>::
::res://Assets/temp_assets/::1738698229
assassin.png::CompressedTexture2D::2309680507621369322::1738698010::1738698228::1::::<><>::
black_bishop.png::CompressedTexture2D::7509881182472568151::1738698010::1738698228::1::::<><>::
black_king.png::CompressedTexture2D::3646032776351028361::1738698010::1738698228::1::::<><>::
black_knight.png::CompressedTexture2D::4591257172048987833::1738698010::1738698229::1::::<><>::
black_pawn.png::CompressedTexture2D::3912668014183198267::1738698010::1738698229::1::::<><>::
black_queen.png::CompressedTexture2D::7989886812523566234::1738698010::1738698229::1::::<><>::
black_rook.png::CompressedTexture2D::8767708966549765967::1738698010::1738698229::1::::<><>::
mage.png::CompressedTexture2D::4650471376600460963::1738698010::1738698229::1::::<><>::
Piece_move.png::CompressedTexture2D::260618725614842917::1738698010::1738698229::1::::<><>::
temp_chess_board.png::CompressedTexture2D::4173558678901569366::1738698010::1738698229::1::::<><>::
turn-black.png::CompressedTexture2D::7112033964315790810::1738698010::1738698229::1::::<><>::
turn-white.png::CompressedTexture2D::7344907768700758025::1738698010::1738698229::1::::<><>::
white_bishop.png::CompressedTexture2D::8093744356261485644::1738698010::1738698229::1::::<><>::
white_king.png::CompressedTexture2D::5901183203660598461::1738698010::1738698229::1::::<><>::
white_knight.png::CompressedTexture2D::7533630084821562912::1738698010::1738698229::1::::<><>::
white_pawn.png::CompressedTexture2D::8196778834906249875::1738698010::1738698229::1::::<><>::
white_queen.png::CompressedTexture2D::1957958042777204643::1738698010::1738698229::1::::<><>::
white_rook.png::CompressedTexture2D::3317152307554436932::1738698010::1738698229::1::::<><>::
wizard.png::CompressedTexture2D::2759604866355024615::1738698010::1738698229::1::::<><>::
::res://Assets/ui/::1738698232
Go_Save_The_King_Menu.jpg::CompressedTexture2D::7252735845995868232::1738698010::1738698232::1::::<><>::
Mockup Gameplay Design.jpg::CompressedTexture2D::4859609684236806088::1738698010::1738698231::1::::<><>::
Mockup Shop Design.jpg::CompressedTexture2D::8043055154093708922::1738698010::1738698231::1::::<><>::
::res://Assets/ui/title_screen/::1738698229
play_button.png::CompressedTexture2D::5896995890187459238::1738698010::1738698229::1::::<><>::
quit_button.png::CompressedTexture2D::5172428563227279585::1738698010::1738698229::1::::<><>::
rules_button.png::CompressedTexture2D::8060955005205795067::1738698010::1738698229::1::::<><>::
::res://scenes/::1738787758
Assassin.tscn::PackedScene::1241611789899982875::1738786130::0::1::::<><>::res://scripts/Assassin.gd<>uid://753dogr1moxe::::res://assets/temp_assets/assassin.png
Bishop.tscn::PackedScene::2789588702038144760::1738786614::0::1::::<><>::res://scripts/Bishop.gd<>uid://b68o4mj7wcwvq::::res://assets/sprites/bishop.png
explosion.tscn::PackedScene::69466253159940830::1738698010::0::1::::<><>::
game.tscn::PackedScene::8577524005707705072::1738787758::0::1::::<><>::res://scripts/game.gd<>res://assets/shaders/bg.gdshader<>uid://yeqb8ndri7xp::::res://Assets/noise/noise.tres<>uid://ceas3dsjeq4ge::::res://Assets/noise/noise2.tres<>uid://m6ki73qfbp2s::::res://Assets/noise/noise3.tres
King.tscn::PackedScene::8277830396459966414::1738698010::0::1::::<><>::res://scripts/King.gd<>uid://cdogixbq8ay3t::::res://assets/Resized Chess Piece Assets/White_king.png
Knight.tscn::PackedScene::5270730075267457303::1738698010::0::1::::<><>::res://scripts/Knight.gd<>uid://mf4a3jclbwih::::res://assets/Resized Chess Piece Assets/White_knight.png
Mage.tscn::PackedScene::10334063134713649::1738786984::0::1::::<><>::res://scripts/Mage.gd<>uid://b7iyt4iwjbtd0::::res://assets/temp_assets/mage.png
Pawn.tscn::PackedScene::3675784333675896641::1738787755::0::1::::<><>::res://scripts/Pawn.gd<>uid://ndi1e8thkonq::::res://assets/Resized Chess Piece Assets/White_Pawn.png
Queen.tscn::PackedScene::7495869360053814603::1738698010::0::1::::<><>::res://scripts/Queen.gd<>uid://cb3vq168iyomb::::res://assets/Resized Chess Piece Assets/White_Queen.png
Rook.tscn::PackedScene::9162401199636684468::1738698010::0::1::::<><>::uid://b00wxxfjk04ke::::res://assets/Resized Chess Piece Assets/White_rook.png
scene_manager.tscn::PackedScene::6243365322716451430::1738698010::0::1::::<><>::res://scripts/scene_manager.gd
texture_holder.tscn::PackedScene::594714386286134588::1738698010::0::1::::<><>::
title_screen.tscn::PackedScene::8154710134031658440::1738698010::0::1::::<><>::res://scripts/title_screen/title_screen.gd<>uid://bm8sv1itwm467::::res://scenes/ui/menu_button.tscn
Wizard.tscn::PackedScene::6352212773395470747::1738787495::0::1::::<><>::res://scripts/Wizard.gd<>uid://bfk1j3brcknkp::::res://assets/temp_assets/wizard.png
::res://scenes/ui/::1738698010
menu_button.tscn::PackedScene::3297943059633979218::1738698010::0::1::::<><>::res://assets/shaders/3d_effect.gdshader<>res://scripts/title_screen/menu_button.gd
::res://scripts/::1738698010
Assassin.gd::GDScript::-1::1738698010::0::1::::Assassin<>Piece<>::
Bishop.gd::GDScript::-1::1738698010::0::1::::Bishop<>Piece<>::
game.gd::GDScript::-1::1738698010::0::1::::game<>Node<>::
King.gd::GDScript::-1::1738698010::0::1::::King<>Piece<>::
Knight.gd::GDScript::-1::1738698010::0::1::::Knight<>Piece<>::
Mage.gd::GDScript::-1::1738698010::0::1::::Mage<>Piece<>::
Pawn.gd::GDScript::-1::1738698010::0::1::::Pawn<>Piece<>::
Piece.gd::GDScript::-1::1738698010::0::1::::Piece<>Node2D<>::
Queen.gd::GDScript::-1::1738698010::0::1::::Queen<>Piece<>::
Rook.gd::GDScript::-1::1738698010::0::1::::Rook<>Piece<>::
scene_manager.gd::GDScript::-1::1738698010::0::1::::<>Node<>::
Wizard.gd::GDScript::-1::1738698010::0::1::::Wizard<>Piece<>::
::res://scripts/title_screen/::1738698010
menu_button.gd::GDScript::-1::1738698010::0::1::::TitleButton<>Button<>::
title_screen.gd::GDScript::-1::1738698010::0::1::::TitleScreen<>Control<>::
>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
<<<<<<< HEAD
res://main.tscn
res://assets/shaders/bg.gdshader
res://assets/noise/noise.tres
......@@ -11,3 +12,15 @@ res://scenes/screens/select_piece_screen.tscn
res://scenes/ui/menu_button.tscn
res://scripts/screens/select_piece_screen.gd
res://scripts/run_data/run_data.gd
=======
res://scripts/Assassin.gd
res://scripts/game.gd
res://scenes/game.tscn
res://assets/shaders/bg.gdshader
res://Assets/noise/noise.tres
res://Assets/noise/noise2.tres
res://Assets/noise/noise3.tres
res://scripts/Mage.gd
res://scripts/Wizard.gd
res://scripts/Bishop.gd
>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
......@@ -8,7 +8,7 @@ Anim={
"grid_snap_active": false,
"grid_step": Vector2(8, 8),
"grid_visibility": 1,
"ofs": Vector2(-1092.7, -448.319),
"ofs": Vector2(-154.44, -536.043),
"primary_grid_step": Vector2i(8, 8),
"show_group_gizmos": true,
"show_guides": true,
......@@ -175,4 +175,8 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
<<<<<<< HEAD
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/Main")])
=======
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16894/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9280/@VSplitContainer@9102/@HSplitContainer@9104/@HSplitContainer@9106/@Control@9107/@SubViewportContainer@9108/@SubViewport@9109/Game")])
>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
......@@ -6,6 +6,7 @@ use_advanced_connections=false
[dialog_bounds]
<<<<<<<HEADcreate_new_node=Rect2(2145, 197, 900, 700)
<<<<<<< HEAD
project_settings=Rect2(1290, 76, 1590, 867)
create_new_node=Rect2(510, 264, 1613, 885)
......@@ -17,3 +18,17 @@ scripts=["Array", "res://scripts/screens/menu_button.gd", "res://scripts/screens
[script_setup]
last_selected_language="GDScript"
=======
project_settings=Rect2(2022, 76, 1590, 867)
editor_settings=Rect2(706, 197, 900, 700)
[recent_files]
scenes=["res://scenes/game.tscn"]
scripts=["res://scripts/game.gd"]
[color_picker]
picker_shape=3
recent_presets=PackedColorArray(0, 0.84937, 0.111819, 1, 0, 0.417456, 0.0325145, 1, 0.104888, 0.123405, 0.154273, 1)
>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
......@@ -3,6 +3,7 @@
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
<<<<<<< HEAD
"column": 36,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
......@@ -176,6 +177,13 @@ state={
"h_scroll_position": 0,
"row": 54,
"scroll_position": 41.0,
=======
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 147,
"scroll_position": 147.0,
>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
"selection": false,
"syntax_highlighter": "GDScript"
}
......@@ -53,12 +53,15 @@ list=Array[Dictionary]([{
"language": &"GDScript",
"path": "res://scripts/Rook.gd"
}, {
<<<<<<< HEAD
"base": &"Control",
"class": &"SelectPieceScreen",
"icon": "",
"language": &"GDScript",
"path": "res://scripts/screens/select_piece_screen.gd"
}, {
=======
>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
"base": &"Button",
"class": &"TitleButton",
"icon": "",
......@@ -69,7 +72,11 @@ list=Array[Dictionary]([{
"class": &"TitleScreen",
"icon": "",
"language": &"GDScript",
<<<<<<< HEAD
"path": "res://scripts/screens/title_screen.gd"
=======
"path": "res://scripts/title_screen/title_screen.gd"
>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
}, {
"base": &"Piece",
"class": &"Wizard",
......
No preview for this file type
source_md5="1f8596704a4313c38e12d613f3fbe423"
dest_md5="63e062f92b548311db291c264535621e"
dest_md5="7386ff6bb470f294f0724aa6b4a3c399"
No preview for this file type
source_md5="1ee24bf68d43a784b8af3720f929830c"
dest_md5="2260e63ce3cef51f2b4586482514e425"
dest_md5="214f2a3afee18823f3ef358920265f56"
No preview for this file type
source_md5="98129eb716061176fa515ad0a02440fd"
dest_md5="6c8c45f254c9f0041e827b93b1ed6b23"
dest_md5="f9f8d3eb9d297585ac2924a32ff164d3"
No preview for this file type
source_md5="c56048eb1dc7be6736cd82ef34d36ece"
dest_md5="4b5b68a772fd44d82f8e4d479580ae70"
source_md5="0c87baba96a1a06cf40525d9bf23b847"
dest_md5="aad2bcdda1268c1597e87b0cae7bfcd3"
No preview for this file type
source_md5="f2e1d6f97bfa9fbe0ca1e2897d3f9b81"
dest_md5="52621a4f50d4b91df03fcdc255a09175"
source_md5="787dcb945f96a878fbcee676452e28c3"
dest_md5="f1ffce95e09f2e6b918fd6defb4ce2c8"
No preview for this file type
source_md5="0aeae9d0c31b59e0cdecb4b22467d08e"
dest_md5="69bcc0fb89685324c8dda57d074e2c51"
source_md5="fb88c43e9f6aac1934292bb49230d779"
dest_md5="17647cf1e569d741335eec48f175010d"
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment