Recent changes to Project Standards

WikiPage Project Standards modified by Paul Tunison

Paul Tunison — Mon, 09 Jan 2012 01:21:10 -0000

--- v6 
+++ v7 
@@ -20,7 +20,7 @@
 
 Scripting Code
 ==============
-Due to the limitations of using Unity with any kind of version control without a Pro license, only one person should be editing anything to do with scene files or *.assets at a time. If more than one person does, we may screw up the Library irreparably. Thanks Unity Pro...
+* Use Mono as Unity provides.
 
 
 Scene Editing and Committing

WikiPage Project Standards modified by Paul Tunison

Paul Tunison — Mon, 09 Jan 2012 01:20:20 -0000

--- v5 
+++ v6 
@@ -20,7 +20,7 @@
 
 Scripting Code
 ==============
-TODO
+Due to the limitations of using Unity with any kind of version control without a Pro license, only one person should be editing anything to do with scene files or *.assets at a time. If more than one person does, we may screw up the Library irreparably. Thanks Unity Pro...
 
 
 Scene Editing and Committing

WikiPage Project Standards modified by Paul Tunison

Paul Tunison — Sun, 08 Jan 2012 20:34:22 -0000

--- v4 
+++ v5 
@@ -21,3 +21,11 @@
 Scripting Code
 ==============
 TODO
+
+
+Scene Editing and Committing
+============================
+* Because of the way that Unity save's its scene files (as binary files), only one person may be working on any particular scene, in a permanent manner, at a time. Its not really possible to merge binary files...
+    * Possible alternatives:
+        * https://github.com/terravision/UnityTextScene
+        * http://zeroandone.ca/unity/

WikiPage Project Standards modified by Paul Tunison

Paul Tunison — Sun, 08 Jan 2012 19:28:39 -0000

--- v3 
+++ v4 
@@ -11,6 +11,7 @@
 * Temporary or personal branches should be prefixed with the developer's user name
     * ex.1: "`purgo/fire-particle-test`"
     * ex.2: "`lollius/im_silly`"
+* Before adding/removing files to commit dealing with anything outside of the Assets folder, close down Unity and Mono before adding anything and committing.
 
 Merging
 -------

WikiPage Project Standards modified by Paul Tunison

Paul Tunison — Sun, 08 Jan 2012 18:09:30 -0000

--- v2 
+++ v3 
@@ -15,3 +15,8 @@
 Merging
 -------
 * Topic branches are to be merged into master via: "`git merge --no-ff --log`" and should primarily be done after review process (TBD) (usually done by Paul at this point in time).
+
+
+Scripting Code
+==============
+TODO

WikiPage Project Standards modified by Paul Tunison

Paul Tunison — Sun, 08 Jan 2012 18:08:50 -0000

--- v1 
+++ v2 
@@ -14,4 +14,4 @@
 
 Merging
 -------
-* Topic branches are to be merged into master via: `git merge --no-ff --log` and should primarily be done after review process (TBD) (usually done by Paul at this point in time).
+* Topic branches are to be merged into master via: "`git merge --no-ff --log`" and should primarily be done after review process (TBD) (usually done by Paul at this point in time).

WikiPage Project Standards modified by Paul Tunison

Paul Tunison — Sun, 08 Jan 2012 18:08:37 -0000

Here we list various standards that we jointly, as the administration team (Ben, Conor, Paul), hold as vital to maintaining the quality of code generated as part of this project. GIT === Topic Branches -------------- * Branches that are flagged for merger into the master branch need to be prefixed with "`dev/`" * example: "`dev/my-fancy-feature`" * Temporary or personal branches should be prefixed with the developer's user name * ex.1: "`purgo/fire-particle-test`" * ex.2: "`lollius/im_silly`" Merging ------- * Topic branches are to be merged into master via: `git merge --no-ff --log` and should primarily be done after review process (TBD) (usually done by Paul at this point in time).