Fixes issue #2216 [Feature Request]

.gitattributes

@@ -0,0 +1,10 @@
+# Enforce LF normalization on Windows
+* text=lf
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union

.gitignore

@@ -15,6 +15,7 @@ _ReSharper.*/
 
 #binary stuff
 /*.dll
+/*.dll.config
 *.pdb
 *.mdb
 *.exe
@@ -24,9 +25,13 @@ _ReSharper.*/
 *.orig
 \#*
 .*.sw?
+
 # dependency DLLs (different for every platform!)
 cg.dll
 cgGL.dll
+freetype6.dll
+zlib1.dll
+SDL.dll
 
 /OpenRa.Gl.dll
 
@@ -49,9 +54,12 @@ OpenRA.Launcher.Mac/build/
 OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.pbxuser
 OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.perspectivev3
 OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
-*.config
 *.resources
 
 # KDE crap
 *.kate-swp
-*.directory
+*.directory
+
+# auto-generated documentation
+DOCUMENTATION.md
+*.html

.travis.yml

@@ -6,17 +6,18 @@ language: c
 
 # Make sure build dependencies are installed.
 install:
- - sudo apt-get install mono-gmcs cli-common-dev libgl1-mesa-dev libsdl1.2-dev libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev libsmpeg-dev libopenal-dev libalut-dev
+ - sudo apt-get update && sudo apt-get install mono-gmcs cli-common-dev libgl1-mesa-dev libsdl1.2-dev libopenal-dev
 
-# Run the build script which will automatically call RALint.
+# Run the build script which will automatically call RALint and ensure that the IDE project files are still valid.
 script:
  - make all
+ - xbuild
 
 # Only watch the development branch.
 branches:
  only:
    - bleed
 
-# Notify developers when needed.
+# Notify developers when build passed/failed.
 notifications:
   irc: "irc.freenode.net#openra"

AUTHORS

@@ -14,11 +14,13 @@ Also thanks to:
 	* Andrew Riedi
 	* Barnaby Smith		(mvi)
 	* Bellator
+	* Bugra Cuhadaroglu (BugraC)
 	* Christer Ulfsparre	(Holloweye)
 	* Cody Brittain		(Generalcamo)
 	* Daniel Derejvanik     (Harisson)
 	* Danny			(Dan9550)
 	* Erasmus Schroder	(rasco)
+	* Frank Razenberg	(zzattack)
 	* Igor Popov		(ihptru)
 	* Iran
 	* James Dunne		(jsd)
@@ -30,20 +32,25 @@ Also thanks to:
 	* Krishnakanth Mallik
 	* Kyrre Soerensen	(zypres)
 	* Lawrence Wang
+	* Lesueur Benjamin	(Valkirie)
 	* Mark Olson		(markolson)
 	* Matthew Gatland	(mgatland)
 	* Matthias Mailänder	(Mailaender)
 	* Maarten Meuris	(Nyerguds)
 	* Max Ugrumov		(katzsmile)
 	* Max621
 	* Nukem
+	* Olaf van der Spek
 	* Paolo Chiodi		(paolochiodi)
 	* Paul Dovydaitis	(pdovy)
 	* Psydev
 	* Raymond Martineau	(mart0258)
+	* Reaperrr
 	* Riderr3
+	* Sascha Biedermann	(bidifx)
 	* Tim Mylemans		(gecko)
 	* Tirili
+	* Tristan Keating       (Kilkakon)
 	* Vladimir Komarov	(VrKomarov)
 
 Past developers included:

Makefile

@@ -1,18 +1,30 @@
 CSC         = gmcs
 CSFLAGS     = -nologo -warn:4 -debug:full -optimize- -codepage:utf8 -unsafe -warnaserror
 DEFINE      = DEBUG;TRACE
-COMMON_LIBS = System.dll System.Core.dll System.Drawing.dll System.Xml.dll thirdparty/ICSharpCode.SharpZipLib.dll thirdparty/FuzzyLogicLibrary.dll
-PHONY       = core tools package all mods clean distclean
+COMMON_LIBS = System.dll System.Core.dll System.Drawing.dll System.Xml.dll thirdparty/ICSharpCode.SharpZipLib.dll thirdparty/FuzzyLogicLibrary.dll thirdparty/Mono.Nat.dll
+PHONY       = core tools package all mods clean distclean dependencies version
+VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
 
 .SUFFIXES:
 core: game renderers mods utility tsbuild
 tools: editor ralint tsbuild
-package: core editor
+package: dependencies core editor docs version
 mods: mod_ra mod_cnc mod_d2k
