Update wiki to match gradle conversion authored by Derek Williams's avatar Derek Williams
...@@ -9,9 +9,9 @@ Since we are keeping this in a Git repository, you need to have EGit installed i ...@@ -9,9 +9,9 @@ Since we are keeping this in a Git repository, you need to have EGit installed i
2.2. Choose "master" for the branch 2.2. Choose "master" for the branch
2.3. For the directory, pick your Eclipse workspace 2.3. For the directory, pick your Eclipse workspace
2.4. Let it add projects to your workspace. It should create five projects for the five parts of the system. 2.4. Let it add projects to your workspace. It should create five projects for the five parts of the system.
# Making a branch # Making a branch
No one should make changes directly to the Master branch of the repository. That is kept pristine except for new releases (think of it as a release stream). When we start new development on something, we will agree on a branching structure. No one should make changes directly to the Master branch of the repository. That is kept pristine except for new releases (think of it as a release stream). When we start new development on something, we will agree on a branching structure.
...@@ -44,8 +44,8 @@ GameClient ...@@ -44,8 +44,8 @@ GameClient
GameManager GameManager
--localhost - will use the test RDS database --localhost - will use the test RDS database
--db= - will specify which RDS database will be used --db= - will specify which RDS database will be used
## Running locally ## Running locally
To run the game on your machine, use these run configurations for the Login Server and Game Servers with the following arguments: To run the game on your machine, use these run configurations for the Login Server and Game Servers with the following arguments:
Name: LoginServer Name: LoginServer
...@@ -76,12 +76,12 @@ Arguments: --port=1875 --map=sortingRoom.tmx --localhost ...@@ -76,12 +76,12 @@ Arguments: --port=1875 --map=sortingRoom.tmx --localhost
Name: WellingtonRoom Name: WellingtonRoom
Project: GameServer Project: GameServer
Main Class: edu.ship.shipsim.areaserver.Server Main Class: edu.ship.shipsim.areaserver.Server
Arguments: --port=1876 --map=wellingtonRoom.tmx --localhost Arguments: --port=1876 --map=wellingtonRoom.tmx --localhost
Name: ServerMCTRoom Name: ServerMCTRoom
Project: GameServer Project: GameServer
Main Class: edu.ship.shipsim.areaserver.Server Main Class: edu.ship.shipsim.areaserver.Server
Arguments: --port=1877 --map=mct1.tmx --localhost Arguments: --port=1877 --map=mct1.tmx --localhost
Name: ServerTheGreen Name: ServerTheGreen
Project: GameServer Project: GameServer
...@@ -104,4 +104,4 @@ To test using the production database, change the --localhost arguments for all ...@@ -104,4 +104,4 @@ To test using the production database, change the --localhost arguments for all
If JavaFX isn't already configured on your machine, follow this guide to adding it to Eclipse. If JavaFX isn't already configured on your machine, follow this guide to adding it to Eclipse.
[[Javafx environment setup]] [[Javafx environment setup]]
\ No newline at end of file