SVN - Revision history

Stgatilov: Executables update: pay attention to added/removed shaders

2021-05-16T07:55:29Z

Executables update: pay attention to added/removed shaders

← Older revision		Revision as of 07:55, 16 May 2021
Line 80:		Line 80:
	Since shaders are usually tied to C++ source code, both executables and shaders must be committed at once, otherwise they will be incompatible with each other.		Since shaders are usually tied to C++ source code, both executables and shaders must be committed at once, otherwise they will be incompatible with each other.
	So if you decide to commit executables, commit shaders too, and vice versa. Make sure both are compiled/copied over recent and clean SVN state.		So if you decide to commit executables, commit shaders too, and vice versa. Make sure both are compiled/copied over recent and clean SVN state.
			Pay attention to added and removed shader files: the easiest way to handle them is to delete <tt>glprogs</tt> from the assets repo before building, and add all unversioned files there after building.

	{{tutorial-SVN}}		{{tutorial-SVN}}

Stgatilov: Added "filename conventions", "executables update", did minor cleaning of old text for recent realities.

2021-03-07T06:55:28Z

Added "filename conventions", "executables update", did minor cleaning of old text for recent realities.

@@ Line 1: / Line 1: @@
 == So what is this SVN thingy then? ==
-SVN stands for '''S'''ub'''V'''ersio'''N'''. It's a framework originally developed for distributed coding projects, often with multiple programmers working on the code at the same time.
+SVN stands for '''S'''ub'''V'''ersio'''N'''. It's a framework originally developed for coding projects, often with multiple programmers working on the code at the same time.
 The Dark Mod is a project distributed over the whole world, that's where SVN comes in handy. It allows all Team Members to work on the Mod at the same time without coming in the way of each other.
@@ Line 9: / Line 9: @@
 [[Image:Svn layout.png|500px]]
-Basically, we have one central SVN server run by sparhawk. It is accessible for all Team Members, Contributors and Beta Mappers alike, but not everybody has write access rights.
+Basically, we have one central SVN server run by taaaki. It is accessible for all Team Members, Contributors and Beta Mappers.
-Everybody runs his or her own copy of the mod repository on his local hard drive and the SVN Client Software (recommendedly TortoiseSVN) provides some convenient functions to keep the copies in sync with each other.
+Everybody runs his or her own copy of the mod repository on his local hard drive and the SVN Client Software (recommended TortoiseSVN) provides some convenient functions to keep the copies in sync with each other.
 Looking at the graph, you'll notice several repositories, each serving a specific purpose:
-* '''darkmod''': This is the mod itself. It contains all files needed to run the Mod on a regular Doom 3 installation. This includes the compiled code, the textures, the entity and material definitions, skins, models and whatnot.
+* '''darkmod''': This is the mod itself. It contains all files needed to run the Mod. This includes the compiled code, the textures, the entity and material definitions, skins, models and whatnot.
-* '''darkmod_src''': The coder's realm. This is where our C++ sources are kept. From the files in this repository, the code (the gamex86.dll) gets compiled and wrapped up in a PK4 file and is uploaded to the '''darkmod''' repository in regular intervals.
+* '''darkmod_src''': The coder's realm. This is where our C++ sources are kept. From the files in this repository, the code gets compiled into executables, which are uploaded to the '''darkmod''' repository in regular intervals.
 * '''darkmod_hires''': This is meant to be a backup repository for losslessly compressed texture files. As the main mod diffuse textures are stored in DDS format (a lossy compression format), we want to keep a backup of these files in TGA file format (see also [[How to add Textures to The Dark Mod]]).
 * '''texture_src''': The place for texture source/working files, like Photoshop .psd files, Gimp files - everything including layers.
@@ Line 45: / Line 45: @@
 The SVN terminology can be confusing at times, this is a (probably incomplete) list of terms explained: '''[[SVN Glossary]]'''
-== SVN Troubleshooting ==
+== Filename conventions ==
 {{tutorial-SVN}}

Greebo: /* DarkMod SVN Infrastructure */

2009-05-14T10:52:15Z

DarkMod SVN Infrastructure

← Older revision		Revision as of 10:52, 14 May 2009
Line 19:		Line 19:
	* '''texture_src''': The place for texture source/working files, like Photoshop .psd files, Gimp files - everything including layers.		* '''texture_src''': The place for texture source/working files, like Photoshop .psd files, Gimp files - everything including layers.
	* '''model_src''': The repository for Blender, Lightwave, MotionBuilder, Maya, 3DSMax source files, everything needed to re-export models and animations from scratch.		* '''model_src''': The repository for Blender, Lightwave, MotionBuilder, Maya, 3DSMax source files, everything needed to re-export models and animations from scratch.
			* '''sound_src''': The location where all sound project files or WAV files can be stored.
	* '''betamapper''': This is a separate repository for our beta mappers and contributors. They are encouraged to upload their files (maps, textures, models, etc.) to this repository (each mapper can have his/her own folder). This way they can take advantage of SVN's versioning system and also have a nice backup of their work.		* '''betamapper''': This is a separate repository for our beta mappers and contributors. They are encouraged to upload their files (maps, textures, models, etc.) to this repository (each mapper can have his/her own folder). This way they can take advantage of SVN's versioning system and also have a nice backup of their work.

Greebo at 11:02, 27 November 2007

2007-11-27T11:02:58Z

← Older revision		Revision as of 11:02, 27 November 2007
Line 39:		Line 39:
	* [[How to add files to SVN]]		* [[How to add files to SVN]]
	* [[How to delete files from SVN]]		* [[How to delete files from SVN]]
			* [[How to resolve SVN conflicts]]

	== [[SVN Glossary]] ==		== [[SVN Glossary]] ==

Greebo: /* What are those red and green icons for? */

2007-11-27T10:03:19Z

What are those red and green icons for?

← Older revision		Revision as of 10:03, 27 November 2007
Line 27:		Line 27:

	The most common ones will be green, red and blue:		The most common ones will be green, red and blue:
	* <font color="#009900">green</font> stands for normal, not locally modified by you. No changes waiting for commit. The file might have been changed on the server, though.		* '''<font color="#009900">green</font>''' stands for normal, not locally modified by you. No changes waiting for commit. The file might have been changed on the server, though.
	* <font color="#990000">red</font> (exclamation mark) means that the file/folder has been modified by you. The change is waiting to be committed to the SVN server.		* '''<font color="#990000">red</font>''' (exclamation mark) means that the file/folder has been modified by you. The change is waiting to be committed to the SVN server.
	* <font color="#990000">red</font> (x symbol) means that the file is marked for deletion. It will be deleted on the SVN Server the next time you commit.		* '''<font color="#990000">red</font>''' (x symbol) means that the file is marked for deletion. It will be deleted on the SVN Server the next time you commit.
	* <font color="#000099">blue</font> means that the file has been marked for addition. It will be uploaded to SVN the next time you commit.		* '''<font color="#000099">blue</font>''' means that the file has been marked for addition. It will be uploaded to SVN the next time you commit.
	* <font color="#FF9900">yellow</font> indicates a conflict (usually after an SVN Update).		* '''<font color="#FF9900">yellow</font>''' indicates a conflict (usually after an SVN Update).

	== You lost me there, I need an example! ==		== You lost me there, I need an example! ==

Greebo: /* What are those red and green icons for? */

2007-11-27T10:03:00Z

What are those red and green icons for?

← Older revision		Revision as of 10:03, 27 November 2007
Line 31:		Line 31:
	* <font color="#990000">red</font> (x symbol) means that the file is marked for deletion. It will be deleted on the SVN Server the next time you commit.		* <font color="#990000">red</font> (x symbol) means that the file is marked for deletion. It will be deleted on the SVN Server the next time you commit.
	* <font color="#000099">blue</font> means that the file has been marked for addition. It will be uploaded to SVN the next time you commit.		* <font color="#000099">blue</font> means that the file has been marked for addition. It will be uploaded to SVN the next time you commit.
	* <font color="#~~009999~~">yellow</font> indicates a conflict (usually after an SVN Update).		* <font color="#FF9900">yellow</font> indicates a conflict (usually after an SVN Update).

	== You lost me there, I need an example! ==		== You lost me there, I need an example! ==

Greebo at 10:02, 27 November 2007

2007-11-27T10:02:30Z

@@ Line 20: / Line 20: @@
 * '''model_src''': The repository for Blender, Lightwave, MotionBuilder, Maya, 3DSMax source files, everything needed to re-export models and animations from scratch.
 * '''betamapper''': This is a separate repository for our beta mappers and contributors. They are encouraged to upload their files (maps, textures, models, etc.) to this repository (each mapper can have his/her own folder). This way they can take advantage of SVN's versioning system and also have a nice backup of their work.
 == You lost me there, I need an example! ==

Greebo: /* You lost me there, I need an example! */

2007-11-27T09:27:05Z

You lost me there, I need an example!

← Older revision		Revision as of 09:27, 27 November 2007
Line 24:		Line 24:
	All right then, here you go:		All right then, here you go:
	* [[Downloading The Dark Mod]]		* [[Downloading The Dark Mod]]
			* [[How to commit changes to SVN]]
	* [[How to add files to SVN]]		* [[How to add files to SVN]]
	* [[How to delete files from SVN]]		* [[How to delete files from SVN]]
	* [[How to commit files to SVN]]

	== [[SVN Glossary]] ==		== [[SVN Glossary]] ==

Greebo: /* You lost me there, I need an example! */

2007-11-26T21:05:55Z

You lost me there, I need an example!

← Older revision		Revision as of 21:05, 26 November 2007
Line 24:		Line 24:
	All right then, here you go:		All right then, here you go:
	* [[Downloading The Dark Mod]]		* [[Downloading The Dark Mod]]
	* [[SVN ~~Tutorial~~]]		* [[How to add files to SVN]]
			* [[How to delete files from SVN]]
			* [[How to commit files to SVN]]

	== [[SVN Glossary]] ==		== [[SVN Glossary]] ==

Greebo: /* You lost me there, I need an example! */

2007-11-26T20:47:15Z

You lost me there, I need an example!

← Older revision		Revision as of 20:47, 26 November 2007
Line 22:		Line 22:

	== You lost me there, I need an example! ==		== You lost me there, I need an example! ==
	All right then, here you go: [[SVN Tutorial]]		All right then, here you go:
			* [[Downloading The Dark Mod]]
			* [[SVN Tutorial]]

	== [[SVN Glossary]] ==		== [[SVN Glossary]] ==