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

Package: Added a package for FPS, ported to unity 2017 #6

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

Package: Added a package for FPS, ported to unity 2017 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
afed279
Package: Added a package for FPS, ported to unity 2017
mouri11 Sep 24, 2017
ecac5f8
Merge branch 'master' of https://github.com/PhoenixRRDS/Shadows
mouri11 Nov 12, 2017
5350d48
Merge branch 'master' of https://github.com/PhoenixRRDS/Shadows
mouri11 Nov 20, 2017
79d0abc
.gitignore: Resolving conflicts
mouri11 Nov 22, 2017
339029d
Merge branch 'master' of https://github.com/PhoenixRRDS/Shadows
mouri11 Nov 26, 2017
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
36 changes: 36 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,38 @@
<<<<<<< HEAD
[Ll]ibrary/
[Tt]emp/
[Oo]bj/
[Bb]uild/
[Bb]uilds/
Assets/AssetStoreTools*

# Visual Studio 2015 cache directory
.vs/

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

# Unity3D generated meta files
*.pidb.meta

# Unity3D Generated File On Crash Reports
sysinfo.txt

# Builds
*.apk
=======
[Ll]ibrary/
[Tt]emp/
[Oo]bj/
Expand Down Expand Up @@ -32,3 +67,4 @@ sysinfo.txt
# Builds
*.apk
*.unitypackage
>>>>>>> 5ca18b79385c3c0ce0737c39e91bd623130106ed
Binary file added Labyrinth/BreakThrough.unitypackage
View file
Open in desktop
Binary file not shown.