Skip to content

Commit

Permalink
Merge branch 'bugfixes'
Browse files Browse the repository at this point in the history
* bugfixes:
  Only copy javascript doc if we build out of tree.
  Fix lassat firing too many times when clicking fast.
  Rename game debug messages to GAME_DEBUG_*.
  Synchronise enabling of debug mode.
  Remove legacy synch code.
  Update Vorbis to 1.3.3.
  In reference to 3e15039 bump the year in the mac files.
  Fix unit speeds.
  Fix ping times for clients. broken in 74261ad
  Add a A_O_R to prevent crashing on null pointer
  Unfortunately, the Project can't stop time, so bump the year.
  • Loading branch information
cybersphinx committed Feb 15, 2012
2 parents bb359a1 + f1fd685 commit d78970c
Show file tree
Hide file tree
Showing 575 changed files with 911 additions and 1,738 deletions.
4 changes: 2 additions & 2 deletions Makefile.am
Expand Up @@ -57,7 +57,7 @@ javascript-doc-base:
grep $(top_srcdir)/src/qtscript.cpp -e '//--' | sed 's/\/\/--//' > doc/functions.tex
grep $(top_srcdir)/src/qtscriptfuncs.cpp -e '//--' | sed 's/\/\/--//' >> doc/functions.tex
grep $(top_srcdir)/src/qtscriptfuncs.cpp -e '//;;' | sed 's/\/\/;;//' > doc/objects.tex
cp $(top_srcdir)/doc/javascript.tex doc/
test $(abs_top_srcdir) = $(abs_top_builddir) || cp $(top_srcdir)/doc/javascript.tex doc/

javascript-doc: javascript-doc-base
if PDFLATEX
Expand All @@ -68,7 +68,7 @@ endif

javascript-doc-html: javascript-doc-base
if HEVEA
(cd doc; hevea javascript.tex)
(cd doc; hevea javascript.tex; hevea javascript.tex)
if HACHA
(cd doc; hacha -o javascript-index.html javascript.html)
endif
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/button.cpp
Expand Up @@ -2,7 +2,7 @@
This file is part of Warzone 2100.
Copyright (C) 2009 Elio Gubser
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/button.h
Expand Up @@ -2,7 +2,7 @@
This file is part of Warzone 2100.
Copyright (C) 2009 Elio Gubser
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/clipboard.h
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/font.cpp
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/font.h
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/geom.cpp
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/geom.h
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/hBox.cpp
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/hBox.h
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/imageButton.cpp
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2009 Elio Gubser
Copyright (C) 2010 Warzone 2100 Project
Copyright (C) 2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/imageButton.h
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2009 Elio Gubser
Copyright (C) 2010 Warzone 2100 Project
Copyright (C) 2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/internal-cairo.h
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Giel van Schijndel
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/keycode.h
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/lua-wrap.h
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 1999-2004 Eidos Interactive
Copyright (C) 2005-2011 Warzone 2100 Project
Copyright (C) 2005-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/patternManager.cpp
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2009 Elio Gubser
Copyright (C) 2010 Warzone 2100 Project
Copyright (C) 2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/patternManager.h
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2009 Elio Gubser
Copyright (C) 2010 Warzone 2100 Project
Copyright (C) 2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/platform/sdl/clipboardWin32.c
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2010 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/platform/sdl/clipboardX11.c
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2010 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/platform/sdl/event.c
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2010 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/platform/sdl/event.h
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2010 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/platform/sdl/init.c
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2010 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/platform/sdl/init.h
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2010 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/platform/sdl/time.c
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2010 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/spacer.cpp
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/spacer.h
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/svgManager.cpp
Expand Up @@ -2,7 +2,7 @@
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008 Elio Gubser
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/svgManager.h
Expand Up @@ -2,7 +2,7 @@
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008 Elio Gubser
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/table.cpp
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/table.h
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/textEntry.cpp
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 1999-2004 Eidos Interactive
Copyright (C) 2005-2011 Warzone 2100 Project
Copyright (C) 2005-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/textEntry.h
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 1999-2004 Eidos Interactive
Copyright (C) 2005-2011 Warzone 2100 Project
Copyright (C) 2005-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/vector.cpp
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/vector.h
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/widget.cpp
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/widget.h
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/window.cpp
Expand Up @@ -2,7 +2,7 @@
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008 Elio Gubser
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/src/window.h
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/betawidget/tools/sdl-testapp.cpp
Expand Up @@ -2,7 +2,7 @@
This file is part of Warzone 2100.
Copyright (C) 2008 Freddie Witherden
Copyright (C) 2008 Giel van Schijndel
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/exceptionhandler/dumpinfo.cpp
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Giel van Schijndel
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/exceptionhandler/dumpinfo.h
@@ -1,7 +1,7 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2008 Giel van Schijndel
Copyright (C) 2008-2011 Warzone 2100 Project
Copyright (C) 2008-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/exceptionhandler/exceptionhandler.cpp
@@ -1,6 +1,6 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2007-2011 Warzone 2100 Project
Copyright (C) 2007-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion lib/exceptionhandler/exceptionhandler.h
@@ -1,6 +1,6 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2007-2011 Warzone 2100 Project
Copyright (C) 2007-2012 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down

0 comments on commit d78970c

Please sign in to comment.