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

Merging Bug Fixes and Updates #61

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ ipch/
*.ncb
*.opensdf
*.sdf
*.VC.db
*.cachefile

# Visual Studio profiler
Expand Down Expand Up @@ -210,4 +211,5 @@ FakesAssemblies/
GeneratedArtifacts/
_Pvt_Extensions/
ModelManifest.xml
/Master/NucleusCoop.VC.VC.opendb
**/*.VC.VC.opendb
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why "paths"?
Every file with that extension, bar none, should be skipped.

Copy link
Author

@tbare598 tbare598 Mar 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The pattern "**/*.VC.VC.opendb" is the same as "*.VC.VC.opendb". To be honest, I didn't realize that, when I made the commit, but I knew that "**/*.VC.VC.opendb" meant anywhere, including the current directory.

Edit: Apparently you have to escape asterisks in GitHub comments.

**/*.VC.db
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't you added that extension already around 3rd comment?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did, but while I was adding "*.VC.db" to the .gitignore file, I thought I should generalize both patterns, so that they would include any directory.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Extension" exclusion already handle that?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right. I'll clean that up.

131 changes: 0 additions & 131 deletions Master/Games/Battlefront2/Battlefront2Info.cs

This file was deleted.

143 changes: 0 additions & 143 deletions Master/Games/BlackOps/BlackOpsGameInfo.cs

This file was deleted.

Loading