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

8424 Commits (8e3ff07969890e0bcdd1e81cb5d63ceef1721719)

Author SHA1 Message Date
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
Buginator 079b8766a6 Add missing cursors (to prevent crashes), and rearrange them to match what is in intfac.img for easier referencing. 
FIX ME:  Some cursors are using the wrong names / not defined ?

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10852 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:49 +02:00
Buginator 6ed22b4d3c Frontport the changes for the logging & exception handler (for mingw) & adding mod info into the crash reports from 2.3 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10849 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:49 +02:00
Buginator a272af39bf Fix mac keymap display. 
Mac's normally use symbols, and not text, for modifier keys, and Qt doesn't have "text" names for the symbols.
 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10848 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:49 +02:00
Buginator 5b390693db Add a routine to ignore -psn_* (ProcessSerialNumber) for macs. 
Unsure if we will ever use this for anything, so, for now, we just ignore it.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10847 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:49 +02:00
Buginator c238cb89ea remove the temp mac hack r10815 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10846 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:48 +02:00
dak180 a9d8c1ee98 Update the build mac build doc for Qt. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10838 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:48 +02:00
dak180 048f1a8e3c Update the xcode project into a working state. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10837 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:48 +02:00
Buginator 25b94eac78 add filter for hg 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10836 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:48 +02:00
Buginator 70f136a1a4 make -Cpo update-po 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10835 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:48 +02:00
Buginator 0064e7151b Get rid of scrap.c/h, no longer needed. 
Noticed by dak180


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10834 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:47 +02:00
Per Inge Mathisen 0d46316a63 qt branch: Add rudimentary Qt crash handler dialog for non-mac, non-windows builds. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10832 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:47 +02:00
Per Inge Mathisen dddb958e3f qt branch: Fix fatal dialog multiplication due to multiple invokations of paintGL while dialog is open. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10831 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:47 +02:00
Per Inge Mathisen 1a5df98e9f Fix clobbered merging in wzapp_c.h, and add Qt function to throw up a fatal warning dialog. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10830 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:47 +02:00
Buginator 0b2b4f70af Add svn properties for line style. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10829 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:47 +02:00