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

8438 Commits (90bfae6480cec2e3290fbf299fc2fb264eb5da8d)

Author SHA1 Message Date
Buginator 90bfae6480 Fix endian issues, byte & packet counts for the logging. 
Info / modifications by Safety0ff & I

closes ticket:1936
2.3: r11065

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@11067 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:53 +02:00
Buginator ca5814a331 Add bounds checking to psStats to prevent bad pointers. 
Thanks to Crymson for the original patch, with modifications by Cybersphinx & Buginator.

Closes ticket:1903
2.3: r11059

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@11062 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:53 +02:00
Safety0ff 307ab84638 qt-trunk: Handle null return value from sound_CreateOggVorbisDecoder. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@11056 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:53 +02:00
Safety0ff 82db22f458 qt-trunk: Set tcp_socket to NULL after free'ing it. Fixes #1869. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@11053 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:53 +02:00
Christian Ohm 4b7d25145c In our assert macros, raise(SIGTRAP) instead of assert(). 
Also ignore SIGTRAP, so no crashdump will be generated for it. Makes it
possible to continue after an assert while debugging. Closes #1940.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@11045 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:53 +02:00
Christian Ohm a8b029d700 Remove the redundant avSetStatus(). 
It does exactly the same as setRevealStatus(), and was only called together
with war_SetFog(), which calls setRevealStatus() anyway.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@11039 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:53 +02:00
Christian Ohm ffaaaf3872 Include/declaration cleanup for src/frontend.c/h. 
Also rename the various GameOptionsX to what they actually do, e.g.
AudioOptions. Refs #1647.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@11038 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:53 +02:00
Buginator a5399a45f2 Fix showing the unit count in debug mode 
2.3: r11030


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@11033 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:53 +02:00
Buginator e5fe2a8ae3 Clean up getMultiStats() to remove unused parameter. 
2.3: r11017

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@11024 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:53 +02:00
Buginator 452fd55e68 Update sync timings to more reasonable values, especially for the score. 
2.3: r11016


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@11023 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:53 +02:00
Christian Ohm 02c8b519f5 Addition to the menu fixes. 
Add two places I missed before, and simplify the code a bit.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@11012 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:53 +02:00
Christian Ohm 2461a01484 Fix menu navigation. 
Always go back to the previous menu, also when pressing escape.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@11005 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:53 +02:00
Christian Ohm 792a98e824 Remove some dead code. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@11004 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:53 +02:00
Christian Ohm d6b18be68e Simplify CancelPressed(). 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@11003 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:52 +02:00
Christian Ohm 8e3ff07969 Initialize video and radar textures to black. 
Prevents random crap from being blended into the borders and shown for the
first video frame.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10985 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:52 +02:00
Christian Ohm f9e5517b67 Fit the fixed radar into the corner. 
The rotating radar needs space for rotation, and so position is calculated
using the longer side for non-square maps. The fixed radar doesn't need that
space, and so can be put snugly in the corner.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10982 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:52 +02:00
Christian Ohm be7e5ce951 Stylistic cleanup of plotStructurePreview16(). 
No real code changes. Rename sizeOfSaveStruture to sizeOfSaveStructure,
initialize it in the declaration (removes one else branch) and improve some
debug messages. Refs #1914.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10977 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:52 +02:00
Christian Ohm 15d3617223 Simplify plotStructurePreview16() further. 
All structure structs up to v19 are compatible with v2, and all newer ones with
v20, so handle only those two cases. Refs #1914.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10976 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:52 +02:00
Christian Ohm 56aaa5b895 Remove useless code from plotStructurePreview16(). 
All we care about are position and player of a structure, so we don't need to
endian-correct any other values. Refs #1914.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10975 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:52 +02:00
Christian Ohm cdeea60bf4 Russian translation update by Filipp Chertiev. 
Closes #1908.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10956 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:52 +02:00
Christian Ohm 08db02c6d4 Brazilian translation update by Tucalipe. 
Closes #1899.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10941 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:52 +02:00
Christian Ohm 78071fa294 Use whole screen for backdrops. 
Cut off some parts instead of showing black borders.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10939 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:52 +02:00
Christian Ohm b1ac31d5fd Always use linear filtering for backdrops. 
Makes them filtered again after showing the map preview.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10938 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:52 +02:00
Christian Ohm 87ac6bba6b Show backdrops with correct aspect ratio. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10937 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:52 +02:00
Christian Ohm e8deaceca6 Show videos with correct aspect ratio. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10936 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:52 +02:00
Christian Ohm e4805ee8d7 Update libraries for the Windows cross-build. 
Dejavu Fonts: 2.31
freetype: 2.3.12
gettext: 0.18.1
libogg: 1.2.0
libpng: 1.2.42
libvorbis: 1.3.1
zlib: 1.2.5

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10935 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:51 +02:00
Christian Ohm ef25620a44 Remove some popt residue that broke make distcheck. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10934 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:51 +02:00
Christian Ohm 23c5e53481 Updated Russian translation by Filipp Chertiev. 
Closes #1902.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10933 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:51 +02:00
dak180 0d6058f869 Upgrade gettext to 18.1. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10928 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:51 +02:00
dak180 186964d5f7 Update the .strings files to a more standardized format. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10918 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:51 +02:00
Christian Ohm 418bebf42f Updated Croatian translation by MetalWarrior95. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10914 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:51 +02:00
Christian Ohm a40a769eb5 Add track3.ogg to the NSIS installer. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10909 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:51 +02:00
Christian Ohm b6efa95a08 Add track3.ogg to Makefile.am. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10906 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:50 +02:00
Christian Ohm 08ebe2e780 Add the Playstation music track. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10904 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:50 +02:00
Christian Ohm 0b1cf62050 Put date/time in screenshot file names. 
The new format is "wz2100-YYYYMMDD_HHMMSS-mapname[-x]", where the "-x" part is
only added when the file already exists (should only happen when people time
travel or hammer F10). Refs #1890.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10903 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:50 +02:00
Christian Ohm bcef5a3f5d Fix two typos in the Brazilian translation. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10899 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:50 +02:00
Christian Ohm 79370f0721 Polish translation update by Emdek. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10898 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:50 +02:00
Christian Ohm 3d6fc334d4 Make it possible to add short descriptions to challenges. 
This adds an optional "description" entry to the [challenge] section of a
challenge's ini file which is shown in the tooltip.

