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.

Sign up for GitHub

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

Jump to bottom

Telportation > Scene Changing #2

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Telportation > Scene Changing #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8bd7ea9
Starter Project for 2D
torirossini Mar 25, 2020
0c4e7e8
2D Packages
torirossini Mar 27, 2020
fab38ee
2D Package Setup
torirossini Mar 27, 2020
c96c34a
tile assets
torirossini Mar 27, 2020
b2dda81
dont break
torirossini Mar 28, 2020
c985c25
Merge branch 'master' into Tori
torirossini Apr 16, 2020
bd83d82
New interactable doors and camera cleanups
torirossini Apr 16, 2020
115e92c
Fixing NPC References
torirossini Apr 19, 2020
82fcc70
Party Menu Progress
torirossini Apr 28, 2020
f1607cd
Guildhall Interior
torirossini Apr 28, 2020
5ee3cf8
Good Guildhall Frame
torirossini Apr 30, 2020
b31b65c
Decorations and rearranging heirarchy
torirossini Apr 30, 2020
2bbba21
Update Overworld.unity
torirossini May 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 8 additions & 0 deletions 2D_DCDS/Assets/GameFoundation.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

100 changes: 100 additions & 0 deletions 2D_DCDS/Assets/GameFoundation/GameFoundationDatabase.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-5525881437371035437
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2b7bd278f724ab94d891fb484af87b44, type: 3}
m_Name: _Catalog_GameItems
m_EditorClassIdentifier:
m_Categories: []
m_Definitions: []
--- !u!114 &-1170074288005481817
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 99a121bc2d8644fcb8f5f5ed98363908, type: 3}
m_Name: main_Inventory
m_EditorClassIdentifier:
m_DisplayName: Main
m_Id: main
m_ReferenceDefinition: {fileID: 0}
m_CategoryHashes:
m_CategoryIds: []
m_DetailDefinitionValues: []
m_DefaultItems: []
--- !u!114 &-796209344071347979
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 48b084f2c338a4185ab8badeed2a3947, type: 3}
m_Name: _Catalog_Inventories
m_EditorClassIdentifier:
m_Categories: []
m_CollectionDefinitions:
- {fileID: -1170074288005481817}
- {fileID: 4450661068821695023}
m_ItemDefinitions: []
m_DefaultCollectionDefinitions: []
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b6d6d794703b5406883240f543e5b084, type: 3}
m_Name: GameFoundationDatabase
m_EditorClassIdentifier:
m_GameItemCatalog: {fileID: -5525881437371035437}
m_InventoryCatalog: {fileID: -796209344071347979}
m_StatCatalog: {fileID: 8620264374953138703}
--- !u!114 &4450661068821695023
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 99a121bc2d8644fcb8f5f5ed98363908, type: 3}
m_Name: wallet_Inventory
m_EditorClassIdentifier:
m_DisplayName: Wallet
m_Id: wallet
m_ReferenceDefinition: {fileID: 0}
m_CategoryHashes:
m_CategoryIds: []
m_DetailDefinitionValues: []
m_DefaultItems: []
--- !u!114 &8620264374953138703
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b88f5bccd054f984d9be6ad05294da40, type: 3}
m_Name: _Catalog_Stats
m_EditorClassIdentifier:
m_StatDefinitions: []
8 changes: 8 additions & 0 deletions 2D_DCDS/Assets/GameFoundation/GameFoundationDatabase.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions 2D_DCDS/Assets/GameFoundation/Resources.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions 2D_DCDS/Assets/GameFoundation/Resources/GameFoundationDatabaseSettings.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e0b6b4397279645cb9e8707dd52d400f, type: 3}
m_Name: GameFoundationDatabaseSettings
m_EditorClassIdentifier:
m_Database: {fileID: 11400000, guid: 0e164fa400e122c4eac0c310b79631ff, type: 2}
8 changes: 8 additions & 0 deletions 2D_DCDS/Assets/GameFoundation/Resources/GameFoundationDatabaseSettings.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions 2D_DCDS/Assets/HDRP Sample Content.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions 2D_DCDS/Assets/HDRP Sample Content/Post-processing.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions 2D_DCDS/Assets/HDRP Sample Content/Post-processing/Lens Dirt.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added 2D_DCDS/Assets/HDRP Sample Content/Post-processing/Lens Dirt/LensDirt00.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
115 changes: 115 additions & 0 deletions 2D_DCDS/Assets/HDRP Sample Content/Post-processing/Lens Dirt/LensDirt00.png.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added 2D_DCDS/Assets/HDRP Sample Content/Post-processing/Lens Dirt/LensDirt01.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading