-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master'
Reverted .gitattributes xcode_ccache_wrapper change. Fixed line endings for .gitignore and .gitattributes.
- Loading branch information
Showing
6,113 changed files
with
1,508,902 additions
and
1,508,734 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,67 +1,67 @@ | ||
| # Files to ignore when considering what GIT should commit. | ||
|
|
||
| # Visual Studio | ||
| *.suo | ||
| *.user | ||
| *.sln.docstates | ||
| *.obj | ||
| *.pch | ||
| *.tlog | ||
| *.log | ||
| *.scc | ||
| *.exp | ||
| *.ilk | ||
| *.lastbuildstate | ||
| vc100.pdb | ||
| ipch | ||
| *.sdf | ||
| *.opensdf | ||
| *.idb | ||
| *.vcxproj | ||
| *.vcxproj.filters | ||
| *.sln | ||
| [Dd]ebug*/ | ||
| [Rr]elease*/ | ||
|
|
||
| # OSX/Linux build products | ||
| # Files to ignore when considering what GIT should commit. | ||
|
|
||
| # Visual Studio | ||
| *.suo | ||
| *.user | ||
| *.sln.docstates | ||
| *.obj | ||
| *.pch | ||
| *.tlog | ||
| *.log | ||
| *.scc | ||
| *.exp | ||
| *.ilk | ||
| *.lastbuildstate | ||
| vc100.pdb | ||
| ipch | ||
| *.sdf | ||
| *.opensdf | ||
| *.idb | ||
| *.vcxproj | ||
| *.vcxproj.filters | ||
| *.sln | ||
| [Dd]ebug*/ | ||
| [Rr]elease*/ | ||
|
|
||
| # OSX/Linux build products | ||
| *.DS_Store | ||
| *.mak | ||
| *.mak.vpc_crc | ||
| *.xcodeproj/ | ||
| obj*/ | ||
| !devtools/*.mak | ||
| !utils/smdlexp/smdlexp.mak | ||
| *.mak | ||
| *.mak.vpc_crc | ||
| *.xcodeproj/ | ||
| obj*/ | ||
| !devtools/*.mak | ||
| !utils/smdlexp/smdlexp.mak | ||
| *_osx32* | ||
|
|
||
| # Specific Source build products | ||
| client.pdb | ||
| client.dll | ||
| client.lib | ||
| server.pdb | ||
| server.dll | ||
| server.lib | ||
|
|
||
| client.so | ||
| client.so.dbg | ||
| server.so | ||
| server.so.dbg | ||
| server_srv.so | ||
| server_srv.so.dbg | ||
|
|
||
| client.dylib | ||
| client.dylib.dSYM/ | ||
| server.dylib | ||
| server.dylib.dSYM/ | ||
|
|
||
|
|
||
| # Specific Source build products | ||
| client.pdb | ||
| client.dll | ||
| client.lib | ||
| server.pdb | ||
| server.dll | ||
| server.lib | ||
|
|
||
| client.so | ||
| client.so.dbg | ||
| server.so | ||
| server.so.dbg | ||
| server_srv.so | ||
| server_srv.so.dbg | ||
|
|
||
| client.dylib | ||
| client.dylib.dSYM/ | ||
| server.dylib | ||
| server.dylib.dSYM/ | ||
|
|
||
| *.vpc.sentinel | ||
| *.vpc_crc | ||
| **/generated_proto/** | ||
| **/src/utils/sapi51/** | ||
| **/game/**/bin/** | ||
|
|
||
| # files generated by running a mod | ||
| config.cfg | ||
|
|
||
| # shader files | ||
| *.tmp | ||
|
|
||
| **/src/utils/sapi51/** | ||
| **/game/**/bin/** | ||
|
|
||
| # files generated by running a mod | ||
| config.cfg | ||
|
|
||
| # shader files | ||
| *.tmp | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,39 @@ | ||
| Thanks for your interest in the Source SDK 2013 project. When you make a | ||
| contribution to the project (e.g. create an Issue or submit a Pull Request) | ||
| (a "Contribution"), Valve wants to be able to use your Contribution to improve | ||
| the SDK and other Valve products. | ||
| As a condition of providing a Contribution, you agree that: | ||
| - You grant Valve a non-exclusive, irrevocable, royalty-free, worldwide license | ||
| to make, use, sell, reproduce, modify, distribute (directly and indirectly), | ||
| and publicly display and perform the Contribution, and any derivative works | ||
| that Valve may make from the Contribution, under any intellectual property you | ||
| own or have the right to license. | ||
| - You warrant and represent that the Contribution is your original creation, | ||
| that you have the authority to grant this license to Valve, and that this | ||
| license does not require the permission of any third party. Otherwise, you | ||
| provide your Contribution "as is" without warranties. | ||
| Should you wish to submit a suggestion or work that is not your original | ||
| creation, you may submit it to Valve separate from any Contribution, | ||
| explicitly identifying it as sourced from a third party, stating the details | ||
| of its origin, and informing Valve of any license or other restriction of | ||
| which you are personally aware. | ||
| Valve is happy to accept pull requests and issues in the source-sdk-2013 | ||
| repository in these cases: | ||
| * Changes that fix bugs in the SDK deployment process itself. The repository | ||
| should build out of the box, and anything that prevents that is a pull | ||
| request we want. | ||
| * High priority bugs in HL2, the Episodes, or HL2MP that can be fixed in | ||
| client.dll or server.dll. | ||
| For other changes we suggest that you issue a pull request to one of these | ||
| fine community-maintained repositories instead: | ||
| https://developer.valvesoftware.com/wiki/Source-sdk-2013-community-repos | ||
| If you are going to make a pull request, please keep them as granular as | ||
| possible. Pull requests with 3-4 unrelated changes in them aren't going to | ||
| be accepted. | ||
| Thanks for your interest in the Source SDK 2013 project. When you make a | ||
| contribution to the project (e.g. create an Issue or submit a Pull Request) | ||
| (a "Contribution"), Valve wants to be able to use your Contribution to improve | ||
| the SDK and other Valve products. | ||
|
|
||
| As a condition of providing a Contribution, you agree that: | ||
| - You grant Valve a non-exclusive, irrevocable, royalty-free, worldwide license | ||
| to make, use, sell, reproduce, modify, distribute (directly and indirectly), | ||
| and publicly display and perform the Contribution, and any derivative works | ||
| that Valve may make from the Contribution, under any intellectual property you | ||
| own or have the right to license. | ||
| - You warrant and represent that the Contribution is your original creation, | ||
| that you have the authority to grant this license to Valve, and that this | ||
| license does not require the permission of any third party. Otherwise, you | ||
| provide your Contribution "as is" without warranties. | ||
|
|
||
| Should you wish to submit a suggestion or work that is not your original | ||
| creation, you may submit it to Valve separate from any Contribution, | ||
| explicitly identifying it as sourced from a third party, stating the details | ||
| of its origin, and informing Valve of any license or other restriction of | ||
| which you are personally aware. | ||
|
|
||
|
|
||
| Valve is happy to accept pull requests and issues in the source-sdk-2013 | ||
| repository in these cases: | ||
| * Changes that fix bugs in the SDK deployment process itself. The repository | ||
| should build out of the box, and anything that prevents that is a pull | ||
| request we want. | ||
| * High priority bugs in HL2, the Episodes, or HL2MP that can be fixed in | ||
| client.dll or server.dll. | ||
|
|
||
| For other changes we suggest that you issue a pull request to one of these | ||
| fine community-maintained repositories instead: | ||
| https://developer.valvesoftware.com/wiki/Source-sdk-2013-community-repos | ||
|
|
||
| If you are going to make a pull request, please keep them as granular as | ||
| possible. Pull requests with 3-4 unrelated changes in them aren't going to | ||
| be accepted. | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,43 @@ | ||
| SOURCE 1 SDK LICENSE | ||
| Source SDK Copyright(c) Valve Corp. | ||
| THIS DOCUMENT DESCRIBES A CONTRACT BETWEEN YOU AND VALVE | ||
| CORPORATION ("Valve"). PLEASE READ IT BEFORE DOWNLOADING OR USING | ||
| THE SOURCE ENGINE SDK ("SDK"). BY DOWNLOADING AND/OR USING THE | ||
| SOURCE ENGINE SDK YOU ACCEPT THIS LICENSE. IF YOU DO NOT AGREE TO | ||
| THE TERMS OF THIS LICENSE PLEASE DON�T DOWNLOAD OR USE THE SDK. | ||
| You may, free of charge, download and use the SDK to develop a modified Valve game | ||
| running on the Source engine. You may distribute your modified Valve game in source and | ||
| object code form, but only for free. Terms of use for Valve games are found in the Steam | ||
| Subscriber Agreement located here: http://store.steampowered.com/subscriber_agreement/ | ||
| You may copy, modify, and distribute the SDK and any modifications you make to the | ||
| SDK in source and object code form, but only for free. Any distribution of this SDK must | ||
| include this LICENSE file and thirdpartylegalnotices.txt. | ||
| Any distribution of the SDK or a substantial portion of the SDK must include the above | ||
| copyright notice and the following: | ||
| DISCLAIMER OF WARRANTIES. THE SOURCE SDK AND ANY | ||
| OTHER MATERIAL DOWNLOADED BY LICENSEE IS PROVIDED | ||
| "AS IS". VALVE AND ITS SUPPLIERS DISCLAIM ALL | ||
| WARRANTIES WITH RESPECT TO THE SDK, EITHER EXPRESS | ||
| OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED | ||
| WARRANTIES OF MERCHANTABILITY, NON-INFRINGEMENT, | ||
| TITLE AND FITNESS FOR A PARTICULAR PURPOSE. | ||
| LIMITATION OF LIABILITY. IN NO EVENT SHALL VALVE OR | ||
| ITS SUPPLIERS BE LIABLE FOR ANY SPECIAL, INCIDENTAL, | ||
| INDIRECT, OR CONSEQUENTIAL DAMAGES WHATSOEVER | ||
| (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF | ||
| BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF | ||
| BUSINESS INFORMATION, OR ANY OTHER PECUNIARY LOSS) | ||
| ARISING OUT OF THE USE OF OR INABILITY TO USE THE | ||
| ENGINE AND/OR THE SDK, EVEN IF VALVE HAS BEEN | ||
| ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. | ||
| If you would like to use the SDK for a commercial purpose, please contact Valve at | ||
| [email protected]. | ||
| SOURCE 1 SDK LICENSE | ||
|
|
||
| Source SDK Copyright(c) Valve Corp. | ||
|
|
||
| THIS DOCUMENT DESCRIBES A CONTRACT BETWEEN YOU AND VALVE | ||
| CORPORATION ("Valve"). PLEASE READ IT BEFORE DOWNLOADING OR USING | ||
| THE SOURCE ENGINE SDK ("SDK"). BY DOWNLOADING AND/OR USING THE | ||
| SOURCE ENGINE SDK YOU ACCEPT THIS LICENSE. IF YOU DO NOT AGREE TO | ||
| THE TERMS OF THIS LICENSE PLEASE DON�T DOWNLOAD OR USE THE SDK. | ||
|
|
||
| You may, free of charge, download and use the SDK to develop a modified Valve game | ||
| running on the Source engine. You may distribute your modified Valve game in source and | ||
| object code form, but only for free. Terms of use for Valve games are found in the Steam | ||
| Subscriber Agreement located here: http://store.steampowered.com/subscriber_agreement/ | ||
|
|
||
| You may copy, modify, and distribute the SDK and any modifications you make to the | ||
| SDK in source and object code form, but only for free. Any distribution of this SDK must | ||
| include this LICENSE file and thirdpartylegalnotices.txt. | ||
|
|
||
| Any distribution of the SDK or a substantial portion of the SDK must include the above | ||
| copyright notice and the following: | ||
|
|
||
| DISCLAIMER OF WARRANTIES. THE SOURCE SDK AND ANY | ||
| OTHER MATERIAL DOWNLOADED BY LICENSEE IS PROVIDED | ||
| "AS IS". VALVE AND ITS SUPPLIERS DISCLAIM ALL | ||
| WARRANTIES WITH RESPECT TO THE SDK, EITHER EXPRESS | ||
| OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED | ||
| WARRANTIES OF MERCHANTABILITY, NON-INFRINGEMENT, | ||
| TITLE AND FITNESS FOR A PARTICULAR PURPOSE. | ||
|
|
||
| LIMITATION OF LIABILITY. IN NO EVENT SHALL VALVE OR | ||
| ITS SUPPLIERS BE LIABLE FOR ANY SPECIAL, INCIDENTAL, | ||
| INDIRECT, OR CONSEQUENTIAL DAMAGES WHATSOEVER | ||
| (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF | ||
| BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF | ||
| BUSINESS INFORMATION, OR ANY OTHER PECUNIARY LOSS) | ||
| ARISING OUT OF THE USE OF OR INABILITY TO USE THE | ||
| ENGINE AND/OR THE SDK, EVEN IF VALVE HAS BEEN | ||
| ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. | ||
|
|
||
|
|
||
| If you would like to use the SDK for a commercial purpose, please contact Valve at | ||
| [email protected]. |
Oops, something went wrong.