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

2668 Commits (acf2d44f591373ba0094cd11fbcb040adbc7369e)

Author SHA1 Message Date
Safety0ff 8f55883a61 Remove SDL_swap* usage. 
Closes #1937.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11482 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-15 20:46:41 +02:00
Cyp 15d7243c5f Make the warn_unused_result warning squelch compile on distros where the fwrite is already in an if (fwrite()) {}. 2010-08-15 13:15:04 +02:00
Cyp 438a4d5aff Enable warnings, make warnings consistent, fix some warnings, use -Wno-error=squeak to allow squeaky warnings to compile without squelching them. 2010-08-15 12:30:46 +02:00
Buginator 26fa2b06f9 Change back to "trunk" form newnet. (less confusion) 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11470 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-15 00:10:52 +02:00
Cyp 0c2015425c Merge remote branch 'origin/newnet' 
Conflicts:
	lib/gamelib/gtime.c
	lib/gamelib/gtime.h
	lib/netplay/netplay.c

Closes ticket:1573. Closes ticket:805. Probably fixes 100 more issues.
 2010-08-14 22:34:30 +02:00
Per Inge Mathisen 57299dc208 Remove all float usage from logical fps calculations. Patch reviewed by Cyp. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11462 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-14 22:08:32 +02:00
Cyp d13fbd9dbc Squelch warnings. (Need a way of doing optimised builds, but still with -Werror...) 2010-08-14 14:16:08 +02:00
Per Inge Mathisen a34997239a Fixes for game elements improperly being dependent on logical fps. Camera animation. 
Water animation. Weather animations. Replaced all usages of the generic timeAdjustedIncrement
with proper gameTimeAdjustedIncrement or graphicsTimeAdjustedIncrement as appropriate.
See ticket:2083 for more info. Patch reviewed by Cyp.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11457 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-14 14:10:34 +02:00
Cyp 7d5f1271a9 Merge remote branch 'origin/master' into newnet 
Conflicts:
	.gitignore
	lib/iniparser/Makefile.am
	macosx/Resources/wzlocal/pt_BR.lproj/InfoPlist.strings
 2010-08-14 11:26:09 +02:00
Cyp fcd0b6fe46 Print "Oldname → Newname" instead of "Oldname: -> Newname". 2010-08-14 09:58:36 +02:00
Cyp 18307a7fc1 Eschew ventriloquism assiduously. 2010-08-14 09:57:45 +02:00
Christian Ohm fe59e98943 Add Slovak translation by Koapa. 
Closes #2036.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11418 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-11 00:04:10 +02:00
Christian Ohm fab89b8ab4 Don't crash in socketAccept when given a NULL socket. 
Closes #2033.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11405 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-09 09:14:50 +02:00
Christian Ohm 4eb49a39d1 Add Korean translation by urgood2. 
Closes #2035, #2055.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11395 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-09 09:14:49 +02:00
Giel van Schijndel 94320034ae Assume that SDL headers are directly in the #include path, instead of assuming the SDL directory is in the #include path. 
Closes #1941.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11385 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-05 20:05:02 +02:00
Safety0ff 1fa5ab201d Apply patch from #1944 (vorbis error strings). 
Closes #1944.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11384 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-05 20:05:02 +02:00
Safety0ff dec83d8065 Apply patch #1982. 
Removes Vector3i_normalise and return int32_t instead of float for Vector3i_Length.
Closes #1982.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11383 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-05 17:48:53 +02:00
Cyp dd47d1f8c2 newnet: Insist harder on detecting and displaying desynchs. 2010-08-02 14:22:10 +02:00
Cyp d5b3621844 Merge branch 'master' into newnet 
Conflicts:
	lib/netplay/netplay.c
	src/multiint.c
 2010-08-01 21:10:34 +02:00
Cyp 7c8df3a2e8 Merge remote branch 'origin/master' into newnet 
Conflicts:
	lib/framework/wzapp_c.h
	src/power.c
	src/power.h
 2010-08-01 20:41:45 +02:00
