Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Swartz27/cop
Browse files Browse the repository at this point in the history
  • Loading branch information
Pavel Kovalenko committed Sep 26, 2014
2 parents b5fa8cd + db5d0de commit 9a778f1
Show file tree
Hide file tree
Showing 5 changed files with 939 additions and 3 deletions.
23 changes: 23 additions & 0 deletions License.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
All source code included with this distribution, unless declared otherwise,
is commercial GSC Game World proprietary code.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

3. Neither binary nor source code redistributions may be used for any
commercial purposes.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
6 changes: 3 additions & 3 deletions Proposed engine changes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Note: Source for COP released! Will update this with source asap.
2) Multi-thread the engine for up to 4 cores
3) Solve stuttering problem (likely due to LuaJit. Solution would be to
upgrade it to newest version and then rewrite all the lua files to conform
with it)
with it).
4) Solve problem with COP sometimes not loading correctly upon launch on some
systems as well as not always exiting properly and still running as a
background task.
Expand Down Expand Up @@ -40,7 +40,7 @@ Note: Source for COP released! Will update this with source asap.
18) Grass draw distance console command - *
19) Re-enable fov and hud_fov console commands - *
20) Re-enable grass shadows - *
21) Add Instanced Tessellation for DX9&10:
21) Add Instanced Tessellation for DX9&10:
http://developer.download.nvidia.com/SDK/10.5/Samples/InstancedTessellation.zip

SDK
Expand All @@ -60,7 +60,7 @@ Weapon related changes
The new AK-12 fires 3 shots at 1,000rpm. I'm not adding an AK-12,
just giving an example).
2) Make pistols more useful somehow. Maybe make a "quick pistol" key or
something.
something.
3) Different reload sounds for reloading empty vs reloading full - *
4) Add anm_reload_empty to weapons that don't have one - *
5) Animation for misfires - *
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ This repository contains the Stalker: Call of Pripyat source code version 1.6.02

It is a place to share ideas on what to implement, gather people that
want to work on the engine, and work on the source code.

Update 9/24/2014: The VS2008 COP source will continue to be available here,
however this project now has a new home at: https://github.com/OpenXRay
24 changes: 24 additions & 0 deletions doc/procedures/commit_coding.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
TITLE: Commit message conventions

The format of commit message should be a short description of what you did.
After the description, the bug ID, review ID or anything else.

The commit log should not contain the obvious. If you change file Foo.cpp:

BAD:
"Fix bug in Foo.cpp"
BAD:
"Fix #45"
BAD:
"Commit Foo.cpp"
GOOD:
"Fix buffer overflow (close #45)."

The above does not mean that when you do a complex change do not write a
description of what you did, on the contrary. When a long description is
needed do add as much as needed to explain the change, just do not add
meaningless information (committing Foo.cpp etc.)

It is advisable to split complex commits to several smaller commits if
possible. If you see that your commit massage contain more then one topic, you
probably can and should split the commit into a few unrelated commits.
Loading

0 comments on commit 9a778f1

Please sign in to comment.