New Git repository for DarkRadiant

OrbWeaver · April 15, 2012

This only affects people who compile DarkRadiant from source. It does not affect mappers.

I have migrated the current DarkRadiant source tree into a Git repository on GitHub. I have successfully checked out the source and committed changes from both Linux and Windows without problems, so unless there are any major showstoppers with using Git I expect to be using this repository for future development.

To access the repository from Windows

Download and install the latest version of Git for Windows (msysgit). It comes with a step-by-step installer and all default options are OK.
Locate and open the "Git GUI" item in the Start Menu.
Choose "Clone Existing Repository".
In the Source Location entry box, enter the URL for the DarkRadiant git repository which is:
```
		git://github.com/orbweaver/DarkRadiant.git
```
In the Target Directory entry box, enter the location where the source should be checked out.
Choose the Clone button.

Subsequent operations on the repository can be performed using the Git GUI, or from the command-line tools which are available using the "Git Bash" item that is also installed in the Start Menu.

There is also a TortoiseGIT available for people who like the Explorer integration, although it still requires msysgit under the hood and in my opinion does not seem to be as usable as either TortoiseSVN or the standard Git GUI.

To access the repository from Linux

Simply use the git command-line tool that is available in your package manager. To clone the repository, issue the following command

$ git clone git://github.com/orbweaver/DarkRadiant.git

STiFU · April 16, 2012

Ok, I will test it. However, there does seem to be a git integration on sourceforge. Shouldn't we stick to that place? After all, we've got our homepage there and people might get confused...

OrbWeaver · April 16, 2012

Ok, I will test it. However, there does seem to be a git integration on sourceforge. Shouldn't we stick to that place? After all, we've got our homepage there and people might get confused...

You're right, that did occur to me too, but I thought I would try Github first because it seems to be becoming popular with open-source developers and it has a nice interactive interface and "social" features.

The only thing that concerns me slightly is that the space allocation for free users seems quite small, at only 0.3 GB, and the usage bar is already showing about 60% for my account just with the single DarkRadiant branch and a couple of dependency archives. If it becomes a problem then I will simply move it back to SourceForge (which is fortunately very easy with git).

STiFU · April 16, 2012

Yeah, that sounds awfully limiting. I am not too familiar with all that GIT stuff, so I trust you'll do the right decision in the end. Either way, just for trying git, github is definitely the better solution. Why mess with the running SVN, right?

AluminumHaste · May 8, 2012

Why has nobody developing GIT ever heard of a progress bar? Or something? Anything? Time left, bytes left, bits left, files left, Git Gui shows Working...please wait..., and my internet usage is pegged at 100%. /facepalm. Yeah so much better then SVN.

Also trying to clone git://github.com/orbweaver/DarkRadiant.git fails, invalid argument. However https://github.com/orbweaver/DarkRadiant.git is working. Does this mean I have write access to the repository? I'm not up on the whole Git scene at all.

AluminumHaste · May 8, 2012

Also I'm running 64 bit windows 7, I know I need the dependencies but do I need to extract the 7z archives like with SVN? If I leave them as 7z do I have to download the whole package again if there's an update to the dependencies? Are they versioned?

It's great that the sourceforge page was updated, but it says:

Users who build DarkRadiant from source should be aware that the source code is now being hosted on Github rather than SourceForge SVN. See the Source code page for information about setting up Git and accessing the repository.

But the link there takes you to a How-To on using SVN to check out the source code. Just FYI I have no idea who would be the one to edit that wiki page, just thought I'd bring it up.

I can't wait to get this going so I can compile DR again, it's been quite a while since it's worked for me.

OrbWeaver · May 8, 2012

Why has nobody developing GIT ever heard of a progress bar? Or something? Anything? Time left, bytes left, bits left, files left, Git Gui shows Working...please wait..., and my internet usage is pegged at 100%. /facepalm. Yeah so much better then SVN.

I think that's a deficiency in the GUI, when I use the command-line tools it does give progress indicators. I think the GUI must be running the command line tool but not monitoring its output.

Also trying to clone git://github.com/orbweaver/DarkRadiant.git fails, invalid argument. However https://github.com/o...DarkRadiant.git is working. Does this mean I have write access to the repository? I'm not up on the whole Git scene at all.

No, all public access is read-only, the git and https links are interchangeable. I'm not sure why the git one wouldn't work for you, but there's no harm in using the https .

Also I'm running 64 bit windows 7, I know I need the dependencies but do I need to extract the 7z archives like with SVN? If I leave them as 7z do I have to download the whole package again if there's an update to the dependencies? Are they versioned?

The 7z archives are just snapshots of the current trees in SVN, which makes downloading quicker. If the dependencies change I will make new 7z archives, but you can always get the latest version from SVN if you want. And yes, you need to extract them in the top-level radiant directory in the same place they would go with SVN.

But the link there takes you to a How-To on using SVN to check out the source code. Just FYI I have no idea who would be the one to edit that wiki page, just thought I'd bring it up.

Yes you're right, I haven't updated the Wiki page. Thanks for reminding me.

AluminumHaste · May 14, 2012

Subsequent operations on the repository can be performed using the Git GUI, or from the command-line tools which are available using the "Git Bash" item that is also installed in the Start Menu.

Can you please elaborate on this? I see no options in the GIT gui that allows me to pull the latest updates. It's a quite useless mess of an interface, programmers make terrible UI designers.

Why do these programs need to be so complicated? I know Linux users are used to never using a GUI and just typing everything in terminal, but whatever 1990 called, they want their console back.

Man SVN was so much easier, right click->SVN Update.....done.

Sorry for the bitch fest but I'd love to try out the changes you've made to DR, but I can't because I'm stuck trying to figure out this horrible software. The wiki is beyond useless, it's only instruction:

git clone url: svn checkout url

git pull: svn update

Well that's great git pull, okay where do I type that? I tried Git Bash, I changed directories to c:\DarkRadiantSVN where I cloned the repository earlier then typed in git pull. It prints: There is no tracking information for the current branch.

Please specify which branch you want to merge with.

That's great no mention about that on the wiki. I'm just too fucking stupid I guess, you need a phD in Geekyness and I only graduated with 4 years Computer systems Analyst so I guess I don't qualify grumble grumble grumble.

OrbWeaver · May 14, 2012

Well that's great git pull, okay where do I type that? I tried Git Bash, I changed directories to c:\DarkRadiantSVN where I cloned the repository earlier then typed in git pull. It prints: There is no tracking information for the current branch.
Please specify which branch you want to merge with.

That's odd, because if that was indeed the directory you cloned into it should have set up the origin branch automatically. Can you go into that directory and post the output of:

git branch -av

Which should give some output like:


* master				714683a [ahead 25] Updated changelog
 remotes/origin/HEAD   -> origin/master
 remotes/origin/master 62d16b4 Added HAVE_GTKSOURCEVIEW to config.h

If remotes/origin/master is there you should be able to pull the latest changes with git pull --ff-only origin master.

I believe greebo is using the TortoiseGit interface; personally I found that a bit clunky but perhaps you might find it more to your liking.

AluminumHaste · May 14, 2012

