Merge branch 'master' of git://github.com/scalatron/scalatron

Conflicts:
	Scalatron/webui/client/Tutorial.js

Author: dkuffner

.gitignore

@@ -9,12 +9,17 @@ dist/
 users/
 doc/html/
 devdoc/html/
+Scalatron/bin/
 Scalatron/lib/
 Scalatron/out/
+Scalatron/users/
 Scalatron/src/META-INF/
+ScalatronCLI/bin/
 ScalatronCLI/out/
 ScalatronCLI/lib/
 ScalatronCLI/src/META-INF/
+ScalaMarkdown/bin/
+ScalaMarkdown/lib/
 ScalaMarkdown/out/
 ScalaMarkdown/src/META-INF/
 __MACOSX

README.md

@@ -1,32 +1,13 @@
 Scalatron - Learn Scala With Friends
 =========
 
-This is the source code for Scalatron, a competitive multi-player programming game in which coders pit bot programs
+This is the source code for Scalatron, a multi-player programming game in which coders pit bot programs
 (written in Scala) against each other. It is an educational resource for groups of programmers or individuals that
 want to learn more about the Scala programming language or want to hone their Scala programming skills. 
 
-Follow Scalatron on Twitter at [@scalatron](http://twitter.com/scalatron).
+For more information, [visit the Scalatron web site here on Github](http://scalatron.github.com).
 
-
-## How to Run
-
-If you want to run Scalatron to play the game or to run a workshop with friends, simply [download the latest version](http://github.com/scalatron/scalatron/downloads) - you do not need the source code. Unzip the downloaded file into a local directory, then look for the Readme.txt file to get started. Have fun!
-
-
-## How to Build
-
-If you want to get the source code and build Scalatron yourself, [download the sources of the 'master' branch](http://github.com/scalatron/scalatron/zipball/master) and build them with [SBT](http://github.com/harrah/xsbt). Once you have SBT installed, switch to the directory where you downloaded the Scalatron sources (the directory that contains this the `build.sbt` file) and run
-
-    sbt dist
-
-This will generate a new directory called `dist` which contains the same content as the regular distribution. Now `cd` into /dist/bin and run `java -jar Scalatron.jar`. 
-
-
-## Contributing
-
-[Fork Scalatron here on github](https://github.com/scalatron/scalatron/fork) and send pull requests. 
-Bring your own ideas or check out the [list of open issues](https://github.com/scalatron/scalatron/issues?state=open). 
-Before embarking on something major, you can [contact the maintainer](mailto:[email protected]) and ask for feedback or tips on where to get started.  
+To stay current, follow Scalatron on Twitter at [@scalatron](http://twitter.com/scalatron).
 
 
 ## License

Scalatron/License.txt

@@ -1,5 +1,5 @@
 SCALATRON - Learn Scala With Friends
-http://scalatron.wordpress.com - Twitter: @scalatron / #scalatron
+http://scalatron.github.com - Twitter: @scalatron - scalatron@hotmail.com
 
 
 # The incorporated parts of this work...
@@ -36,7 +36,7 @@ letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View, Califor
 * Attribution - You must attribute the work in the manner specified by the author or
   licensor (but not in any way that suggests that they endorse you or your use of the work).
   You can do this by referencing Scalatron as the origin of your materials and by linking to
-  the Scalatron web page at http://scalatron.wordpress.com.
+  the Scalatron web page at http://scalatron.github.com.
 
 
 

Scalatron/Readme.txt

@@ -1,5 +1,5 @@
 SCALATRON - Learn Scala With Friends
-http://scalatron.wordpress.com - Twitter: @scalatron / #scalatron
+http://scalatron.github.com - Twitter: @scalatron - scalatron@hotmail.com
 This work is licensed under the Creative Commons Attribution 3.0 Unported License.
 
 
@@ -18,7 +18,7 @@ in the public domain. Feel free to use, copy, and improve them!
 
 ## Quick Start
 
-* download the Scalatron distribution, e.g. from http://scalatron.wordpress.com
+* download the Scalatron distribution, e.g. from http://scalatron.github.com
 * unzip the compressed file to a local directory, e.g. `/Scalatron`
 * launch the game server by double-clicking the application, e.g. at `Scalatron/bin/Scalatron.jar`
 * this should automatically open a browser and point it to e.g. `http://localhost:8080`
@@ -54,7 +54,13 @@ in the public domain. Feel free to use, copy, and improve them!
 
 ## Version History
 
-### Version 0.9.9 -- 2012-04-26
+### Version 0.9.9.3 -- 2012-05-02
+
+* new opcodes: "MarkCell()", "DrawLine()"; see Scalatron Protocol docs for details. Thanks Joachim Hofer, @johofer!
+* name duplication bug fixed; docs for "React()" opcode fixed. Also thanks to @johofer!
+
+
+### Version 0.9.9.0 - 0.9.9.2 -- 2012-04-26
 
 * restructured for move to github
 * bot processing ported from parallel collections to Akka

Scalatron/bots/Reference/ScalatronBot.jar

@@ -1,9 +1,9 @@
 SCALATRON - Learn Scala With Friends
-http://scalatron.wordpress.com - Twitter: @scalatron / #scalatron
+http://scalatron.github.com - Twitter: @scalatron - scalatron@hotmail.com
 This work is licensed under the Creative Commons Attribution 3.0 Unported License.
 
 Developer Documentation - Scalatron APIs
-Version 0.9.9 -- updated 2012-04-26
+Version 0.9.9 -- updated 2012-05-01
 
 
 
@@ -449,6 +449,8 @@ Response JSON example:
 ### Update Source Files
 
 Updates the source code files in the user's workspace on the server.
+Optionally creates a backup version of the source files currently in the workspace before overwriting them
+with the uploaded source files.
 
 * URL:              /api/users/{user}/sources
 * Method:           PUT
@@ -467,7 +469,9 @@ Request JSON example:
         [
             { "filename" : "Bot.scala", "code" : "class ControlFunctionFactory { ... }" },
             { "filename" : "Util.scala", "code" : "class View { ... }" }
-        ]
+        ],
+        "versionPolicy" : "ifDifferent",      // or: "always", "never"
+        "versionLabel" : "before Build and Publish into Tournament"
     }
 
 Comments:

Scalatron/devdoc/markdown/Scalatron APIs.md

@@ -1,9 +1,9 @@
 SCALATRON - Learn Scala With Friends
-http://scalatron.wordpress.com - Twitter: @scalatron / #scalatron
+http://scalatron.github.com - Twitter: @scalatron - scalatron@hotmail.com
 This work is licensed under the Creative Commons Attribution 3.0 Unported License.
 
 Contributor Documentation
-Version 0.9.9 -- updated 2012-04-26
+Version 0.9.9 -- updated 2012-05-01
 
 
 

Scalatron/devdoc/markdown/Scalatron Contributor Guide.md

@@ -1,9 +1,9 @@
 SCALATRON - Learn Scala With Friends
-http://scalatron.wordpress.com - Twitter: @scalatron / #scalatron
+http://scalatron.github.com - Twitter: @scalatron - scalatron@hotmail.com
 This work is licensed under the Creative Commons Attribution 3.0 Unported License.
 
 Organizer Documentation - Scalatron CLI (Command Line Interface)
-Version 0.9.9 -- updated 2012-04-26
+Version 0.9.9 -- updated 2012-05-01
 
 
 

Scalatron/doc/markdown/Scalatron CLI.md

@@ -1,9 +1,9 @@
 SCALATRON - Learn Scala With Friends
-http://scalatron.wordpress.com - Twitter: @scalatron / #scalatron
+http://scalatron.github.com - Twitter: @scalatron - scalatron@hotmail.com
 This work is licensed under the Creative Commons Attribution 3.0 Unported License.
 
 Participant Documentation - Scalatron Game Rules
-Version 0.9.9 -- updated 2012-04-26
+Version 0.9.9 -- updated 2012-05-01