Workflow - Revision history

Thexa4: /* Merging Requests Into Alpha */

2019-05-30T22:31:48Z

Merging Requests Into Alpha

← Older revision		Revision as of 22:31, 30 May 2019
Line 63:		Line 63:
	You generally want to merge bugfixes as fast as possible. If you plan on releasing another point release (2.14.3 -> 2.14.4) you should probably wait with merging new features. Merging new features usually results in more bugs so queuing them for the next minor release (2.14.3 -> 2.15.1) is advised.		You generally want to merge bugfixes as fast as possible. If you plan on releasing another point release (2.14.3 -> 2.14.4) you should probably wait with merging new features. Merging new features usually results in more bugs so queuing them for the next minor release (2.14.3 -> 2.15.1) is advised.

	Once the Continuous Integration has been run after the merge you can press the play button on the empires_build [https://git.empiresmod.com/empires_assets/empires_build/pipelines Pipelines] tab for the newly created version. After that has finished the alpha branch on Steam should have the latest development build. If you don't have the alpha branch on steam, please ask for the password on ~~Hipchat~~.		Once the Continuous Integration has been run after the merge you can press the play button on the empires_build [https://git.empiresmod.com/empires_assets/empires_build/pipelines Pipelines] tab for the newly created version. After that has finished the alpha branch on Steam should have the latest development build. If you don't have the alpha branch on steam, please ask for the password on the dev chat.

	== Preparing a Beta Release ==		== Preparing a Beta Release ==

Thexa4: /* Releasing a New Version */

2019-05-30T22:16:15Z

Releasing a New Version

← Older revision		Revision as of 22:16, 30 May 2019
Line 86:		Line 86:
	## Publish the store changes for the server		## Publish the store changes for the server
	## Publish the store changes for the client		## Publish the store changes for the client
			# Restart the Lobby.
	# Publish the changelog as a [http://steamcommunity.com/games/empires/announcements/create steam announcement]		# Publish the changelog as a [http://steamcommunity.com/games/empires/announcements/create steam announcement]
	# Publish the changelog to [https://reddit.com/r/Empires Reddit]		# Publish the changelog to [https://reddit.com/r/Empires Reddit]

Thexa4: /* Releasing a New Version */

2019-05-30T21:47:57Z

Releasing a New Version

← Older revision		Revision as of 21:47, 30 May 2019
Line 90:		Line 90:
	# Publish the changelog to [https://forums.empiresmod.com the forum]		# Publish the changelog to [https://forums.empiresmod.com the forum]
	# Publish the changelog to [http://www.moddb.com/mods/empires Moddb]		# Publish the changelog to [http://www.moddb.com/mods/empires Moddb]
			# Publish the changelog to [https://discord.gg/UH6Sc6B Discord]

Thexa4: /* Releasing a New Version */

2019-05-30T21:47:34Z

Releasing a New Version

← Older revision		Revision as of 21:47, 30 May 2019
Line 83:		Line 83:
	## Publish the latest beta to the default channel for the server		## Publish the latest beta to the default channel for the server
	## Publish the latest beta to the default channel for the client		## Publish the latest beta to the default channel for the client
	~~## Update the dedicated server version for the server~~
	## Update the dedicated server version for the client		## Update the dedicated server version for the client
	## Publish the store changes for the server		## Publish the store changes for the server

Johnny: /* C++ development setup */

2017-12-10T21:04:00Z

C++ development setup

← Older revision		Revision as of 21:04, 10 December 2017
Line 25:		Line 25:
	== C++ development setup ==		== C++ development setup ==

	To get started with C++ development just need to checkout [https://git.empiresmod.com/empires_code/empires_main empires_main]. ~~Read~~ README ~~for setup details~~.		To get started with C++ development you just need to checkout [https://git.empiresmod.com/empires_code/empires_main empires_main] and copy the file from steam (Steam\steamapps\common\Empires\empires) to empires_main/mp/game/empires. For more details on Visual Studio setup check the README in the repo.

	If you also want to ~~test with~~ changes in [https://git.empiresmod.com/empires_assets/assets_base assets_base] and [https://git.empiresmod.com/empires_public/empires_scripts empires_scripts] you can best checkout those repos next to the empires_main repo and then edit empires_main/mp/game/empires/gameinfo.txt		If you also want to make changes to [https://git.empiresmod.com/empires_assets/assets_base assets_base] and [https://git.empiresmod.com/empires_public/empires_scripts empires_scripts] and test them with your C++ changes, you can best checkout those repos next to the empires_main repo and then edit empires_main/mp/game/empires/gameinfo.txt

	SearchPaths {		SearchPaths {

Johnny: /* C++ development setup */

2017-12-10T21:00:03Z

C++ development setup

← Older revision		Revision as of 21:00, 10 December 2017
Line 25:		Line 25:
	== C++ development setup ==		== C++ development setup ==

	To get started with C++ development just need to checkout [https://git.empiresmod.com/empires_code/empires_main]. Read README for setup details.		To get started with C++ development just need to checkout [https://git.empiresmod.com/empires_code/empires_main empires_main]. Read README for setup details.

	If you also want to test with changes in [https://git.empiresmod.com/empires_assets/assets_base] and [https://git.empiresmod.com/empires_public/empires_scripts] you can best checkout those repos next to the empires_main repo and then edit empires_main/mp/game/empires/gameinfo.txt		If you also want to test with changes in [https://git.empiresmod.com/empires_assets/assets_base assets_base] and [https://git.empiresmod.com/empires_public/empires_scripts empires_scripts] you can best checkout those repos next to the empires_main repo and then edit empires_main/mp/game/empires/gameinfo.txt

	SearchPaths {		SearchPaths {

Johnny: /* Cloning the Relevant Repository */

2017-12-10T20:59:07Z

Cloning the Relevant Repository

@@ Line 22: / Line 22: @@
 # Double click the <code>preview.bat</code> file on Windows or the <code>preview</code> file on Linux and wait for the process to finish.
 # You should now have a development version of Empires you can run in your preview folder.
 == Creating a New Branch ==

Thexa4 at 19:41, 30 August 2017

2017-08-30T19:41:42Z

← Older revision		Revision as of 19:41, 30 August 2017
Line 1:		Line 1:
	This page describes the workflow from a concept until release. Try to follow this when developing a new feature or releasing a new Empires version.		This page describes the workflow from a concept until release. Try to follow this when developing a new feature or releasing a new Empires version.

			If you're working on something that impacts user experience or gamedesign, please look at the [[Guiding Principles]]

	== Creating an Issue ==		== Creating an Issue ==

Thexa4: /* Creating an Issue */

2017-08-27T00:10:05Z

Creating an Issue

← Older revision		Revision as of 00:10, 27 August 2017
Line 2:		Line 2:

	== Creating an Issue ==		== Creating an Issue ==
	~~Issue : New feature, known bug, known exploit or anything that requires developer work/discussion.~~

	To ensure we don't duplicate effort and to allow team members to see what we're working on we add a short description of the thing we're trying to fix / achieve to an issue on the internal [https://git.empiresmod.com/empires_assets/empires_build/issues issue tracker].		To ensure we don't duplicate effort and to allow team members to see what we're working on we add a short description of the thing we're trying to fix / achieve to an issue on the internal [https://git.empiresmod.com/empires_assets/empires_build/issues issue tracker].

			An issue is a new feature, known bug, known exploit or anything that requires developer work/discussion.

	When adding an issue, try to stick to formulating it as a [https://www.mountaingoatsoftware.com/agile/user-stories user story]. This makes it easier to evaluate whether a proposed change actually fixes the issue. To help discoverability you can add relevant tags.		When adding an issue, try to stick to formulating it as a [https://www.mountaingoatsoftware.com/agile/user-stories user story]. This makes it easier to evaluate whether a proposed change actually fixes the issue. To help discoverability you can add relevant tags.

Sgt.Security: /* Creating an Issue */

2017-08-26T23:45:11Z

Creating an Issue

← Older revision		Revision as of 23:45, 26 August 2017
Line 2:		Line 2:

	== Creating an Issue ==		== Creating an Issue ==
			Issue : New feature, known bug, known exploit or anything that requires developer work/discussion.

	To ensure we don't duplicate effort and to allow team members to see what we're working on we add a short description of the thing we're trying to fix / achieve to an issue on the internal [https://git.empiresmod.com/empires_assets/empires_build/issues issue tracker].		To ensure we don't duplicate effort and to allow team members to see what we're working on we add a short description of the thing we're trying to fix / achieve to an issue on the internal [https://git.empiresmod.com/empires_assets/empires_build/issues issue tracker].

Line 7:		Line 9:

	If you plan on working on the issue yourself, be sure to assign yourself to it. For more information on how you can effectively use issues you can refer to the [https://docs.gitlab.com/ce/user/project/issues/index.html official issue documentation].		If you plan on working on the issue yourself, be sure to assign yourself to it. For more information on how you can effectively use issues you can refer to the [https://docs.gitlab.com/ce/user/project/issues/index.html official issue documentation].

	~~Issue : New feature, known bug, known exploit or anything that requires developer work/discussion.~~

	== Cloning the Relevant Repository ==		== Cloning the Relevant Repository ==