Alright I tried git branch -av and got:

* master fd47d74 Updated Innosteup scripts

remotes/origin/master 714683a Updated changelog

Typing in git pull --ff-only origin master results in an error.

error: unknown option 'only'

Why can't I select text in Git Bash? I can't copy and paste anything or scroll with the mouse scroll wheel?

EDIT:

If I type in

git pull 'c:/DarkRadiantSVN' I get

* branch Head -> FETCH_HEAD

Already up-to-date.

OrbWeaver · May 15, 2012

Typing in git pull --ff-only origin master results in an error.

error: unknown option 'only'

Well that doesn't make any sense at all, because it's the exact same command I use on both Windows and Linux (except you shouldn't need the origin master bit, because the branches to pull should have been set up during the clone). Technically you don't need the --ff-only switch either, this just stops git from adding a merge commit if you have made any commits locally, which you probably haven't.

Another thing you could try is using the Git GUI to do the pull, for some reason the author didn't put an actual Pull command in the menu though so it's a two stage process: Remote -> Fetch from -> Origin to download the new commits, and Merge -> Local Merge to merge the remote origin/master branch into the current branch (this is actually what git pull does: a fetch followed by a merge).

EDIT: Actually, I just tried TortoiseGit again and it looks like it works fine for pulling, you just right-click on the directory and do TortoiseGit ->Pull and it shows a nice dialog with the relevant pull options. So I suggest you just use this if you are having problems with the regular Git Bash/Git GUI.

Why can't I select text in Git Bash? I can't copy and paste anything or scroll with the mouse scroll wheel?

It's a limitation of the Windows console that Git Bash is running in, not something specific to Git Bash itself. Copying and pasting has always been a PITA in Windows consoles, you need to use Edit -> Mark, Edit -> Copy and Edit -> Paste from the system menu in the top left-hand corner.

AluminumHaste · May 15, 2012

Thanks but I already know how to copy and paste in windows console. Right clicking on git bash console does nothing. Can't scroll with the mousewheel either.

Which version of fgit are you using? I'm using the latest version of the one you suggested in your first post which is a pre release version I think.

AluminumHaste · May 21, 2012

LOL sorry to be such a pest but this just keeps getting better and better :wacko:

Okay so I deleted the cloned repository on my computer then re-cloned it. I then opened Git GUI and opened my current repository. So far so good, so I go to Remote>Fetch from>origin and it downloads some updates. So far so good

Next I go to Merge>Local Merge... and get this in the Merge Commit Message:

Merge branch 'v1.7.0'

Conflicts:
   Makefile.am
   Makefile.in
   aclocal.m4
   autogen.sh
   config.h.in
   configure
   configure.ac
   debian/changelog
   debian/control
   include/ShaderLayer.h
   include/icommandsystem.h
   include/ieclass.h
   include/ientity.h
   include/ifilter.h
   include/igl.h
   include/iglprogram.h
   include/iglrender.h
   include/igrid.h
   include/imainframe.h
   include/imodel.h
   include/imodule.h
   include/inode.h
   include/iparticlenode.h
   include/iparticles.h
   include/iparticlestage.h
   include/ipatch.h
   include/iradiant.h
   include/iregistry.h
   include/irender.h
   include/irenderable.h
   include/iscenegraph.h
   include/iselection.h
   include/ishaders.h
   include/isound.h
   include/itextstream.h
   include/iuimanager.h
   include/version.h
   install/gl/interaction_fp.glsl
   install/i18n/de/LC_MESSAGES/darkradiant.mo
   install/i18n/de/LC_MESSAGES/darkradiant.po
   install/scripts/test.py
   install/ui/CamWnd.glade
   install/ui/EntityClassChooser.glade
   install/ui/ParticleEditor.glade
   libs/Makefile.in
   libs/ddslib/Makefile.in
   libs/debugging/ScenegraphUtils.h
   libs/debugging/ScopedDebugTimer.h
   libs/entitylib.h
   libs/gtkutil/Cursor.cpp
   libs/gtkutil/Cursor.h
   libs/gtkutil/DeferredAdjustment.h
   libs/gtkutil/DeferredMotion.h
   libs/gtkutil/DeferredMotionDelta.h
   libs/gtkutil/FileChooser.cpp
   libs/gtkutil/FreezePointer.cpp
   libs/gtkutil/GLFont.cpp
   libs/gtkutil/GLFont.h
   libs/gtkutil/GLWidget.cpp
   libs/gtkutil/GLWidget.h
   libs/gtkutil/GLWidgetSentry.h
   libs/gtkutil/GladeWidgetHolder.h
   libs/gtkutil/IConv.h
   libs/gtkutil/Makefile.am
   libs/gtkutil/Makefile.in
   libs/gtkutil/PanedPosition.cpp
   libs/gtkutil/SerialisableWidgets.cpp
   libs/gtkutil/SourceView.cpp
   libs/gtkutil/SourceView.h
   libs/gtkutil/WindowPosition.cpp
   libs/gtkutil/preview/RenderPreview.cpp
   libs/gtkutil/preview/RenderPreview.h
   libs/gtkutil/window/PersistentTransientWindow.cpp
   libs/gtkutil/window/TransientWindow.cpp
   libs/gtkutil/window/TransientWindow.h
   libs/jpeg6/jdapimin.cpp
   libs/jpeg6/jdatasrc.cpp
   libs/jpeg6/jdct.h
   libs/jpeg6/jdhuff.cpp
   libs/jpeg6/jdinput.cpp
   libs/jpeg6/jdmarker.cpp
   libs/jpeg6/jdmaster.cpp
   libs/jpeg6/jdsample.cpp
   libs/jpeg6/jfdctflt.cpp
   libs/jpeg6/jidctflt.cpp
   libs/jpeg6/jmemmgr.cpp
   libs/jpeg6/jpgload.cpp
   libs/math/Makefile.in
   libs/math/Matrix4.cpp
   libs/math/Matrix4.h
   libs/math/Plane3.cpp
   libs/math/Plane3.h
   libs/math/Quaternion.h
   libs/math/Vector3.h
   libs/math/Vector4.h
   libs/os/dir.h
   libs/os/path.h
   libs/picomodel/Makefile.in
   libs/pivot.h
   libs/radiant_jpeglib.h
   libs/render.h
   libs/render/ShaderStateRenderer.h
   libs/scene/Makefile.am
   libs/scene/Makefile.in
   libs/scene/Node.cpp
   libs/scene/Node.h
   libs/scenelib.h
   libs/selectionlib.h
   libs/shaderlib.h
   libs/signal/signal.h
   libs/string/string.h
   libs/xmlutil/Makefile.in
   ltmain.sh
   m4/libtool.m4
   m4/ltoptions.m4
   m4/ltversion.m4
   m4/lt~obsolete.m4
   plugins/Makefile.am
   plugins/Makefile.in
   plugins/archivezip/Makefile.am
   plugins/archivezip/Makefile.in
   plugins/commandsystem/Makefile.in
   plugins/dm.conversation/CommandArgumentItem.cpp
   plugins/dm.conversation/ConversationCommand.cpp
   plugins/dm.conversation/ConversationCommandInfo.cpp
   plugins/dm.conversation/ConversationCommandLibrary.cpp
   plugins/dm.conversation/ConversationDialog.cpp
   plugins/dm.conversation/ConversationEditor.cpp
   plugins/dm.conversation/ConversationEntity.cpp
   plugins/dm.conversation/ConversationKeyExtractor.cpp
   plugins/dm.conversation/Makefile.am
   plugins/dm.conversation/Makefile.in
   plugins/dm.difficulty/DifficultyDialog.cpp
   plugins/dm.difficulty/DifficultyEntity.cpp
   plugins/dm.difficulty/DifficultySettings.cpp
   plugins/dm.difficulty/DifficultySettingsManager.cpp
   plugins/dm.difficulty/Makefile.in
   plugins/dm.editing/AIHeadChooserDialog.cpp
   plugins/dm.editing/AIHeadChooserDialog.h
   plugins/dm.editing/AIVocalSetChooserDialog.cpp
   plugins/dm.editing/AIVocalSetChooserDialog.h
   plugins/dm.editing/AIVocalSetPreview.cpp
   plugins/dm.editing/FixupMap.cpp
   plugins/dm.editing/Makefile.am
   plugins/dm.editing/Makefile.in
   plugins/dm.gui/Makefile.in
   plugins/dm.gui/ReadableEditorDialog.cpp
   plugins/dm.gui/gui/GuiView.cpp
   plugins/dm.gui/gui/GuiWindowDef.cpp
   plugins/dm.gui/gui/RenderableCharacterBatch.cpp
   plugins/dm.gui/gui/RenderableText.cpp
   plugins/dm.gui/plugin.cpp
   plugins/dm.objectives/Component.cpp
   plugins/dm.objectives/DifficultyPanel.cpp
   plugins/dm.objectives/Makefile.am
   plugins/dm.objectives/Makefile.in
   plugins/dm.objectives/ObjectiveConditionsDialog.cpp
   plugins/dm.objectives/ObjectiveEntity.cpp
   plugins/dm.objectives/ObjectiveKeyExtractor.cpp
   plugins/dm.objectives/ObjectivesEditor.cpp
   plugins/dm.objectives/Specifier.cpp
   plugins/dm.objectives/ce/AIFindBodyComponentEditor.cpp
   plugins/dm.objectives/ce/AlertComponentEditor.cpp
   plugins/dm.objectives/ce/DestroyComponentEditor.cpp
   plugins/dm.objectives/ce/DistanceComponentEditor.cpp
   plugins/dm.objectives/ce/ItemComponentEditor.cpp
   plugins/dm.objectives/ce/KillComponentEditor.cpp
   plugins/dm.objectives/ce/KnockoutComponentEditor.cpp
   plugins/dm.objectives/ce/PickpocketComponentEditor.cpp
   plugins/dm.objectives/ce/ReadablePageReachedComponentEditor.cpp
   plugins/dm.stimresponse/ClassEditor.cpp
   plugins/dm.stimresponse/CustomStimEditor.cpp
   plugins/dm.stimresponse/EffectArgumentItem.cpp
   plugins/dm.stimresponse/Makefile.am
   plugins/dm.stimresponse/Makefile.in
   plugins/dm.stimresponse/ResponseEditor.cpp
   plugins/dm.stimresponse/ResponseEffect.cpp
   plugins/dm.stimresponse/SREntity.cpp
   plugins/dm.stimresponse/SRPropertyLoader.cpp
   plugins/dm.stimresponse/SRPropertyLoader.h
   plugins/dm.stimresponse/SRPropertySaver.cpp
   plugins/dm.stimresponse/StimEditor.cpp
   plugins/dm.stimresponse/StimTypes.cpp
   plugins/eclassmgr/Doom3EntityClass.cpp
   plugins/eclassmgr/Doom3EntityClass.h
   plugins/eclassmgr/EClassManager.cpp
   plugins/eclassmgr/EClassManager.h
   plugins/eclassmgr/Makefile.in
   plugins/eclasstree/EClassTree.cpp
   plugins/eclasstree/EClassTree.h
   plugins/eclasstree/Makefile.in
   plugins/entity/EntityCreator.cpp
   plugins/entity/EntityCreator.h
   plugins/entity/EntityNode.cpp
   plugins/entity/EntityNode.h
   plugins/entity/EntitySettings.cpp
   plugins/entity/EntitySettings.h
   plugins/entity/KeyObserverMap.h
   plugins/entity/Makefile.am
   plugins/entity/Makefile.in
   plugins/entity/NameKey.h
   plugins/entity/OriginKey.h
   plugins/entity/ShaderParms.cpp
   plugins/entity/VertexInstance.h
   plugins/entity/angle.h
   plugins/entity/curve/Curve.cpp
   plugins/entity/curve/Curve.h
   plugins/entity/curve/CurveControlPointFunctors.h
   plugins/entity/curve/CurveEditInstance.cpp
   plugins/entity/curve/CurveEditInstance.h
   plugins/entity/curve/RenderableCurve.h
   plugins/entity/doom3group/Doom3Group.cpp
   plugins/entity/doom3group/Doom3GroupNode.cpp
   plugins/entity/doom3group/Doom3GroupNode.h
   plugins/entity/light/Doom3LightRadius.h
   plugins/entity/light/Light.cpp
   plugins/entity/light/Light.h
   plugins/entity/light/LightNode.cpp
   plugins/entity/light/LightNode.h
   plugins/entity/speaker/SpeakerNode.cpp
   plugins/entity/speaker/SpeakerNode.h
   plugins/entity/target/RenderableTargetLines.h
   plugins/entitylist/EntityList.cpp
   plugins/entitylist/EntityList.h
   plugins/entitylist/Makefile.in
   plugins/eventmanager/EventManager.cpp
   plugins/eventmanager/Makefile.in
   plugins/eventmanager/RegistryToggle.h
   plugins/filetypes/Makefile.am
   plugins/filetypes/Makefile.in
   plugins/filters/BasicFilterSystem.cpp
   plugins/filters/BasicFilterSystem.h
   plugins/filters/Makefile.am
   plugins/filters/Makefile.in
   plugins/fonts/FontLoader.cpp
   plugins/fonts/Makefile.am
   plugins/fonts/Makefile.in
   plugins/grid/Grid.cpp
   plugins/grid/Makefile.in
   plugins/image/Makefile.in
   plugins/image/jpeg.cpp
   plugins/image/png.cpp
   plugins/mapdoom3/Doom3MapReader.cpp
   plugins/mapdoom3/Makefile.am
   plugins/mapdoom3/Makefile.in
   plugins/mapdoom3/mapdoom3.cpp
   plugins/mapdoom3/primitiveparsers/BrushDef.cpp
   plugins/mapdoom3/primitiveparsers/BrushDef3.cpp
   plugins/mapdoom3/primitiveparsers/Patch.cpp
   plugins/mapdoom3/primitiveparsers/PatchDef2.cpp
   plugins/mapdoom3/primitiveparsers/PatchDef3.cpp
   plugins/md5model/MD5Anim.cpp
   plugins/md5model/MD5Model.cpp
   plugins/md5model/MD5Model.h
   plugins/md5model/MD5ModelNode.cpp
   plugins/md5model/MD5ModelNode.h
   plugins/md5model/MD5Surface.cpp
   plugins/md5model/MD5Surface.h
   plugins/md5model/Makefile.am
   plugins/md5model/Makefile.in
   plugins/model/Makefile.am
   plugins/model/Makefile.in
   plugins/model/PicoModelNode.cpp
   plugins/model/PicoModelNode.h
   plugins/model/RenderablePicoModel.cpp
   plugins/model/RenderablePicoModel.h
   plugins/model/RenderablePicoSurface.cpp
   plugins/model/RenderablePicoSurface.h
   plugins/particles/Makefile.am
   plugins/particles/Makefile.in
   plugins/particles/ParticleDef.h
   plugins/particles/ParticleNode.cpp
   plugins/particles/ParticleNode.h
   plugins/particles/ParticleParameter.cpp
   plugins/particles/ParticleParameter.h
   plugins/particles/ParticlesManager.cpp
   plugins/particles/ParticlesManager.h
   plugins/particles/RenderableParticle.cpp
   plugins/particles/RenderableParticle.h
   plugins/particles/RenderableParticleBunch.cpp
   plugins/particles/RenderableParticleBunch.h
   plugins/particles/RenderableParticleStage.cpp
   plugins/particles/RenderableParticleStage.h
   plugins/particles/editor/ParticleEditor.cpp
   plugins/particles/editor/ParticleEditor.h
   plugins/scenegraph/Makefile.am
   plugins/scenegraph/Makefile.in
   plugins/scenegraph/SceneGraph.cpp
   plugins/scenegraph/SceneGraph.h
   plugins/script/Makefile.am
   plugins/script/Makefile.in
   plugins/script/ScriptingSystem.cpp
   plugins/script/ScriptingSystem.h
   plugins/script/interfaces/ModelInterface.cpp
   plugins/script/interfaces/ModelInterface.h
   plugins/script/interfaces/PatchInterface.cpp
   plugins/script/interfaces/SoundInterface.cpp
   plugins/script/interfaces/SoundInterface.h
   plugins/shaders/CShader.cpp
   plugins/shaders/CShader.h
   plugins/shaders/Doom3ShaderLayer.cpp
   plugins/shaders/Doom3ShaderLayer.h
   plugins/shaders/Makefile.in
   plugins/shaders/MapExpression.cpp
   plugins/shaders/ShaderExpression.cpp
   plugins/shaders/ShaderExpression.h
   plugins/shaders/ShaderTemplate.cpp
   plugins/shaders/ShaderTemplate.h
   plugins/shaders/textures/GLTextureManager.cpp
   plugins/shaders/textures/GLTextureManager.h
   plugins/shaders/textures/TextureManipulator.cpp
   plugins/shaders/textures/TextureManipulator.h
   plugins/skins/Makefile.am
   plugins/skins/Makefile.in
   plugins/sound/Makefile.in
   plugins/sound/SoundFileLoader.h
   plugins/sound/SoundManager.cpp
   plugins/sound/SoundManager.h
   plugins/sound/SoundShader.cpp
   plugins/sound/SoundShader.h
   plugins/uimanager/FilterMenu.cpp
   plugins/uimanager/GroupDialog.cpp
   plugins/uimanager/GroupDialog.h
   plugins/uimanager/Makefile.am
   plugins/uimanager/Makefile.in
   plugins/uimanager/StatusBarManager.cpp
   plugins/uimanager/StatusBarManager.h
   plugins/uimanager/UIManager.cpp
   plugins/uimanager/UIManager.h
   plugins/uimanager/colourscheme/ColourScheme.h
   plugins/uimanager/colourscheme/ColourSchemeManager.cpp
   plugins/undo/Makefile.in
   plugins/undo/UndoSystem.cpp
   plugins/vfspk3/DirectoryArchive.cpp
   plugins/vfspk3/Doom3FileSystem.cpp
   plugins/vfspk3/Makefile.in
   plugins/wavefront/Makefile.am
   plugins/wavefront/WaveFrontExporter.cpp
   plugins/xmlregistry/Makefile.in
   plugins/xmlregistry/XMLRegistry.cpp
   plugins/xmlregistry/XMLRegistry.h
   radiant/Makefile.am
   radiant/Makefile.in
   radiant/Profile.cpp
   radiant/RadiantModule.cpp
   radiant/RadiantModule.h
   radiant/brush/Brush.cpp
   radiant/brush/BrushModule.cpp
   radiant/brush/BrushModule.h
   radiant/brush/BrushNode.cpp
   radiant/brush/BrushNode.h
   radiant/brush/Face.cpp
   radiant/brush/Face.h
   radiant/brush/FaceInstance.cpp
   radiant/brush/FaceInstance.h
   radiant/brush/FaceShader.cpp
   radiant/brush/FixedWinding.cpp
   radiant/brush/FixedWinding.h
   radiant/brush/RenderableWireFrame.h
   radiant/brush/TextureProjection.cpp
   radiant/brush/Winding.cpp
   radiant/brush/Winding.h
   radiant/brush/csg/CSG.cpp
   radiant/brush/export/CollisionModel.h
   radiant/brushmanip.cpp
   radiant/camera/CamRenderer.h
   radiant/camera/CamWnd.cpp
   radiant/camera/CamWnd.h
   radiant/camera/Camera.cpp
   radiant/camera/CameraSettings.cpp
   radiant/camera/CameraSettings.h
   radiant/camera/FloatingCamWnd.cpp
   radiant/camera/FloatingCamWnd.h
   radiant/camera/GlobalCamera.cpp
   radiant/clipper/ClipPoint.cpp
   radiant/clipper/Clipper.cpp
   radiant/clipper/Clipper.h
   radiant/entity.cpp
   radiant/layers/LayerCommandTarget.cpp
   radiant/log/GtkLogRedirector.h
   radiant/log/LogFile.cpp
   radiant/main.cpp
   radiant/mainframe_old.cpp
   radiant/map/AutoSaver.cpp
   radiant/map/AutoSaver.h
   radiant/map/CounterManager.cpp
   radiant/map/FindMapElements.cpp
   radiant/map/InfoFile.cpp
   radiant/map/Map.cpp
   radiant/map/Map.h
   radiant/map/MapFileChooserPreview.cpp
   radiant/map/MapFileChooserPreview.h
   radiant/map/MapPosition.cpp
   radiant/map/MapPositionManager.cpp
   radiant/map/MapResource.cpp
   radiant/map/RegionManager.cpp
   radiant/map/RegionManager.h
   radiant/map/StartupMapLoader.cpp
   radiant/map/StartupMapLoader.h
   radiant/map/algorithm/AssignLayerMappingWalker.h
   radiant/map/algorithm/ChildPrimitives.cpp
   radiant/map/algorithm/InfoFileExporter.cpp
   radiant/map/algorithm/MapExporter.cpp
   radiant/map/algorithm/MapImporter.cpp
   radiant/modulesystem/ApplicationContextImpl.cpp
   radiant/modulesystem/ModuleLoader.cpp
   radiant/modulesystem/ModuleRegistry.cpp
   radiant/namespace/ComplexName.h
   radiant/patch/Patch.cpp
   radiant/patch/Patch.h
   radiant/patch/PatchBezier.cpp
   radiant/patch/PatchBezier.h
   radiant/patch/PatchControlInstance.h
   radiant/patch/PatchNode.cpp
   radiant/patch/PatchNode.h
   radiant/patch/PatchRenderables.cpp
   radiant/patch/PatchRenderables.h
   radiant/patchmanip.cpp
   radiant/referencecache/ModelCache.cpp
   radiant/referencecache/NullModel.cpp
   radiant/referencecache/NullModel.h
   radiant/render/LinearLightList.h
   radiant/render/OpenGLModule.cpp
   radiant/render/OpenGLModule.h
   radiant/render/OpenGLRenderSystem.cpp
   radiant/render/OpenGLRenderSystem.h
   radiant/render/RenderStatistics.h
   radiant/render/RenderSystemFactory.cpp
   radiant/render/backend/GLProgramFactory.cpp
   radiant/render/backend/OpenGLShader.cpp
   radiant/render/backend/OpenGLShader.h
   radiant/render/backend/OpenGLShaderPass.cpp
   radiant/render/backend/OpenGLShaderPass.h
   radiant/render/backend/OpenGLShaderPassAdd.h
   radiant/render/backend/OpenGLStateLess.h
   radiant/render/backend/OpenGLStateManager.h
   radiant/render/backend/glprogram/ARBBumpProgram.cpp
   radiant/render/backend/glprogram/ARBBumpProgram.h
   radiant/render/backend/glprogram/ARBDepthFillProgram.h
   radiant/render/backend/glprogram/GLSLBumpProgram.cpp
   radiant/render/backend/glprogram/GLSLBumpProgram.h
   radiant/render/backend/glprogram/GLSLDepthFillProgram.h
   radiant/render/debug/SpacePartitionRenderer.cpp
   radiant/render/debug/SpacePartitionRenderer.h
   radiant/render/frontend/RenderHighlighted.h
   radiant/selection/BestPoint.cpp
   radiant/selection/BestPoint.h
   radiant/selection/DragManipulator.cpp
   radiant/selection/Intersection.cpp
   radiant/selection/RadiantSelectionSystem.cpp
   radiant/selection/RadiantSelectionSystem.h
   radiant/selection/RadiantWindowObserver.cpp
   radiant/selection/Remap.h
   radiant/selection/Renderables.h
   radiant/selection/RotateManipulator.cpp
   radiant/selection/TranslateManipulator.cpp
   radiant/selection/algorithm/Primitives.cpp
   radiant/selection/algorithm/Shader.cpp
   radiant/selection/algorithm/Transformation.cpp
   radiant/selection/selectionset/SelectionSetManager.cpp
   radiant/selection/selectionset/SelectionSetManager.h
   radiant/settings/GameManager.cpp
   radiant/settings/GameManager.h
   radiant/settings/LanguageManager.cpp
   radiant/textool/TexTool.cpp
   radiant/textool/TexTool.h
   radiant/textool/item/FaceVertexItem.cpp
   radiant/ui/about/AboutDialog.cpp
   radiant/ui/animationpreview/AnimationPreview.cpp
   radiant/ui/animationpreview/AnimationPreview.h
   radiant/ui/common/ShaderChooser.cpp
   radiant/ui/common/ShaderChooser.h
   radiant/ui/common/ShaderDefinitionView.h
   radiant/ui/common/ShaderSelector.cpp
   radiant/ui/common/SoundChooser.cpp
   radiant/ui/common/TexturePreviewCombo.cpp
   radiant/ui/common/TexturePreviewCombo.h
   radiant/ui/einspector/AddPropertyDialog.cpp
   radiant/ui/einspector/AnglePropertyEditor.cpp
   radiant/ui/einspector/EntityInspector.cpp
   radiant/ui/einspector/EntityInspector.h
   radiant/ui/einspector/SkinChooser.cpp
   radiant/ui/einspector/SkinChooser.h
   radiant/ui/entitychooser/EntityClassChooser.cpp
   radiant/ui/entitychooser/EntityClassChooser.h
   radiant/ui/findshader/FindShader.cpp
   radiant/ui/layers/LayerControlDialog.cpp
   radiant/ui/layers/LayerControlDialog.h
   radiant/ui/lightinspector/LightInspector.cpp
   radiant/ui/lightinspector/LightInspector.h
   radiant/ui/mainframe/FloatingLayout.cpp
   radiant/ui/mainframe/LayoutCommand.h
   radiant/ui/mainframe/MainFrame.cpp
   radiant/ui/mainframe/MainFrame.h
   radiant/ui/mainframe/SplitPaneLayout.cpp
   radiant/ui/mapinfo/EntityInfoTab.cpp
   radiant/ui/mapinfo/ModelInfoTab.cpp
   radiant/ui/mapinfo/ShaderInfoTab.cpp
   radiant/ui/mediabrowser/MediaBrowser.cpp
   radiant/ui/mediabrowser/MediaBrowser.h
   radiant/ui/modelselector/ModelSelector.cpp
   radiant/ui/modelselector/ModelSelector.h
   radiant/ui/mru/MRU.cpp
   radiant/ui/mru/MRU.h
   radiant/ui/mru/MRUMenuItem.cpp
   radiant/ui/ortho/OrthoContextMenu.cpp
   radiant/ui/ortho/OrthoContextMenu.h
   radiant/ui/overlay/Overlay.cpp
   radiant/ui/overlay/Overlay.h
   radiant/ui/overlay/OverlayDialog.cpp
   radiant/ui/overlay/OverlayDialog.h
   radiant/ui/particles/ParticlesChooser.cpp
   radiant/ui/particles/ParticlesChooser.h
   radiant/ui/patch/BulgePatchDialog.cpp
   radiant/ui/patch/PatchCreateDialog.cpp
   radiant/ui/patch/PatchInspector.cpp
   radiant/ui/patch/PatchInspector.h
   radiant/ui/patch/PatchThickenDialog.cpp
   radiant/ui/prefdialog/PrefDialog.cpp
   radiant/ui/prefdialog/PrefDialog.h
   radiant/ui/prefdialog/PrefPage.cpp
   radiant/ui/prefdialog/PrefPage.h
   radiant/ui/surfaceinspector/SurfaceInspector.cpp
   radiant/ui/surfaceinspector/SurfaceInspector.h
   radiant/ui/texturebrowser/TextureBrowser.cpp
   radiant/ui/texturebrowser/TextureBrowser.h
   radiant/ui/transform/TransformDialog.cpp
   radiant/ui/transform/TransformDialog.h
   radiant/xyview/FloatingOrthoView.h
   radiant/xyview/GlobalXYWnd.cpp
   radiant/xyview/GlobalXYWnd.h
   radiant/xyview/XYRenderer.h
   radiant/xyview/XYWnd.cpp
   tools/innosetup/darkradiant.iss
   tools/innosetup/darkradiant.x64.iss
   tools/msvc2010/DarkRadiant.sln
   tools/msvc2010/DarkRadiant.vcxproj
   tools/msvc2010/DarkRadiant.vcxproj.filters
   tools/msvc2010/archivezip.vcxproj
   tools/msvc2010/archivezip.vcxproj.filters
   tools/msvc2010/commandsystem.vcxproj
   tools/msvc2010/dm.conversation.vcxproj
   tools/msvc2010/dm.conversation.vcxproj.filters
   tools/msvc2010/dm.editing.vcxproj
   tools/msvc2010/dm.objectives.vcxproj
   tools/msvc2010/dm.objectives.vcxproj.filters
   tools/msvc2010/dm.stimresponse.vcxproj
   tools/msvc2010/dm.stimresponse.vcxproj.filters
   tools/msvc2010/eclassmgr.vcxproj
   tools/msvc2010/eclassmgr.vcxproj.filters
   tools/msvc2010/entity.vcxproj
   tools/msvc2010/entity.vcxproj.filters
   tools/msvc2010/gtkutillib.vcxproj
   tools/msvc2010/gtkutillib.vcxproj.filters
   tools/msvc2010/image.vcxproj
   tools/msvc2010/include.vcxproj
   tools/msvc2010/mapdoom3.vcxproj
   tools/msvc2010/mapdoom3.vcxproj.filters
   tools/msvc2010/md5model.vcxproj
   tools/msvc2010/md5model.vcxproj.filters
   tools/msvc2010/model.vcxproj
   tools/msvc2010/model.vcxproj.filters
   tools/msvc2010/particles.vcxproj
   tools/msvc2010/particles.vcxproj.filters
   tools/msvc2010/post_build_event.cmd
   tools/msvc2010/post_build_event_x64.cmd
   tools/msvc2010/properties/DarkRadiant Base Debug Win32.props
   tools/msvc2010/properties/DarkRadiant Base Release Win32.props
   tools/msvc2010/properties/DarkRadiant Base.props
   tools/msvc2010/properties/GTKmm.props
   tools/msvc2010/properties/GtkGLExtmm.props
   tools/msvc2010/properties/win_iconv.props
   tools/msvc2010/scenegraph.vcxproj
   tools/msvc2010/scenelib.vcxproj
   tools/msvc2010/script.vcxproj
   tools/msvc2010/script.vcxproj.filters
   tools/msvc2010/uimanager.vcxproj
   tools/msvc2010/uimanager.vcxproj.filters

Wonderful, every single file is in a conflicted state now looks like.

I guess I'm never going to be able to beta test DarkRadiant again with this change to GIT. Oh well, it was nice while it lasted. thanks for trying to help Orb.

OrbWeaver · May 21, 2012

Okay so I deleted the cloned repository on my computer then re-cloned it. I then opened Git GUI and opened my current repository. So far so good, so I go to Remote>Fetch from>origin and it downloads some updates. So far so good
Next I go to Merge>Local Merge... and get this in the Merge Commit Message:

What did you select to be merged, in the Local Merge dialog? There is no branch v1.7.0, but there was a tag with that name (now deleted) which pointed at an old commit corresponding to the time when 1.7.0 was released last year. If you are trying to merge an old tag into the current branch I would expect there to be errors.

To merge in changes from upstream, you will need to choose Tracking branch and select the branch "origin/master" in the Local Merge dialog.

I guess I'm never going to be able to beta test DarkRadiant again with this change to GIT. Oh well, it was nice while it lasted. thanks for trying to help Orb.

Did you see my edited suggestion in the previous post to try using TortoiseGit? It works on top of the already-installed Git version, and looks like it would be easier for certain tasks (like pulling).

Tels · May 21, 2012

I guess I'm never going to be able to beta test DarkRadiant again with this change to GIT. Oh well, it was nice while it lasted. thanks for trying to help Orb.

And people wonder why I strongly resist changing from SVN to GIT.. Thank god the main repository is still the same. Never touch a running system Now excuse me

AluminumHaste · May 21, 2012

Well TortoiseSVN was incredibly noob friendly and allowed people to use SVN without actually knowing how it worked in the background. I'll try the other way Orb suggested.

AluminumHaste · May 21, 2012

Okay I think I might have gotten it to work. I opened GitGUI and went to Branch->Reset, then Branch->Checkout and picked "master". Then I went to Remote->Fetch from->origin, then did Meger->Local Merge and it seems to have worked at least I didn't get any errors. Compiling now. How do I check which revision I'm at?

EDIT: Well assuming that I'm at the current revision, the problems still exist in DR. Pressing 'T' to open the texture browser, then press 'T' again to close it, then press 'T' one more time to open it again, it now has no textures in it. You have to click on another tab such as the Console tab, then click on the Texture Browser, then the textures show up again.

OrbWeaver · May 21, 2012

How do I check which revision I'm at?

Use the "Visualize master's history" option from the left-most menu (whose name I can't remember right now). It will create a new window with the log of revisions in the current branch. The most recent revision right now is commit 90c8825bd7fd20e18e049a92d84be94ea18b4a30 (Fixed incorrect spacing in texture browser).

EDIT: Well assuming that I'm at the current revision, the problems still exist in DR. Pressing 'T' to open the texture browser, then press 'T' again to close it, then press 'T' one more time to open it again, it now has no textures in it. You have to click on another tab such as the Console tab, then click on the Texture Browser, then the textures show up again.

I haven't investigated that issue yet, so it probably isn't fixed in the latest revision.

AluminumHaste · May 21, 2012

Use the "Visualize master's history" option from the left-most menu (whose name I can't remember right now). It will create a new window with the log of revisions in the current branch. The most recent revision right now is commit 90c8825bd7fd20e18e049a92d84be94ea18b4a30 (Fixed incorrect spacing in texture browser).

I haven't investigated that issue yet, so it probably isn't fixed in the latest revision.

Okay then I'm at the latest revision, cool.

The funky colored patch faces of func_statics are no longer there (good) so I guess it's working, thank you Orb for your time

OrbWeaver · June 17, 2012

Developers on Windows might be interested in this:

http://windows.github.com/

It is a new Windows client for Git which integrates specifically with Github. I did some quick testing and it certainly looks pretty and enabled me to push a new commit fairly easily, so it might be a good choice for people who find the standard Windows git tools uncomfortable to use.

AluminumHaste · June 17, 2012

This is just a general question about GIT for Orb. I switched to TortoiseGit cause I needed it dumbed down for me lol. Anyways I did a pull today and there were a bunch of changes, and then it just stopped at one point and didn't finish as far as I could tell. No disk access or network access going on, nor CPU usage. Here's the log:

git.exe pull -v --progress  "origin" master

POST git-upload-pack (919 bytes)
remote: Compressing objects: 100% (27/27)   
remote: Compressing objects: 100% (27/27), done.
Receiving objects: 100% (357/357)
Resolving deltas: 100% (333/333)
Resolving deltas: 100% (333/333), completed with 294 local objects.
From https://github.com/orbweaver/DarkRadiant
* branch		    master	 -> FETCH_HEAD
Updating a981da5..cda7962
Fast-forward
configure										  |   20 +-
configure.ac									   |    2 +-
debian/changelog								   |    6 +-
debian/control									 |    2 +-
include/imodule.h								  |    2 +-
include/inamespace.h							   |   40 +-
include/itextstream.h							  |   43 +-
include/version.h								  |    2 +-
libs/debugging/ScenegraphUtils.h				   |    2 +-
libs/debugging/ScopedDebugTimer.h				  |    6 +-
libs/dragplanes.h								  |   24 +-
libs/gtkutil/FileChooser.cpp					   |    2 +-
libs/gtkutil/GLWidget.cpp						  |    8 +-
libs/gtkutil/MultiMonitor.h					    |    4 +-
libs/gtkutil/SourceView.cpp					    |    2 +-
libs/gtkutil/clipboard.cpp						 |    4 +-
libs/gtkutil/dialog/Dialog.cpp					 |    4 +-
libs/gtkutil/dialog/MessageBox.cpp				 |    2 +-
libs/parser/CodeTokeniser.h					    |   10 +-
libs/texturelib.h								  |    6 +-
plugins/archivezip/ZipArchive.cpp				  |    8 +-
plugins/archivezip/plugin.cpp					  |    2 +-
plugins/commandsystem/Command.h				    |    6 +-
plugins/commandsystem/CommandSystem.cpp		    |   26 +-
plugins/dm.conversation/CommandEditor.cpp		  |   10 +-
.../dm.conversation/ConversationCommandInfo.cpp    |    2 +-
plugins/dm.conversation/ConversationEntity.cpp	 |    2 +-
.../dm.conversation/ConversationKeyExtractor.cpp   |    2 +-
plugins/dm.conversation/plugin.cpp				 |    2 +-
.../dm.difficulty/DifficultySettingsManager.cpp    |    4 +-
plugins/dm.difficulty/plugin.cpp				   |    2 +-
plugins/dm.editing/plugin.cpp					  |    2 +-
plugins/dm.gui/ReadableEditorDialog.cpp		    |    2 +-
plugins/dm.gui/XDataLoader.cpp					 |    4 +-
plugins/dm.gui/gui/Gui.cpp						 |    2 +-
plugins/dm.gui/gui/GuiManager.cpp				  |    6 +-
plugins/dm.gui/gui/GuiScript.cpp				   |    6 +-
plugins/dm.gui/gui/GuiWindowDef.cpp			    |    4 +-
plugins/dm.gui/gui/RenderableText.cpp			  |    2 +-
plugins/dm.gui/plugin.cpp						  |    2 +-
.../dm.objectives/ObjectiveConditionsDialog.cpp    |    4 +-
plugins/dm.objectives/ObjectiveEntity.cpp		  |   10 +-
plugins/dm.objectives/ObjectiveKeyExtractor.cpp    |    4 +-
plugins/dm.objectives/Specifier.cpp			    |    2 +-
plugins/dm.objectives/objectives.cpp			   |    4 +-
plugins/dm.stimresponse/SREntity.cpp			   |    2 +-
plugins/dm.stimresponse/StimTypes.cpp			  |    2 +-
plugins/dm.stimresponse/plugin.cpp				 |    2 +-
plugins/eclassmgr/Doom3EntityClass.cpp			 |    6 +-
plugins/eclassmgr/EClassManager.cpp			    |   14 +-
plugins/eclasstree/EClassTreeBuilder.cpp		   |    2 +-
plugins/eclasstree/plugin.cpp					  |    2 +-
plugins/entity/EntityCreator.cpp				   |    8 +-
plugins/entity/EntityNode.cpp					  |    2 +-
plugins/entity/KeyValueObserver.cpp			    |    3 +-
plugins/entity/NamespaceManager.cpp			    |  323 +++++++-------
plugins/entity/NamespaceManager.h				  |    2 -
plugins/entity/curve/Curve.cpp					 |    2 +-
plugins/entity/curve/CurveEditInstance.cpp		 |    6 +-
plugins/entity/target/TargetManager.cpp		    |    2 +-
plugins/entitylist/EntityListModule.cpp		    |    2 +-
plugins/eventmanager/EventManager.cpp			  |   32 +-
plugins/eventmanager/EventManager.h			    |    2 +-
plugins/eventmanager/Modifiers.cpp				 |   10 +-
plugins/eventmanager/MouseEvents.cpp			   |   54 +--
plugins/filetypes/FileTypeRegistry.cpp			 |    2 +-
plugins/filters/BasicFilterSystem.cpp			  |    6 +-
plugins/fonts/FontLoader.cpp					   |    2 +-
plugins/fonts/FontManager.cpp					  |    4 +-
plugins/fonts/GlyphSet.cpp						 |    4 +-
plugins/grid/Grid.cpp							  |    2 +-
plugins/image/ImageGDK.h						   |    2 +-
plugins/image/PNGLoader.h						  |    2 +-
plugins/image/bmp.cpp							  |   10 +-
plugins/image/bmp.h							    |    2 +-
plugins/image/dds.h							    |    2 +-
plugins/image/jpeg.cpp							 |    2 +-
plugins/image/jpeg.h							   |    2 +-
plugins/image/pcx.h							    |    2 +-
plugins/image/png.cpp							  |   10 +-
plugins/image/tga.cpp							  |   12 +-
plugins/image/tga.h							    |    2 +-
plugins/mapdoom3/Doom3MapFormat.cpp			    |    2 +-
plugins/mapdoom3/Doom3MapReader.cpp			    |    8 +-
plugins/mapdoom3/Doom3PrefabFormat.cpp			 |    2 +-
plugins/mapdoom3/Quake4MapFormat.cpp			   |    2 +-
plugins/mapdoom3/Quake4MapReader.cpp			   |    6 +-
plugins/mapdoom3/compiler/Doom3MapCompiler.cpp	 |   12 +-
plugins/mapdoom3/compiler/LeakFile.h			   |    4 +-
plugins/mapdoom3/compiler/OptIsland.cpp		    |   62 +--
plugins/mapdoom3/compiler/ProcCompiler.cpp		 |  294 ++++++-------
plugins/mapdoom3/compiler/ProcFile.cpp			 |   10 +-
plugins/mapdoom3/compiler/ProcLight.cpp		    |    4 +-
plugins/mapdoom3/compiler/Surface.cpp			  |   16 +-
plugins/md5model/MD5Anim.cpp					   |    4 +-
plugins/md5model/MD5AnimationCache.cpp			 |    4 +-
plugins/md5model/MD5ModelLoader.cpp			    |   10 +-
plugins/model/PicoModelLoader.cpp				  |    8 +-
plugins/model/plugin.cpp						   |   10 +-
plugins/particles/ParticleParameter.cpp		    |    4 +-
plugins/particles/ParticlesManager.cpp			 |    6 +-
plugins/particles/RenderableParticleBunch.cpp	  |    2 +-
plugins/particles/StageDef.cpp					 |   20 +-
plugins/particles/editor/ParticleEditor.cpp	    |    6 +-
plugins/particles/editor/ParticleEditorModule.h    |    2 +-
plugins/scenegraph/SceneGraph.cpp				  |    2 +-
plugins/scenegraph/SceneGraphFactory.cpp		   |    2 +-
plugins/script/PythonConsoleWriter.h			   |    4 +-
plugins/script/ScriptingSystem.cpp				 |   36 +-
plugins/script/interfaces/EntityInterface.cpp	  |    2 +-
plugins/script/interfaces/GridInterface.cpp	    |    2 +-
plugins/script/interfaces/PatchInterface.cpp	   |    2 +-
plugins/shaders/Doom3ShaderSystem.cpp			  |   82 ++--
plugins/shaders/MapExpression.cpp				  |   20 +-
plugins/shaders/ShaderExpression.cpp			   |    2 +-
plugins/shaders/ShaderFileLoader.cpp			   |    6 +-
plugins/shaders/ShaderLibrary.cpp				  |    2 +-
plugins/shaders/ShaderTemplate.cpp				 |   38 +-
plugins/shaders/TableDefinition.cpp			    |    2 +-
plugins/shaders/textures/GLTextureManager.cpp	  |    6 +-
plugins/shaders/textures/TextureManipulator.cpp    |    6 +-
plugins/skins/Doom3SkinCache.cpp				   |    4 +-
plugins/sound/SoundFileLoader.h				    |    4 +-
plugins/sound/SoundManager.cpp					 |    6 +-
plugins/sound/SoundPlayer.cpp					  |   22 +-
plugins/uimanager/DialogManager.cpp			    |    2 +-
plugins/uimanager/MenuItem.cpp					 |    6 +-
plugins/uimanager/MenuManager.cpp				  |   20 +-
plugins/uimanager/StatusBarManager.cpp			 |    2 +-
plugins/uimanager/ToolbarManager.cpp			   |   12 +-
plugins/uimanager/UIManager.cpp				    |   18 +-
plugins/uimanager/colourscheme/ColourScheme.cpp    |    4 +-
.../uimanager/colourscheme/ColourSchemeManager.cpp |   18 +-
plugins/undo/UndoSystem.cpp					    |   12 +-
plugins/vfspk3/Doom3FileSystem.cpp				 |   12 +-
plugins/wavefront/WaveFrontModule.cpp			  |    6 +-
plugins/xmlregistry/RegistryTree.cpp			   |   20 +-
plugins/xmlregistry/XMLRegistry.cpp			    |    8 +-
plugins/xmlregistry/XMLRegistry.h				  |    2 +-
radiant/Makefile.am							    |    1 +
radiant/Makefile.in							    |   17 +
radiant/RadiantModule.cpp						  |    4 +-
radiant/brush/Brush.cpp						    |   14 +-
radiant/brush/BrushModule.cpp					  |    4 +-
radiant/brush/BrushNode.cpp					    |    2 +-
radiant/brush/Face.cpp							 |    2 +-
radiant/brush/FixedWinding.cpp					 |    2 +-
radiant/brush/TextureProjection.cpp			    |   24 +-
radiant/brush/Winding.cpp						  |    2 +-
radiant/brush/csg/CSG.cpp						  |   16 +-
radiant/brush/export/CollisionModel.cpp		    |    4 +-
radiant/brushmanip.cpp							 |    4 +-
radiant/camera/CamWnd.cpp						  |    2 +-
radiant/camera/Camera.cpp						  |    4 +-
radiant/camera/GlobalCamera.cpp				    |    2 +-
radiant/clipper/Clipper.cpp					    |    2 +-
radiant/layers/LayerSystem.cpp					 |   22 +-
radiant/log/GtkLogRedirector.cpp				   |    6 +-
radiant/log/LogFile.cpp						    |    8 +-
radiant/log/LogStream.h						    |    2 +-
radiant/main.cpp								   |    2 +-
radiant/map/AutoSaver.cpp						  |   20 +-
radiant/map/InfoFile.cpp						   |    6 +-
radiant/map/Map.cpp							    |   20 +-
radiant/map/MapFileChooserPreview.cpp			  |    2 +-
radiant/map/MapFormatManager.cpp				   |    2 +-
radiant/map/MapPosition.cpp					    |    8 +-
radiant/map/MapPositionManager.cpp				 |    2 +-
radiant/map/MapResource.cpp					    |   42 +-
radiant/map/MapResourceManager.cpp				 |    2 +-
radiant/map/PointFile.cpp						  |    4 +-
radiant/map/UndoFileChangeTracker.h			    |    2 +-
radiant/map/algorithm/InfoFileExporter.cpp		 |    2 +-
radiant/map/algorithm/MapExporter.cpp			  |    8 +-
radiant/modulesystem/ApplicationContextImpl.cpp    |    8 +-
radiant/modulesystem/ModuleLoader.cpp			  |    2 +-
radiant/modulesystem/ModuleRegistry.cpp		    |    4 +-
radiant/namespace/ComplexName.cpp				  |   54 +++
radiant/namespace/ComplexName.h				    |  102 ++---
radiant/namespace/Namespace.cpp				    |  459 ++++++++++----------
radiant/namespace/Namespace.h					  |   31 +-
radiant/namespace/NamespaceFactory.cpp			 |    2 +-
radiantsc/sxt		 -
ritnm/iNeoRitnwsv.p  |
aa/ltncelrh	    + dnsei/ltnsc	   6-ritec|
aa//itneeAmiPvwp   + dnucm/mnnyp	   8-ritiipt/orEtFty |	 0-tliot/raa.s	  |

Right at the end there, with the pipe, the cursor was there blinking. All the options were greyed out, so it wasn't finished. Anyways I just clicked the X at the top to close the gui and tried doing another pull and it said it was up to date. I'm trying to build right now in VS2010 so we'll see if it screwed up, but is that okay if it finishes but the GUI hangs?

OrbWeaver · June 17, 2012

Right at the end there, with the pipe, the cursor was there blinking. All the options were greyed out, so it wasn't finished. Anyways I just clicked the X at the top to close the gui and tried doing another pull and it said it was up to date. I'm trying to build right now in VS2010 so we'll see if it screwed up, but is that okay if it finishes but the GUI hangs?

No idea what happened there; those random corrupt text strings look more like faulty memory or some more fundamental system problem rather than anything specifically git-related. I think if you force-close the process and subsequent git commands work fine then there probably is no lasting effect; although it's conceivable that the repository could get "wedged" like SVN sometimes does, I haven't seen this happen as yet (and at worst you would just need to re-clone the repository).

AluminumHaste · June 17, 2012

Cool thanks. It compiled successfully so I guess there was no lasting effect

PranQster · July 8, 2012

Should the following changes be made on this page?

Change from the (missing) SVN:

svn checkout https://darkradiant.svn.sourceforge.net/svnroot/darkradiant/trunk/darkradiant/ darkradiant

To the new git:

git clone git://github.com/orbweaver/DarkRadiant.git

OrbWeaver · July 10, 2012

Should the following changes be made on this page?

Yes, I haven't got around to updating the wiki page yet, I should probably do so. Feel free to go ahead and change it yourself if you have an account.

New Git repository for DarkRadiant

Recommended Posts

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Join the conversation

Recent Status Updates