Cyp 82ad8abd8f When a player drops from the joining menu, clients should remove the dropped player, and not decide whether to randomly quit based on whatever was on the stack, either. (Forward-port from 2.3.) 2010-08-01 19:41:07 +02:00
Cyp da7ff2f37f Don't allow inconsistent player positions or colours, even momentarily. (Forward-port from 2.3.) 
On swapping places or colours, sends a NET_PLAYER_INFO containing both players, instead of two separate NET_PLAYER_INFOs.
 2010-08-01 19:40:12 +02:00
Cyp 466943b783 Don't use floating point calculations in power code. 2010-08-01 18:38:11 +02:00
Cyp 7874dc608c Clean up thread-related #defines. (Backport from newnet.) 2010-08-01 15:23:06 +02:00
Cyp 2e01e81da6 newnet: Show relevant players next to connection status icons. 2010-08-01 13:06:50 +02:00
Cyp b59b089ca5 Merge remote branch 'origin/master' into newnet 
Conflicts:
	lib/netplay/nettypes.c
	src/multibot.c
 2010-07-30 22:51:33 +02:00
Cyp ea690beab7 newnet: Fix maximum latency calculation, don't return 1 second unconditionally. 2010-07-29 23:30:16 +02:00
Guangcong Luo da445cd536 Make some text alignment fixes that got left out of r11230. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11301 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-28 18:58:33 +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
Cyp 1db4f15973 Change do-while to while, since it doesn't make sense to try to read a game structure when there are none in the lobby. 2010-07-22 19:19:53 +02:00
Cyp 1b811abcea Before receiving game list from server, clear old games from list, and don't receive more than there are room for in the array. 2010-07-22 14:45:49 +02:00
Christian Ohm bf3006d31c Make sure we use at least 640x480. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11248 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-22 09:34:22 +02:00
Cyp 1a39299572 Merge remote branch 'origin/master' into newnet 
Conflicts:
	macosx/Warzone.xcodeproj/project.pbxproj
 2010-07-20 23:07:26 +02:00
Cyp e246e6006e newnet: Save a few more bytes. 2010-07-20 15:40:07 +02:00
Cyp f5fe36414a newnet: Save a few bytes. 2010-07-19 18:42:19 +02:00
Guangcong Luo 2dcb53d326 Fix bug #1994 and apply patch #1998 - Change Mac OS X to use DejaVu Sans like in Windows/Linux, which fixes problems with text alignment. refs #1994, closes #1998 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11230 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-19 10:58:59 +02:00
Cyp 6a36cdd6ec newnet: Use MAX instead of MIN when computing required latency, since the host will vote half of everyone else. 
Not sure what to do in the case that a computer is too slow.
 2010-07-17 23:42:39 +02:00
Cyp 212115faed newnet: Delay writing NET_SHARE_GAME_QUEUE until flush. 2010-07-17 11:49:55 +02:00
Cyp ee1ae86ea7 newnet: Use Z_PARTIAL_FLUSH instead of Z_SYNC_FLUSH to save a few bytes. 
They do the same thing, except that Z_SYNC_FLUSH adds a bit of useless padding.
 2010-07-17 02:01:08 +02:00
Cyp b704a741bf newnet: Don't poll sockets, if there is already data ready in the socket decompression state. 
Should avoid freezing with everyone waiting for players.
 2010-07-17 01:00:55 +02:00
Cyp c1ca4d2d34 newnet: Don't send lots of small packets, fix "connection error"s when listing games. 
Since there is no advantage in sending data more than once per game tick, queue up data until the game time ticks. This may result in sligtly better compression in some cases, due to not flushing non-stop.
Don't close a socket while data is queued to be sent, since this sometimes breaks listing games (where the list is queued, and the socket is closed).
 2010-07-16 21:46:00 +02:00