Original patch from #1805, slightly modified by me.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10897 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:50 +02:00
Christian Ohm 732c0b70a1 Shut up compiler warnings. 
No idea how those variables could ever be used uninitialized, but gcc complains
about it.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10896 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:50 +02:00
Christian Ohm b8e6d46263 Improved map preview. 
Removes the need for FBOs, shows the map undistorted, unblurred and as large as
possible. Refs #1873.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10895 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:50 +02:00
dak180 7250a95c6b Make the copy data script work with 10.5. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10892 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:49 +02:00
dak180 8cb4ea561b Update the Qt libs in the mac build to 4.6.2. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10877 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:49 +02:00
Per Inge Mathisen 2823c0f5f9 qt branch: Revert r10874 fixes ticket:1876 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10875 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:49 +02:00
Per Inge Mathisen 3a43d6f378 qt branch: Automatically pick up moc'ed files declared in MOCHEADER for compilation. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10874 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:49 +02:00
dak180 8e072b4e27 Add QuesoGLC back to the mac build. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10870 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:49 +02:00
Per Inge Mathisen c1bcad22dc qt branch: Remove ugly hacks needed for Qt text drawing that made qt branch slower than trunk. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10869 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:49 +02:00
Per Inge Mathisen 9e29aa5210 qt branch: Bring back quesoglc for text drawing for now. We can then spend some more time 
perfecting the Qt-based text drawing without the stress of not being able to merge this branch.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10868 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:49 +02:00
dak180 3e3cc64aff Update libpng to 1.4.2 and upgrade warnings to force rebuilds. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10867 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:49 +02:00
Buginator 3fb8c3605b Fix variable conflicts with MSVC include files. 
Make *sure* Qt includes are before wz includes.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10855 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:49 +02:00
Buginator 840c77d13c Fix headers conflicts (for windows + MSVC) 
Move gettimeofday() from frame.c to timer.c (for windows)

Make sure we include the platform specific include before the others. (so we can correctly use WZ_OS_XXX and so on...)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10854 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:49 +02:00