Initial commit
Initial commit
Initial commit
Merge branch 'Stations' of github.com:gametechnology/psi-2013 into Stations
Initial commit
Merge branch 'Stations' of github.com:gametechnology/psi-2013 into Stations
Added the basic implementation of the Stations UML Diagram

(also non-working Station Templates included)
Merge remote-tracking branch 'origin/Stations' into Stations
Fixed a bug where stations could not be added and added all the stations to the ship. Run in release mode for now, as I get a strange violation error when running in debug mode.
added some functions to the powerstation and the defence station
Added destructor, now the game can be builded
Fixed the GetStation function on the ship. It now uses the correct value in the switch statement
Initial commit
Added the basic implementation of the Stations UML Diagram

(also non-working Station Templates included)
Fixed a bug where stations could not be added and added all the stations to the ship. Run in release mode for now, as I get a strange violation error when running in debug mode.
added some functions to the powerstation and the defence station
Added destructor, now the game can be builded
Fixed the GetStation function on the ship. It now uses the correct value in the switch statement
Rebase Merge Conflicts
Merge branch 'Stations' of github.com:gametechnology/psi-2013 into Stations

Conflicts:
	build/Stella Incognita.vcxproj
	build/Stella Incognita.vcxproj.filters