Cyp 8e93542537 newnet: Don't assume disconnect when no data results from decompressing, unless really disconnected. 2010-07-16 18:02:37 +02:00
Cyp 23cbd537f7 Merge remote branch 'origin/master' into newnet 
Conflicts:
	configure.ac
 2010-07-16 18:01:22 +02:00
Guangcong Luo 09d73b0ba5 Apply patch #2003 - Add option for rotating with middle mouse button (LMB+RMB also works). refs #2003 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11212 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-16 03:54:27 +02:00
Guangcong Luo f367bc1d4f Make text line up better - most text now fits in the text box containing it. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11204 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-14 19:58:33 +02:00
Cyp cd274fcc3e newnet: Add mysterious (char *) cast to fix windows build. 2010-07-14 00:36:59 +02:00
Cyp 695a2b35ae Merge remote branch 'origin/master' into newnet 
Conflicts:
	lib/netplay/netplay.c
 2010-07-13 20:50:37 +02:00
Cyp 9b04e261c6 newnet: Use zlib compression on sockets. Should save a few bytes. 2010-07-13 16:15:53 +02:00
Buginator 6239cbaf46 Bump revision number for netcode, since the addition of r11182 (the map) it would fubar if all clients are not the same, and host was using said map. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11185 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-13 11:30:56 +02:00
Buginator 096c257052 Commit these project settings defines to disable extra checking which causes a huge performance hit. (VS2k8 was already committed in r9639, this was forgotten.) 
_HAS_ITERATOR_DEBUGGING=0
http://msdn.microsoft.com/en-us/library/aa985939(VS.80).aspx
_SECURE_SCL=0
http://msdn.microsoft.com/en-us/library/aa985896(VS.80).aspx
For more info on checked iterators see:
http://msdn.microsoft.com/en-us/library/aa985965(v=VS.80).aspx
and
http://msdn.microsoft.com/en-us/library/aa985982(v=VS.80).aspx


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11184 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-13 11:30:56 +02:00
Cyp b9a051150b newnet: Clean up thread-related #defines. 2010-07-12 17:57:35 +02:00
Cyp 4d522c1d06 Merge remote branch 'origin/master' into newnet 
Conflicts:
	lib/gamelib/gtime.h
 2010-07-12 08:06:39 +02:00
Christian Ohm 6514240f25 Don't translate language names. 
Closes #1779. Patch slightly modified to use language names from the
translations where available, and moved the defines into the .c file, since
they're only used there.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11155 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-11 21:17:36 +02:00
Buginator 208ba52334 Add C++ header guards 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11153 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-11 21:17:35 +02:00
Buginator 0dca1b06a1 Prevent overlapping sounds when looking at intel information. 
fixes ticket:60

2.3:r11147

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11148 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-11 21:17:35 +02:00
Cyp ef3c1b6d1d Use sqrtl instead of sqrt, on 32-bit platforms, to work around weird compilers. 
On some compilers, sqrt() seems to have somehow been taking 64-bit doubles and returning 80-bit doubles, breaking expected rounding behaviour.
 2010-07-10 19:25:15 +02:00
Cyp c28316c5c7 newnet: Don't bother sending synch messages unless actually out of synch. 
If it ain't broke, don't use up bandwidth trying to fix it.
 2010-07-10 18:08:06 +02:00
Cyp f0beca71cc Merge remote branch 'origin/master' into newnet 
Conflicts:
	lib/netplay/netlog.c
	lib/netplay/netlog.h
	lib/netplay/netplay.c
	macosx/Warzone.xcodeproj/project.pbxproj
	macosx/configs/Warzone-All.xcconfig
	macosx/configs/Warzone-Debug.xcconfig
	src/multijoin.c
 2010-07-10 17:02:39 +02:00
Cyp a8558300c2 newnet: Remove GAME_GROUPORDER, use GAME_DROIDINFO instead. 
Since GAME_DROIDINFO groups orders now, anyway. Removes ~200 lines code duplication.
 2010-07-10 16:56:09 +02:00
