Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Confirm latest fix from 29/12/2020 #27

Merged
merged 2 commits into from
Dec 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Pokemon RPG/Assets/Scripts/PlayerController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ IEnumerator Move(Vector3 targetPos) { // Do something over a period of time (IEn
}

private bool IsWalkable(Vector3 targetPos) { // Check if the tile position is walkable
if (Physics2D.OverlapCircle(targetPos, 0.3f, solidObjectsLayer) != null) // Tile is not walkable if the IF statement is not null, as there is something at that Vector3 position // Solid objects layer as third parameter
if (Physics2D.OverlapCircle(targetPos, 0.2f, solidObjectsLayer) != null) // Tile is not walkable if the IF statement is not null, as there is something at that Vector3 position // Solid objects layer as third parameter
{
return false;
}
Expand Down
8 changes: 0 additions & 8 deletions Pokemon RPG/Assets/Tiles/tilesets.meta

This file was deleted.

6 changes: 6 additions & 0 deletions Pokemon RPG/Library/EditorInstance.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"process_id" : 6356,
"version" : "2019.2.17f1",
"app_path" : "C:/Program Files/Unity/Hub/Editor/2019.2.17f1/Editor/Unity.exe",
"app_contents_path" : "C:/Program Files/Unity/Hub/Editor/2019.2.17f1/Editor/Data"
}
Binary file modified Pokemon RPG/Library/ScriptAssemblies/Assembly-CSharp.dll
Binary file not shown.
Binary file modified Pokemon RPG/Library/ScriptAssemblies/Assembly-CSharp.pdb
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-15998,23154],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":23136}
Binary file modified Pokemon RPG/Library/assetDatabase3
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Pokemon RPG/Library/metadata/f2/f272b9a7dadece54c9427ac7b0385ecd
Binary file not shown.
289 changes: 289 additions & 0 deletions Pokemon RPG/Temp/UnityTempFile-298043cebd02bfb41844e2ba5ff03f61

Large diffs are not rendered by default.

289 changes: 289 additions & 0 deletions Pokemon RPG/Temp/UnityTempFile-4a2ef36054aa8294c91b693003c42e1b

Large diffs are not rendered by default.

Binary file added Pokemon RPG/Temp/__Backupscenes/0.backup
Binary file not shown.