Commit Graph

7853 Commits (6a6cd55ca10c22330f60b147425472aff4f44637)

Author SHA1 Message Date
Christian Ohm 7b3dce75df Simplify buildingDamaged().
Prevents a possible division by zero, closes #2008.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11307 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-28 18:58:34 +02:00
Guangcong Luo 320a218442 Fix a bug that caused T2 and T3 maps to load in T1 mode.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11304 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-28 18:58:34 +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
Christian Ohm d1343e4a7d Prevent automake.sh from complaining about astartest.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11296 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-28 18:58:31 +02:00
Per Inge Mathisen e4cf2297b9 Stop falsely advertising ctrl+l as an available key combo. It is not.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11291 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-28 18:58:30 +02:00
Christian Ohm 45de3b488c Update translations.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11285 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-28 18:58:30 +02:00
Christian Ohm f63667e4b5 Add an option for the rotating radar.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11284 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-28 18:58:29 +02:00
Cyp 6957b04072 astar.c → astar.cpp in .vcproj file. 2010-07-24 13:32:09 +02:00
Christian Ohm 09879b8a83 Update translations.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11277 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-24 09:56:07 +02:00
Christian Ohm fdceb3e322 Show complete game name in lobby tooltip.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11275 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-24 09:56:07 +02:00
Christian Ohm b808df33f4 Fix transporter ETA image.
Closes #2001.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11270 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-23 12:04:37 +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 bb7f960569 Make cliffs (blocking tiles) visible on radar. 2010-07-22 19:19:52 +02:00
Cyp a16c5f7df9 Show oil wells burning in the radar instead of pulsing. 2010-07-22 19:19:52 +02:00
Christian Ohm a31beaec05 Fix "make check".
Disable astartest, since it's broken after the rename of astar.c to astar.cpp.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11258 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-22 19:17:54 +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
Cyp 5651464175 newnet: Fix research facilities getting broken if clicking too much before researching.
(Was broken by "Make production UI respond instantly (without waiting for game state to change).".)
2010-07-22 09:39:44 +02:00
Christian Ohm 9a05862fba Update .gitignore
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11253 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-22 09:34:23 +02:00
Christian Ohm 9d553bccab Add missing file for r11247.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11251 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-22 09:34:23 +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
Christian Ohm e27ccca05c Windows cross-build: Make quesoglc compile on Ubuntu.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11247 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-22 09:34:22 +02:00
Cyp 694a9f8fb1 Don't spam log with "[NET_InitPlayers] Players initialized" in single-player menu. 2010-07-21 18:47:37 +02:00
Christian Ohm acff17e90c Update list of files to translate.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@11242 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-21 18:29:56 +02:00
Cyp 1cb0cf5cf9 newnet: Add -lz to configure. (Patch by Per.) 2010-07-21 18:28:41 +02:00
Cyp 0c93c007b9 newnet: Make DORDER_RTB on a droid with DACTION_MOVETOBUILD not crash in skirmish.
Don't know why it's only in newnet and not trunk, that the AI sends DORDER_RTB in skirmish.

Closes ticket:2010.
2010-07-21 17:57:52 +02:00
dak180 4e8f1fb7f3 Add the font files and clean up some of the scripts.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@11240 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-21 17:43:57 +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
dak180 f7ceb6aca1 Since user comments at the top of "project.pbxproj" do not stick, be creative.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11236 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-20 23:01:36 +02:00
Cyp b5529929e7 newnet: Make production UI respond instantly (without waiting for game state to change).
Fixes production count being displayed as "10".
2010-07-20 22:57:19 +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
Cyp e826510caa newnet: Make research buttons appear to work instantly, don't allow researching same thing twice. 2010-07-19 17:17:53 +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
Per Inge Mathisen aa0fcecc52 (from path branch) Make sure we can never end up driving in reverse while waiting for a path.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11229 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-19 10:58:59 +02:00
Per Inge Mathisen e25fc53a66 (port from path branch) No longer come to an instant halt when changing paths.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11227 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-19 10:58:59 +02:00
Cyp 269bb52c63 newnet: Display connection status icons neatly stacked, instead of overriding each other in order of importance. 2010-07-18 12:31:36 +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 a79e816965 newnet: No need to return after sending research message, since all clients should be running the same code, anyway.
Research button now blinks like it used to, when research is complete.
2010-07-17 23:40:56 +02:00
Cyp b646ff80bb newnet: Move BITS_ON_FIRE out of effects.c, so that oil well burning times become deterministic.
Also, set the tiles on fire, even if the projectile is not visible, and return power from destroyed power generators, even if power generator is not visible.
2010-07-17 20:18:00 +02:00
Cyp 212115faed newnet: Delay writing NET_SHARE_GAME_QUEUE until flush. 2010-07-17 11:49:55 +02:00
Cyp 1ff5fc34c6 newnet: Enable messages before calling cluster system, since messages are turned off if projectiles destroy a droid using splash damage.
Backtrace identifying the problem thanks to Safety0ff.

Toggling messages randomly is bad, the cluster system is bad... Two bads make a good, right?
2010-07-17 10:47:46 +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
Safety0ff a6bb433a17 Reuse the lightmap texture and buffer since their size will not change between initTerrain and shutdownTerrain calls.
Replace a magic number with a new constant.
Update lightmap on the first frame (gameTime = 0).
Closes #1962.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11211 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-16 03:54:27 +02:00
Per Inge Mathisen 5c48a62fd5 Convert moveGetObstacleVector() to float. Now the float-b-gone conversion of move.c is complete. Patch by Cyp.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11209 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-15 20:35:04 +02:00