Permalink
Browse files

Merge pull request #43 from Laumania/master

ASP.NET MVC 4 Beta + deleted MvcApiActionFilter.dll
  • Loading branch information...
shiftkey-tester committed Apr 15, 2012
2 parents ec84216 + ef67ca4 commit bab53beb09e1377b61426a69b7033707948a3c31
View
@@ -1,10 +1,14 @@
-## Samurai - A cross-platform game
+## Samurai - A cross-platform strategy game
-Some ideas are up on the [wiki](https://github.com/Code52/Samurai/wiki) but the best place to find out what is going on is in our jabbr!
+**Samurai** is a turn-based strategy game, like [Battle Isle](http://tinyurl.com/d5kz5ys), [Advanced Wars](http://en.wikipedia.org/wiki/Advance_Wars) or [WeeWar](http://weewar.com/).
+
+This game is developed by [Code52](http://code52.org/), which means the community - AKA **you**.
+
+[For more information, API documentation etc. visit the wiki](https://github.com/Code52/Samurai/wiki).
### Getting started
-**Getting started with Git and GitHub**
+Getting started with Git and GitHub
* [Setting up Git for Windows and connecting to GitHub](http://help.github.com/win-set-up-git/)
* [Forking a GitHub repository](http://help.github.com/fork-a-repo/)
@@ -15,21 +19,4 @@ Once you're familiar with Git and GitHub, clone the repository and run the ```.\
### Discussing ideas
* [Trello Board](https://trello.com/board/samurai/4f1d3d847a38f6221f1d9354) - add ideas, or claim an idea and start working on it!
-* [JabbR Chatroom](http://jabbr.net/#/rooms/code52) - discuss things in real-time with people all over the world!
-
-### Other bits and pieces
-
-For the server you'll need:
-
-* [MVC4](http://www.asp.net/mvc/mvc4) - we're using the latest and greatest!
-
-* [Mongo](http://www.mongodb.org/) - for the persisting of current game objects [install notes](http://www.mongodb.org/display/DOCS/Quickstart+Windows)
-
-* And SQL Express for the User and Stats
-
-
-For the current clients you'll need:
-
-* [Windows Phone 7 SDK](http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=27570)
-
-* The WP7 SDK will also install the XNA bits compatible for Windows as well.
+* [JabbR Chatroom](http://jabbr.net/#/rooms/code52) - discuss things in real-time with people all over the world!
Binary file not shown.
@@ -69,9 +69,6 @@
<Reference Include="MongoDB.Driver">
<HintPath>..\packages\mongocsharpdriver.1.3.1\lib\net35\MongoDB.Driver.dll</HintPath>
</Reference>
- <Reference Include="MvcApiActionFilter">
- <HintPath>..\..\Libraries\MvcApiActionFilter.dll</HintPath>
- </Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.4.0.7\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
@@ -93,30 +90,33 @@
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
- <HintPath>..\packages\AspNetWebPagesCore.2.0.10906.0\lib\net40\System.Web.Helpers.dll</HintPath>
+ <HintPath>..\packages\AspNetWebPages.Core.2.0.20126.16343\lib\net40\System.Web.Helpers.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Web.Http.Common">
+ <HintPath>..\packages\System.Web.Http.Common.4.0.20126.16343\lib\net40\System.Web.Http.Common.dll</HintPath>
</Reference>
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
- <HintPath>..\packages\AspNetMvc.4.0.10906.0\lib\net40\System.Web.Mvc.dll</HintPath>
+ <HintPath>..\packages\AspNetMvc.4.0.20126.16343\lib\net40\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Web.Providers">
<HintPath>..\packages\System.Web.Providers.1.0.1\lib\Net40\System.Web.Providers.dll</HintPath>
</Reference>
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
- <HintPath>..\packages\AspNetWebPagesCore.2.0.10906.0\lib\net40\System.Web.Razor.dll</HintPath>
+ <HintPath>..\packages\AspNetRazor.Core.2.0.20126.16343\lib\net40\System.Web.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
- <HintPath>..\packages\AspNetWebPagesCore.2.0.10906.0\lib\net40\System.Web.WebPages.dll</HintPath>
+ <HintPath>..\packages\AspNetWebPages.Core.2.0.20126.16343\lib\net40\System.Web.WebPages.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
- <HintPath>..\packages\AspNetWebPagesCore.2.0.10906.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
+ <HintPath>..\packages\AspNetWebPages.Core.2.0.20126.16343\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
- <HintPath>..\packages\AspNetWebPagesCore.2.0.10906.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
+ <HintPath>..\packages\AspNetWebPages.Core.2.0.20126.16343\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Web" />
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="AspNetMvc" version="4.0.10906.0" />
- <package id="AspNetWebPagesCore" version="2.0.10906.0" />
+ <package id="AspNetMvc" version="4.0.20126.16343" />
+ <package id="AspNetRazor.Core" version="2.0.20126.16343" />
+ <package id="AspNetWebPages.Core" version="2.0.20126.16343" />
<package id="Autofac" version="2.5.2.830" />
<package id="Autofac.Mvc3" version="2.5.2.830" />
<package id="EntityFramework" version="4.3.0-beta1" />
@@ -17,6 +18,7 @@
<package id="Newtonsoft.Json" version="4.0.7" />
<package id="Nustache" version="1.0.0.20110812" />
<package id="Nustache-Mvc" version="1.0.0.20110812" />
+ <package id="System.Web.Http.Common" version="4.0.20126.16343" />
<package id="System.Web.Providers" version="1.0.1" />
<package id="Twitter.Bootstrap" version="1.4.0" />
<package id="WebActivator" version="1.4.4" />

0 comments on commit bab53be

Please sign in to comment.