Merge branch 'master' of https://github.com/AtomicGameEngine/AtomicGameEngine

Credits.md → AUTHORS.md

@@ -1,16 +1,24 @@
-## Atomic Game Engine
+## Atomic Game Engine™
 ------------------
 
-Please see [LICENSE.md](https://github.com/AtomicGameEngine/AtomicGameEngine/blob/master/LICENSE.md) for the **Atomic Game Engine Source Code EULA**
+#### THUNDERBEAST GAMES LLC:
 
-Credits:
+- Josh Engebretson (Technical Director)
+
+### Contributors:
+
+- marynate (https://github.com/marynate)
 
-Josh Engebretson (Technical Director, THUNDERBEAST GAMES LLC)
 
-#### Urho3D - Website & Credits
+### Contribution Copyright and Licensing
+
+Atomic Game Engine contribution copyrights are held by their authors.  Each author has a copyright to their contribution, and agrees to irrevocably license the contribution under the Atomic Game Engine Contribution License `CONTRIBUTION_LICENSE.md`.
+
 --------------------------
 
-The Atomic Game Engine started as a fork of the Urho3D project in November 2014
+##### Urho3D - Website & Credits
+
+The Atomic Game Engine began as a fork of the Urho3D project in November 2014
 
 Website:
 
@@ -123,4 +131,4 @@ Jack and mushroom models from the realXtend project. (http://www.realxtend.org)
 Ninja model and terrain, water, smoke, flare and status bar textures from OGRE.
 BlueHighway font from Larabie Fonts.
 Anonymous Pro font by Mark Simonson.
-NinjaSnowWar sounds by Veli-Pekka Tätilä.
+NinjaSnowWar sounds by Veli-Pekka Tätilä.

CONTRIBUTING.md

@@ -0,0 +1,38 @@
+Contributing to the Atomic Game Engine
+=======================
+
+Contribution Copyrights and Licensing
+------------------------
+
+Atomic Game Engine contribution copyrights are held by their authors.  Each author has a copyright to their contribution, and agrees to irrevocably license the contribution under the Atomic Game Engine Contribution License `CONTRIBUTION_LICENSE.md`
+
+To make a code contribution to the Atomic Game Engine
+--------------------------------------
+
+* Fork the Atomic Game Engine Github repository and make your changes.  Use a well named topic branch for the changes, preferably with uppercase and dashes, use your initials at the beginning of the branch name e.g. `JME-EDITOR-FIXES`.  Fork off the `master` branch.  Avoid forking from repository work branches as they may get rebased.
+
+* Test your changes as thoroughly as possible.
+
+* Ensure your code follows the general code style of the engine and scripts.  There needs to be an explicit style guide, in the meantime try to follow the general style in the code base.  Check that your diff looks as clean and minimal as possible.
+
+* Add yourself to the end of the "Contributors" list in `AUTHORS.md` if you're not already on the list.  `By doing this you confirm that`:
+
+  - **You own the rights to the contribution**, or have the legal right to
+    license the contribution under the Atomic Game Engine Contribution License `CONTRIBUTION_LICENSE.md` on behalf of the copyright owner(s).
+
+  - You, or the copyright owner(s), agree to **irrevocably license the contribution** under the Atomic Game Engine Contribution License `CONTRIBUTION_LICENSE.md`
+
+  - Please include a link to your GitHub profile to allow your contribution to be identified accurately.
+
+* Create a pull request in Github.  For now, the "base branch" should be
+  "master", i.e. the pull requests are merged directly to the master branch.
+  In the description:
+
+  - Summarize the change and the motivation for the change.
+
+To report bugs or request features
+----------------------------------
+
+Use GitHub issues to report bugs or request features:
+
+* Please include a compilation or execution log to help diagnosis.

CONTRIBUTION_LICENSE.md

@@ -0,0 +1,19 @@
+===============
+Atomic Game Engine Contribution License
+===============
+
+(http://opensource.org/licenses/MIT)
+
+Copyright (c) 2014-2015 by Atomic Game Engine Contributors (see AUTHORS.md)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+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.