Cyp d3782834c7 newnet: Move logic in NETuint32_tSmall to the right place. 
And add NETint32_tSmall, in case needed.
 2010-07-10 16:56:09 +02:00
Buginator 1941064f77 Re-enable client packet logging 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11108 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-10 10:38:38 +02:00
dak180 a658e90d16 Get rid of VORBIS_NEEDS_HACK on the theory that less hacks are better. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11102 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-06 07:17:42 +02:00
Cyp e41848767d newnet: Check return value of asprintf. 2010-07-05 23:14:41 +02:00
Cyp f7e1a91761 newnet: Group droid orders, efficiently encode small numbers. 2010-07-05 13:17:36 +02:00
Cyp 3505c31c0e newnet: Rename multibot.c -> multibot.cpp. 2010-07-02 09:30:59 +02:00
Christian Ohm 03a75906cd Save screenshots as JPG and PNG. 
lib/ivis_common/jpeg_encoder.c/h is the JPEG encoder from
http://blog.frankvh.com/2009/06/09/blackfin-fast-jpeg-encoding/ (GPL v2+),
cleaned up to be C only. Refs #23.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11086 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-02 08:31:36 +02:00
Christian Ohm fe7b1960a2 Make the fixed radar unblurred at full zoom steps. 
Also increase radar zoom range to 0.5-4x. Refs #1923.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11085 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-02 08:31:36 +02:00
Freddie Witherden 8634850fba Remove the duplicated doc-blocks from the dictionary type source. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11078 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-29 07:37:57 +02:00
Christian Ohm a48d3d2198 Fix Windows cross-builds. 
That also hasn't SIGTRAP, so use WZ_OS_WIN instead of _MSC_VER to decide if we
use raise(SIGTRAP) or assert().

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11070 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-29 07:37:57 +02:00
Buginator b4ae06db77 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/trunk@11066 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-28 08:20:53 +02:00
Per Inge Mathisen d72187515d Fix two reversed htons/ntohs, from ticket:1937 by Safety0ff 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11064 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-28 08:20:52 +02:00
Freddie Witherden 84f0b430f4 Enhance the iniparser code adding support for setting integers. 
This closes ticket #1948.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11060 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-27 21:29:20 +02:00
Safety0ff 204cd2df91 2.3: Handle null return value from sound_CreateOggVorbisDecoder. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11055 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-27 07:49:21 +02:00
Safety0ff 301c6114e7 Trunk: Set tcp_socket to NULL after free'ing it. Fixes #1869. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11052 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-27 07:49:21 +02:00
Buginator 8bfd8e33e9 Add a new macro, wz_assert() to fix the ASSERT_FAILURE() macro to work again on MSVC compilers. 
refs ticket:1940

2.3: r11049


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11050 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-27 07:49:21 +02:00
Christian Ohm 3c02124171 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/trunk@11046 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-26 22:43:34 +02:00
Cyp 0b0e986ec6 Merge remote branch 'origin/master' into newnet 
Conflicts:
	lib/gamelib/gtime.c
	lib/netplay/netplay.c
	macosx/Warzone.xcodeproj/project.pbxproj
	src/multiint.c
	src/multisync.c
 2010-06-26 22:42:44 +02:00
Per Inge Mathisen 5c654430d4 Final pass closing ticket:1651 remove floating point move precision, turning speed 
from float to int. Now all that remains is float in contentious code that need to
be rewritten anyway.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11044 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-26 21:35:47 +02:00
dak180 1e236efdb6 Add clang and LLVM to the list of compilers. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11036 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-26 19:50:22 +02:00
dak180 6daf4464de Make sure that 64bit incompatible code only is used when we are 32bit. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11035 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-26 19:50:22 +02:00
Per Inge Mathisen 13c3a3020b Use system provided versions of ntohs, ntohl, htons, and htonl, since they actually 
work for the big-endian to big-endian case, whereas our own home-brewed one did not.
Patch reviewed by SafetyOff and Zarel.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11002 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-22 13:43:31 +02:00
Cyp b553072b90 Merge fpath improved threading from newnet branch. 2010-06-17 19:04:11 +02:00
Cyp 692957ee70 Merge CRC from newnet branch (was supposed to be in previous commit). 2010-06-17 18:35:37 +02:00
Cyp 48c8d42245 Merge trig+CRC changes from newnet branch (all of lib/framework). 2010-06-17 18:32:54 +02:00
Christian Ohm fba040f3e8 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/trunk@10986 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-17 07:52:15 +02:00
Cyp d7db005f71 Merge remote branch 'origin/master' into newnet 
Conflicts:
	.gitignore
	configure.ac
	data/base/images/intfac.img
	data/base/images/intfac5.png
	lib/netplay/makefile.win32
	lib/netplay/netlog.c
	lib/netplay/netplay.c
	lib/netplay/netplay.h
	lib/netplay/netplay.vcproj
	macosx/Warzone.xcodeproj/project.pbxproj
	macosx/configs/Warzone-All.xcconfig
	po/POTFILES.in
	src/hci.c
	src/intfac.h
	src/keybind.c
	src/multibot.c
	src/multiint.c
	src/multijoin.c
	src/multiplay.c
	src/multistruct.c
	src/multisync.c
	src/scriptai.c
 2010-06-15 08:35:52 +02:00
Christian Ohm f724a129be Use desktop resolution by default. 
When no (or an invalid) resolution is set (mainly when there's no config file
yet), use the current desktop resolution instead of 640x480. Refs #1912.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10958 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-12 17:39:01 +02:00
Christian Ohm 00cd1a7a47 Use whole screen for backdrops. 
Cut off some parts instead of showing black borders.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10932 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-08 12:41:34 +02:00
Christian Ohm aebccdcf90 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/trunk@10931 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-08 12:41:34 +02:00
Christian Ohm 6c8d3e15ba Show videos with correct aspect ratio. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10926 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-06 09:57:27 +02:00
Christian Ohm 9688b906a7 Show backdrops with correct aspect ratio. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10925 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-06 09:57:26 +02:00
Christian Ohm ae66be67c2 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/trunk@10900 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-03 22:41:44 +02:00
Christian Ohm a5bb0f1eb0 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/trunk@10894 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-06-03 22:41:44 +02:00
Christian Ohm f2ae61805c 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/trunk@10888 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-05-31 21:27:35 +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
Buginator 5109e7a86f If ban list isn't created yet, then return false. 
2.3:r10481


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10578 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-15 11:30:06 +02:00
Buginator 3cac32c84d Reset file handle to NULL after close. 
Fixes ticket:1745

2.3:r10480

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10577 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-15 11:30:06 +02:00
Buginator 05655b6ea5 Add ability to ban IPs when the host kicks a player. 
The ban list is *not* permanent, it will reset when host makes a new game.

Information about bans are in your netlog, for future references.

2.3:r10465, r10475, r10477

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10575 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-15 11:30:05 +02:00
Buginator 4ba8e9c34a Rework netlog to give more useful info 
Add more counters to keep track of joins / drops / etc.

2.3:r10464

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10574 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-15 11:30:05 +02:00
Christian Ohm 0c808ac2e0 Include/declaration cleanup for src/aiexperience.c/h. 
Refs #1647.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10567 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-14 14:53:44 +02:00
Christian Ohm 122bd513dd Fix compilation with configure --disable-sound. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10562 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-13 09:34:37 +02:00
Buginator 1c4c1cc5bd Fix exception handler to obey UAC on windows machines. 
It will write the crash report file to CSIDL_PERSONAL (c:\Users\user name\Documents\logs\warzone2100.rpt)

*All* platforms will now always have --debug-file enable as a default. This will write the logs to <configdir>/logs/WZlog*.txt

When a user overrides the configdir, then we will try to use that directory instead of the default as well.

refs ticket:1759

2.3: r10532


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10538 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-12 11:59:41 +02:00
i-nod d3f1d77aed Correctly propagate TCMask settings through PIE levels, so it will works for animated objects too. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10530 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-12 11:59:33 +02:00
Christian Ohm bc82f671f2 Change fixed pipeline messages from warning to info. 
No need to scare users more than necessary with warnings when things will work
anyway.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10507 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-12 11:59:32 +02:00
Guangcong Luo aecdd1805a Change most references to "mods" to singular "mod", so people don't think using multiple mods is a good idea. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10498 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-12 11:59:31 +02:00
dak180 ae26739a9a Some more formatting fixes for the debug dialog and make sure that .strings files get their encoding set properly. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10473 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-12 11:59:30 +02:00
Per Inge Mathisen 338bc9e322 Move all hard-coded colours (except map preview ones) into the palette file. Pass a PIELIGHT to widgSetColour() instead of RGB. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10466 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-12 11:59:30 +02:00
Buginator f3aea9cc1e Check if NPOT and texture_cube_map support is available. 
Patch by Flank4

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10462 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-12 11:59:30 +02:00
Buginator 901930360b Update Mac dialog text (yet) again. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10461 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-12 11:59:30 +02:00
Buginator 26ff5bd4d7 Update Mac dialog text again. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10460 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-12 11:59:30 +02:00
Buginator bcb9620a4d Fix formatting. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10459 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-12 11:59:30 +02:00
Buginator 974d26025a Use system dialogs for MAC people, thanks to stwf for the original patch! 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10458 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-12 11:59:30 +02:00
Per Inge Mathisen 806268790f Move default form colours into external palette file. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10457 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-12 11:59:29 +02:00
i-nod 64d6949d96 - Remove GL_ARB_shader_objects check as we are using OGL 2.0 shaders. 
- Test GLEE boolean instead of static definition in VBO check to get correct results.
- Allow 1.4 + VBO extension combination on Windows. Should help some 1.4 hardware.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10394 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-21 19:47:13 +01:00
i-nod e07812d52a Move debug mapping line a bit down, so it can be displayed simultaneously with level name. 
Display FPS counter for debug mode, instead of usual averaged FP5S.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10388 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-21 19:47:11 +01:00
Safety0ff ad27f1b309 Fixed terrain drawing code that was making the iVis state invalid. 
- Added multiplicative blending mode.
- Reverted r9629.
Reviewed by i-NoD.
Closes #1692.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10381 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-21 09:30:51 +01:00
i-nod c8e35d7a29 Fix MSVC and MinGW builds. Closes #1694. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10370 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-20 14:04:57 +01:00
Buginator 799e10f17a Dump out levelname as part of the screen shot name now. 
2.3: r10365

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10368 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-20 12:49:48 +01:00
i-nod 0b39df6e6f - Use additive blending instead of alpha blending for construction/deconstruction lines (regression from 2.3). 
- Use Vector3f instead of superfluous CLIP_VERTEX in pie_TransColouredTriangle().

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10358 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-20 12:49:47 +01:00
Cyp 8573291c68 Merge remote branch 'origin/master' into newnet 
Conflicts:
	lib/netplay/Makefile.am
	lib/netplay/netplay.c
	macosx/Warzone.xcodeproj/project.pbxproj
	macosx/configs/Warzone-All.xcconfig
	src/multistat.h
	src/multisync.c
 2010-03-17 14:26:32 +01:00
Cyp 50b41a9a64 Squelch control reaches end of non-void function warning. 2010-03-16 23:01:57 +01:00
Cyp acaa934203 Write from a separate thread, to avoid deadlocks were all players are stuck in writeAll. 2010-03-16 21:56:29 +01:00
Cyp 447e5b048a Rename hton functions to make mac happy. (Re: last refactor commit.) 2010-03-16 18:52:23 +01:00
Cyp 9de2f5c0c7 Refactor part of lib/netplay/netplay.c into lib/netplay/netsocket.cpp. 2010-03-16 16:59:49 +01:00
i-nod c1beb1f42b Remove 256 scale value from texture matrix. Closes #1678. 
PIE3 format will expect 0.0-1.0 floating points in texture coordinates values.
PIE2 and IMG(GUI textures) formats still using 8-bit integers in texture coordinates values.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10297 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-16 15:47:55 +01:00
Cyp 8c7a25e666 newnet: Don't syncDebug floats directly. 
Needed due to different sprintf implentations.
 2010-03-14 21:12:25 +01:00
Buginator 66edd6bdb3 Update MSVC project files to compile newnet 
Added /arch:sse2


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@10283 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-14 21:11:15 +01:00
Cyp a0bcd2a865 Merge remote branch 'origin/master' into newnet 
Conflicts:
	src/keybind.c
 2010-03-14 18:46:40 +01:00
Cyp 239e4e450d newnet: Display icon on desynch or on waiting for players. 
Saves having to look at console output to check that the game is in synch.
 2010-03-14 13:27:05 +01:00
Buginator 19696a3f16 Cleanup main so we only have 1 atexit() call for our system shutdown routine, instead of hiding multiple shutdown routines using atexit() for each. 
Currently, we have 1 atexit for our main shutdown routine, and 1 atexit call for the exception handler.



Fix mem leak for mod list.

Also dump allocator stats for MSVC people

2.3: r10251

refs ticket:1673


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10262 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-14 09:21:16 +01:00
Buginator 584c4f1aee Add new routines for MSVC that allows us to toggle the allocation tracking. 
Currently, it is only used in debug builds for strdup().
For release builds, we use _strdup().

This was necessary to prevent reporting of tons of 'memory leaks' caused by strdup(). Mostly caused by all the parsers lack of cleaning up after themselves.

Sample of what it does is shown.  When we don't toggle the allocator, then it is added to the Normal Blocks.  If we do toggle the allocator, then it is added to the CRT Blocks.
0 bytes in 0 Free Blocks means no memory leaks (for this quick loading of a SP mission--we still have LOTS of other leaks!)
I believe you can figure out what the rest of the stats mean.


0 bytes in 0 Free Blocks.
913860 bytes in 1826 Normal Blocks.
18745 bytes in 139 CRT Blocks.
0 bytes in 0 Ignore Blocks.
0 bytes in 0 Client Blocks.
Largest number used: 13564181 bytes.
Total allocations: 283917669 bytes.

2.3: r10250

refs ticket:1673


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10261 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-14 09:21:16 +01:00
Buginator 90326fcbf0 Fix mem leaks concerning screenshots 
2.3: r10249

refs ticket:1673

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10255 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-14 09:21:15 +01:00
Buginator a5f56f6791 Add missing #include(s) 
*Note*, all our .c / .cpp files really should have these two includes in it.
#include "lib/framework/wzglobal.h"
#include "lib/framework/frame.h"

First one is for platform specific settings, and the second one is for platform specific functions that we use to override.

2.3: r10236


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10254 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-14 09:21:15 +01:00
Cyp 8653631374 src: Undo a warning squelch, seems to be able to cause build errors for some, somehow. 2010-03-13 23:14:47 +01:00
Cyp 329721b1a2 newnet: Fix crash on desynch, when synchronising structures that haven't been built yet. Move desynch logs to logs/. 2010-03-12 11:31:44 +01:00
Cyp 657fc9079c Merge remote branch 'origin/master' into newnet 2010-03-11 17:37:36 +01:00
Cyp 7d23dc8d67 newnet: Adjust latency automatically, instead of hardcoded to 400ms. 2010-03-11 17:26:13 +01:00
Cyp d9a5af62ad Fix building on mac (should really work this time). Maybe fix building on windows, maybe not, no idea if it was the same issue. 2010-03-11 09:42:38 +01:00
Cyp 21fb1a18ed Fix mac warnings, hopefully (effectively reverting my previous changes to tex.h)... 2010-03-10 23:09:27 +01:00