Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,363 Commits
1 Branch
0 Tags
544 MiB
Commit Graph

188 Commits (e1f78ed5fba94a216d9c1e7a3bbe35f4d2afddf2)

Author SHA1 Message Date
dak180 c68c95c456 If it is both a git and a hg repo prefer git. 
Fixes #2672.
 2011-04-27 02:47:02 -04:00
Buginator a057842722 Remove unused project file. 2011-03-25 23:44:57 -04:00
Buginator 518681e770 autorevision ... with some perl love 2011-03-17 21:35:01 -04:00
Buginator 5cfd2e9dbe Initial VS2k10 changes. 
VS2k5 (no longer supported with platform SDK)& VS2k8 are NOT supported anymore.
Redo other aspects as well in preparation of moving libs out of the main codebase.
NOTE: You *must* have msysgit installed, and it should be in your system path,
or you can modify the local property sheet to point to it.
This is needed to generate the autorevision.h file, (that fix is next)
 2011-03-17 21:35:00 -04:00
Cyp 7663966206 Change old-git warning message a bit. 
Final formulation of warning message thanks to input from cybersphinx, dak180 and Kreuvf (in alphabetical order).
 2011-03-16 19:23:15 +01:00
dak180 dde0d33f00 Raise a warning when working with an outdated version of git and attempt to work around it's limitations. 
Closes #2536.
 2011-03-16 10:47:53 -04:00
dak180 add956d337 Use the autorevision script instead of the program. 
Refs #2401.
 2011-03-06 20:24:04 -05:00
cybersphinx 6d7572131e Make the shell and C++ autorevision output the same. 2011-03-07 01:30:45 +01:00
cybersphinx 0af9d47a34 Call autorevision.sh instead of compiling and running the C++ autorevision. 2011-03-07 01:18:18 +01:00
cybersphinx 1d358beb19 Move _cstr creation into version.cpp. 2011-03-07 01:04:52 +01:00
cybersphinx 3490bf21d7 Make autorevision only output the things we actually need. 2011-03-07 00:24:25 +01:00
cybersphinx 784fe5f629 Always use static strings in autorevision.h. 2011-03-06 19:31:14 +01:00
cybersphinx a30a8d21ce Replace svn with vcs. 2011-03-06 19:23:33 +01:00
cybersphinx d2eb159216 Get rid of the SVN_WC_SWITCHED stuff. 2011-03-06 18:57:12 +01:00
cybersphinx 809d0ac456 Get rid of the SVN_LOW_REV stuff. 2011-03-06 18:46:38 +01:00
cybersphinx dd4391990d Get rid of a few unnecessary Makefile.ams. 2010-12-11 16:41:57 +01:00
cybersphinx f378c9eb2d Move download.pl from build_tools to win32. 2010-12-11 16:21:08 +01:00
buginator c617bfd26c MSVC only change, using STLport to bypass the severe performance 
hits with MSVC's STL code.

The change does *not* break MS's STL usage, so you can freely swap
between both of them.

When adding STL functions, it is best you use MS's STL for the extra
debugging code they throw in, it actually does catch some errors.
Once you don't need the extra debugging code, then I use STLport, since
MS's STL code can't disable all the checks, and it has a huge performance
hit.
 2010-12-05 13:59:40 -05:00
cybersphinx 24f204863c Update changelog formatting script for git commit hashes. 
sed magic by Kreuvf.
 2010-11-07 19:15:28 +01:00
Cyp 4c28815937 Add defaults to autorevision.cpp for when not in a git repository. 2010-11-01 19:16:18 +01:00
Cyp 3f5176be49 Fix "(modified locally)". 
Was hard to see it was broken, since the po/ directory keeps getting modified, so "(modified locally)" is often correct.
 2010-11-01 13:34:07 +01:00
Cyp 242fa66dd9 Add fallback to -42, if git rev-list doesn't support --count. 
The --count option was introduced in f69c501832ecd6880602c55565508e70c3a013d5 in git v1.7.2-rc1.
 2010-10-28 16:44:07 +02:00
Cyp 0ee3a2147b Add version stuff for mac, and shorten version display in-game to a 7 char hash. 2010-10-27 19:43:18 +02:00
Cyp ef4b894202 Make autorevision.cpp print Git commit SHA1s. 2010-10-07 14:40:12 +02:00
Buginator edb644a03b Fix (and add missing) headers to files. 
2009  Warzone Resurrection Project -> 2010  Warzone 2100 Project

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11298 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-28 18:58:33 +02:00
Christian Ohm cf8976e36e Improve the changelog script. 
Change all items to [*], and enclose them in list tags. Just one thing needs to
be done manually, moving the "[/list]" tag at the beginning to the end.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10968 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-13 11:24:14 +02:00
Per Inge Mathisen a7e9da6ed5 Revert r10627 since it turned out to be not quite purely cosmetic after all 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10640 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-19 12:52:42 +02:00
Steven Koenig 78ff8a4d1c ChangeLog2BBCode Converter script now 
* uses /bin/sh instead of /bin/bash,
 * uses -r (GNU extension, tell me, if we do not want this!) so we have less backslashes,
 * uses | as a separator now, so / does not need to be escaped,
 * does not escape characters that do not need to be escaped (spaces) and therefore
 * has an overall improved readability.
There should not be any changes to the behaviour/actions of sed, it is a purely cosmetic commit.



git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10627 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-18 20:21:18 +02:00
Per Inge Mathisen c29aa0836e First version of a changelog-to-bbcode conversion script. Pipe a portion of the changelog through to get bbcode. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10622 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-18 20:21:18 +02:00
Christian Ohm b0c4e40934 Include files needed for win32 cross-building. 
Building from tarball still doesn't work, since nsis wants the gmo files in the
build dir while they are in the source dir.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9146 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:04:34 +01:00
Giel van Schijndel 115d2bfd2c Windows cross compilation scripts 
* redo the cross compilation script in such a way that it'll also automatically fetch (wget) and build the dependencies
  - Currently only building of popt, gettext, zlib and png is implemented

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8821 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-01-30 20:26:55 +01:00
Christian Ohm 55f12a5d52 Hurd build fixes. 
Closes #969.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8706 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-01-30 20:26:44 +01:00
Buginator efce1fc4cb Get rid of the code-generators that was used for the SQL stuff. 
(r8367)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8484 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 20:11:00 +01:00
Christian Ohm 553fca0df7 Put autorevision.h into builddir, not srcdir. 
Contrary to 2.2, "make distcheck" doesn't work yet, since some files in
tools/map that tests/maptest.c needs are not packaged in the tarball.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8361 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:56 +01:00
Per Inge Mathisen b29e9eeba1 Fix compile error on *BSD systems. Closes ticket:820, patch by brad@comstyle.com 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8016 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:07:10 +02:00
Giel van Schijndel 8f7322f717 Improve buildsystem for cross compiling 
* Make sure to pass CXXFLAGS to ./configure as well
 * Allow for overriding of CFLAGS and CXXFLAGS when building for the building system
  - CFLAGS_FOR_BUILD
  - CXXFLAGS_FOR_BUILD

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7283 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 22:29:34 +02:00
Gerard Krol 71bc279c9e Fix some spelling errors in debug messages and comments. Patch by Paul Wise <pabs3>. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6832 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-11 11:51:40 +00:00
Per Inge Mathisen 42d5809ae5 Move the RPM spec file where it belongs 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6800 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-07 20:46:49 +00:00
Per Inge Mathisen 0fc9820f4a Add RPM spec file for building Warzone. Tested on Fedora 10. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6791 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-07 17:21:18 +00:00
Giel van Schijndel ab5e599100 Don't use the deprecated git-$command interface anymore, instead use "git $command" 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6707 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-02-22 23:42:07 +00:00
Giel van Schijndel 6e1d019403 * Update SQLite stats database 
* Fix loading of stats from the SQLite database (utilised in the campaign)

This fixes #276 and #269.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6670 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-02-21 21:09:37 +00:00
Giel van Schijndel 4d150cfcc8 Remove testing code which is no longer needed (because src/stats-db2.* serves the same purpose now) 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6650 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-02-15 13:05:19 +00:00
Giel van Schijndel d862f39362 Don't add a separating comma if we've already printed the last column definition 
This was done when we'd have a C-only-field.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6649 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-02-15 12:46:45 +00:00
Giel van Schijndel 57de43c140 * Generate CREATE VIEW statements in the SQL schema 
* Use these VIEWs instead of rather complicated SELECT statements in the C SQLite loading code

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6646 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-02-15 12:32:29 +00:00
Dennis Schridde aac41748dc Bump copyright 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6617 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-02-10 18:01:48 +00:00
Giel van Schijndel 1f4e369cf2 * Add a new struct-level qualifier: %csv-field-override 
- This qualifier allows overriding of CSV field numbers given in base classes
  - This is required for the WEAPON stats because it differs from most other stats in that it doesn't have the "designable" field as the last CSV field
 * Specify all CSV field numbers for the fields in struct WEAPON
 * Generate SQL INSERT statements from weapons.txt


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6553 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-01-22 22:18:48 +00:00
Giel van Schijndel 3d92823e49 * Use the more readable $arrayreference->[$index] and $hashreference->{$key} instead of ${$arrayreference}[$index] and ${$hashreference}{$key} respectively 
* Use 'my $var = $expression || "";' instead of 'my $var = ""; $var = $expression if $expression;'

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6366 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-11-23 13:32:02 +00:00
Giel van Schijndel 8f6eb3c17c Use || as shortcut operator (I used "or" before, which didn't work as expected due to having a too low precedence) in assignment to $valprefix and $valsuffix to circumvent having to test explicitly whether they exist 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6365 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-11-23 00:18:12 +00:00
Giel van Schijndel d11d2411bd * Prevent writing to regex-capture variables, e.g. \$1 
- Use a temporary variable instead


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6346 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-11-17 08:51:07 +00:00
Giel van Schijndel fb91a247d5 Handle C-only-fields properly when they're at the end of a struct 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6341 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-11-16 17:43:32 +00:00