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

Update .gitignore. #182

Merged
merged 8 commits into from
Dec 10, 2013
Merged

Update .gitignore. #182

merged 8 commits into from
Dec 10, 2013

Conversation

narendraumate
Copy link
Contributor

Ignore vpc_crc and filters extensions.

@yaakov-h
Copy link

yaakov-h commented Sep 8, 2013

Regarding 20841b1 would it not be simpler to just add xcode_ccache_wrapper to .gitattributes?

Fixed

error: can't exec
'/Users/ardneran/Documents/Projects/GitHub/source-sdk-2013/*p/src/devtoo
ls/bin/osx32/xcode_ccache_wrapper' (No such file or directory)
Command
/Users/ardneran/Documents/Projects/GitHub/source-sdk-2013/*p/src/devtool
s/bin/osx32/xcode_ccache_wrapper failed with exit code 71

http://www.linuxquestions.org/questions/linux-general-1/bad-interpreter-
no-such-file-or-directory-213617/#post1975207
perl -i -pe's/\r$//;' <file name here>
This will hopefully prevent file turning into CRLF when someone next
touches it.
@narendraumate
Copy link
Contributor Author

@yaakov-h fixed in 54fc005. Thanks 👍 I think the attribute only kicks in during checkin so whether the file turns into CRLF again would depend on the global setting.

@neico
Copy link
Contributor

neico commented Sep 8, 2013

While we're at it, here's some stuff I added to my files, feel free to ignore what's not needed:

.gitattributes

* text=auto

creategameprojects text eol=lf
createallprojects text eol=lf
vpc text eol=lf
*.sh text eol=lf

*.c diff=cpp
*.cc diff=cpp
*.cpp diff=cpp
*.h diff=cpp
*.hpp diff=cpp

.gitignore

# Visual Studio
...
*.vcxproj.filters

# Windows build products
[Dd]ebug*/
[Rr]elease*/
*.vpc.sentinel
*.vpc_crc

# OSX/Linux build products
...
*.project

# Specific Source build products
...
*generated_proto*

and for the content part:

/addons
/bin/*.pdb
/bin/*.dbg
/cache
/cfg/server_blacklist.txt
/cfg/config.cfg
/downloadlists
/downloads
/maps/graphs
/materials/vgui/logos/*
/save
/screenshots
/sound/sound.cache
/user_custom
/console.log
/demoheader.tmp
/modelsounds.cache
/stats.txt
/voice_ban.dt

@narendraumate
Copy link
Contributor Author

@neico Thanks. Picked up a few from your ignore list. Haven't worked much with content yet but will update as time comes.

Added a few extensions and ignore paths.
@jstasiak
Copy link
Contributor

+1

@jorgenpt
Copy link
Contributor

jorgenpt commented Dec 3, 2013

@ardneran, nice. The xcode_ccache_wrapper stuff shouldn't be necessary if you rebase / merge with today's changes, and if you add .DS_Store to the ignore I'll merge it all. 👍

@narendraumate
Copy link
Contributor Author

@jorgenpt merged and added the DS_Store as requested. Let me know if it looks ok. Thanks.

@jorgenpt
Copy link
Contributor

jorgenpt commented Dec 3, 2013

Sorry, it'll need one more merge, just slammed a lot of files including .gitignore and .gitattributes. Fixed line endings in .gitignore.

Reverted .gitattributes xcode_ccache_wrapper change. Fixed line endings
for .gitignore and .gitattributes.
@narendraumate
Copy link
Contributor Author

@jorgenpt merged again. Could you please check if the line endings in pull request match with yours. What method or editor did you use to create those endings?

jorgenpt added a commit that referenced this pull request Dec 10, 2013
@jorgenpt jorgenpt merged commit 9c37fcc into ValveSoftware:master Dec 10, 2013
@jorgenpt
Copy link
Contributor

@ardneran, I used vim, but for changing line endings on many files I use dos2unix.

1upD referenced this pull request in entropy-zero/source-sdk-2013 Sep 14, 2021
Smarter surrender hints + Minor surrender behavior AI fix

Approved-by: 1upD
Petercov pushed a commit to Petercov/source-sdk-2013 that referenced this pull request Apr 26, 2022
…nint-loader-enhancement

NPCs can load dynamic interactions from all animation MDLs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants