Skip to content

Anna rollback #4

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

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

Anna rollback #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c5f027
added item pickups
AnnaAD Aug 29, 2018
8fe86fe
Minor commit.
AnnaAD Aug 30, 2018
a9b699c
Stuff to add, hopefully before merge
AnnaAD Aug 31, 2018
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
21 changes: 20 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,32 @@
Dungeon^3/Library/
Dungeon^3/Temp/

# Visual Studio cache directory
.vs/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb
*.opendb

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta

# Unity3D Generated File On Crash Reports
sysinfo.txt

*.meta
# Builds
*.apk
*.unitypackage
24 changes: 24 additions & 0 deletions Dungeon^3/.vs/Dungeon^3/xs/UserPrefs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<Properties StartupConfiguration="{2A3C97CA-270E-F22F-3E39-22D6A2AD239B}|">
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="Unity.Editor" />
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/Inventory/Inventory.cs">
<Files>
<File FileName="Assets/Scripts/Weapons/ArrowBehavior.cs" Line="37" Column="1" />
<File FileName="Assets/Scripts/Inventory/Inventory.cs" Line="25" Column="1" />
<File FileName="Assets/Scripts/Inventory/Equipment.cs" Line="12" Column="3" />
<File FileName="Assets/Scripts/Inventory/Item.cs" Line="12" Column="1" />
<File FileName="Assets/Scripts/Player/PlayerController.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/Inventory/PopupManager.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/Player/PlayerHealth.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/Level/ChestController.cs" Line="21" Column="81" />
<File FileName="Assets/PickUp.cs" Line="26" Column="17" />
<File FileName="Assets/FixTextRotatation.cs" Line="15" Column="88" />
<File FileName="Assets/Scripts/Inventory/EquipCategories.cs" Line="33" Column="3" />
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
<MultiItemStartupConfigurations />
</Properties>
189 changes: 0 additions & 189 deletions Dungeon^3/Assembly-CSharp.csproj
View file
Open in desktop

This file was deleted.

Loading