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

2463 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
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 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 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 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 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
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
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
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 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 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
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
Buginator e84631aa80 Add another missed file. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10826 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:46 +02:00
Buginator 9094f32914 Update a missing file 
Try to fix configure.ac

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10825 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:46 +02:00
Buginator 0cf96267e6 MSVC fixes. 
*NOTE* You *must* get the Qt: Framework, or Qt SDK, and set it up correctly!


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10824 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:46 +02:00
Buginator b003b2d669 Apply r10807 
"qt branch: Merge in r10381 from trunk to improve state machinery handling in terrain drawing code."


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10823 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:45 +02:00
Buginator 1316841b9f Apply r10806 
"qt branch: Fix conflicts between Qt text drawing and our internal state machinery. Menus should work now."


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10820 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:45 +02:00
Buginator 732e212cfb Apply r10805 
"qt branch: Remove superfluous pie_SetTranslucencyMode()"


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10819 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:45 +02:00
Buginator 7f5030dcc3 Apply r10804 
"qt branch: Move pie_SetRendMode() around. Make pie_SetTranslucencyMode() static."


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10818 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:45 +02:00
Buginator d9b06f4546 Apply r10801 
"qt branch: Fix handling of custom textures for backdrops without our internal state machine getting all confused."


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10816 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:44 +02:00
Buginator 10c42fbef0 For macs, make it so ctrl = ctrl and not ctrl = cmd to match other platforms, and to keep keymap sane. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10815 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:44 +02:00
Buginator 60da45798d Fix wzapp.cpp correctly (svn did a double merge on a new file) 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10814 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:44 +02:00
Buginator e65f2688e7 Stage two merge. 
Add new files for Qt.
Remove old files
Update build system (linux).
Remove SDL.
Remove QuesoGLC.
Remove Fontconfig & other all dependencies it had.  

CC & mingw (windows) & MSVC build systems are *NOT* updated / working yet.

**NOTE** MSVC people check types.h, "bool" != "BOOL" ! "bool" is a byte, "BOOL" is a int.

r8503 - r10787 (from  Qt branch)


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10813 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:44 +02:00
Buginator a78f262ffa Stage one merge. 
Adding __cplusplus header guards that were missing



git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10811 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 21:10:43 +02:00
Guangcong Luo edea97a633 Make double-click interval game-speed independent (patch idea by Safety0ff) 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10735 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-28 07:52:20 +02:00
Christian Ohm ccd4264005 Enhanced GLee detection. 
Since the pkg-config script Debian ships is a custom addition, test for GLee
manually as well.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10731 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-28 07:52:19 +02:00
Guangcong Luo 4282d92b3c Add "SCOUT" and "DISEMBARK" cursors. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10726 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-28 07:52:17 +02:00
Per Inge Mathisen e7c22ecc5c Put miniupnpc and iniparser license files into dist tarball 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10713 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-25 21:24:57 +02:00
Christian Ohm 5f43907ac7 Only use our integrated GLee header when needed. 
Fixes building with the integrated GLee removed.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10701 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-24 19:29:21 +02:00
Christian Ohm 13c78bf714 If setting the chosen fullscreen video mode fails, retry in windowed mode. 
This should help in cases where the set video mode isn't supported in
fullscreen. Includes a bit of stylistic cleanup in screenInitialize, and
demotes the bpp warning to info instead of error.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10634 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-19 12:52:42 +02:00
Buginator 96bb80b314 Prevent the host from kicking themselves. 
Prevent someone trying to kick the host, and kick them instead.

Thanks to effigy for the info
2.3: r10629 /r10630

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10633 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-19 12:52:41 +02:00
Buginator b33a761f9a Only concatenate the mod list to the version string when the client receives the version string from the host. 
2.3:r10952

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10593 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-16 14:21:39 +02:00
Buginator 1d47645d07 Don't broadcast to other players about a new player in NET_CreatePlayer(), we will only do NETBroadcastPlayerInfo() when a player has passed all the verification steps. 
This fixes ticket:1611

Correctly handle rejection of the verification process as well.

2.3:r10572

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10583 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-15 11:30:07 +02:00
Buginator 71a9f27b40 Clear the IP Ban list when you start to host the game, instead of when you shut down warzone. 
Reset numBans back to 0 on list creation.

2.3:r10543

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10582 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-15 11:30:06 +02:00
Buginator 321bcc3505 Add some more netplay logging calls 
2.3:r10542

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10581 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-15 11:30:06 +02:00
Buginator dd0ed35548 Add more logging data to our netplay logs. 
2.3:r10484

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10579 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-15 11:30:06 +02:00