-all: core tools
-clean: 
+all: dependencies core tools
+clean:
 	@-rm -f *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb *.resources
 distclean: clean
+dependencies:
+	@ cp -r thirdparty/*.dl* .
+	@ cp -r thirdparty/Tao/* .
+version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml
+	@for i in $? ; do \
+		awk '{sub("Version:.*$$","Version: $(VERSION)"); print $0}' $${i} > $${i}.tmp && \
+		mv -f $${i}.tmp $${i} ; \
+	done
+default: dependencies core
+
+.DEFAULT_GOAL := default
 
 #
 # Core binaries
@@ -29,7 +41,7 @@ game_TARGET			= OpenRA.Game.exe
 game_KIND			= winexe
 game_DEPS			= $(fileformats_TARGET) 
 game_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll $(game_DEPS) \
-						thirdparty/Tao/Tao.OpenAl.dll thirdparty/Tao/Tao.FreeType.dll
+					thirdparty/Tao/Tao.OpenAl.dll thirdparty/SharpFont.dll
 game_FLAGS			= -win32icon:OpenRA.Game/OpenRA.ico
 PROGRAMS 			+= game
 game: $(game_TARGET)
@@ -81,8 +93,8 @@ STD_MOD_DEPS	= $(STD_MOD_LIBS) $(ralint_TARGET)
 mod_ra_SRCS			:= $(shell find OpenRA.Mods.RA/ -iname '*.cs')
 mod_ra_TARGET			= mods/ra/OpenRA.Mods.RA.dll
 mod_ra_KIND			= library
-mod_ra_DEPS			= $(STD_MOD_DEPS)
-mod_ra_LIBS			= $(COMMON_LIBS) $(STD_MOD_LIBS)
+mod_ra_DEPS			= $(STD_MOD_DEPS) $(utility_TARGET)
+mod_ra_LIBS			= $(COMMON_LIBS) $(STD_MOD_LIBS) $(utility_TARGET)
 mod_ra_EXTRA_CMDS		= mono --debug RALint.exe ra
 PROGRAMS 			+= mod_ra
 mod_ra: $(mod_ra_TARGET)
@@ -132,7 +144,6 @@ ralint_TARGET			= RALint.exe
 ralint_KIND			= exe
 ralint_DEPS			= $(fileformats_TARGET) $(game_TARGET)
 ralint_LIBS			= $(COMMON_LIBS) $(ralint_DEPS)
-ralint_EXTRA_CMDS		= cp thirdparty/FuzzyLogicLibrary.dll .
 PROGRAMS 			+= ralint
 ralint: $(ralint_TARGET)
 
@@ -205,6 +216,10 @@ INSTALL = install
 INSTALL_PROGRAM = $(INSTALL)
 CORE = fileformats rcg rgl rsdl rnull game editor utility tsbuild
 
+# Documentation (d2k depends on all mod libraries)
+docs:
+	@mono --debug OpenRA.Utility.exe --docs d2k > DOCUMENTATION.md
+
 install: all
 	@-echo "Installing OpenRA to $(INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)
@@ -247,6 +262,9 @@ install: all
 	@cp thirdparty/Tao/* $(INSTALL_DIR)
 	@$(INSTALL_PROGRAM) thirdparty/ICSharpCode.SharpZipLib.dll $(INSTALL_DIR)
 	@$(INSTALL_PROGRAM) thirdparty/FuzzyLogicLibrary.dll $(INSTALL_DIR)
+	@$(INSTALL_PROGRAM) thirdparty/SharpFont.dll $(INSTALL_DIR)
+	@cp thirdparty/SharpFont.dll.config $(INSTALL_DIR)
+	@$(INSTALL_PROGRAM) thirdparty/Mono.Nat.dll $(INSTALL_DIR)
 
 	@echo "#!/bin/sh" 				>  openra
 	@echo 'BINDIR=$$(dirname $$(readlink -f $$0))'	>> openra
@@ -266,6 +284,9 @@ install: all
 	@$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR)
 	@$(INSTALL_PROGRAM) -m +rx openra-editor $(BIN_INSTALL_DIR)
 
+	@-rm openra
+	@-rm openra-editor
+
 uninstall:
 	@-rm -r $(INSTALL_DIR)
 	@-rm $(DESTDIR)$(bindir)/openra

OpenRA.Editor/BrushTool.cs

@@ -104,7 +104,7 @@ void FloodFillWithBrush(Surface s, CPos pos)
 				}
 			}
 
-			/* todo: optimize */
+			/* TODO: optimize */
 			foreach (var ch in s.Chunks.Values) ch.Dispose();
 			s.Chunks.Clear();
 		}